From 05a13593b8c382027b08dad69cee8f3be112c184 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 29 Jan 2021 12:49:55 +0200 Subject: [PATCH 01/22] Update submodules on '6.0' in qt/qt5 Change-Id: Ib011923daf90fff310e04fe3dcfdf8a75f7930b7 Reviewed-by: Qt Submodule Update Bot --- qtdoc | 2 +- qttools | 2 +- qttranslations | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtdoc b/qtdoc index 5b2f424b..9b5766ea 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5b2f424bd0c0269afe21883be51180084dce2ed9 +Subproject commit 9b5766ea0bc18c0e39404a25bab207e43e185afd diff --git a/qttools b/qttools index 0d5e25ce..912d5f0e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0d5e25ced0c88b51c87ebe14fbb52583df59a53a +Subproject commit 912d5f0ef83a33640d44fd42d0dde7b26c7425d0 diff --git a/qttranslations b/qttranslations index 15609cd2..f182593d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 15609cd2ba41b73ac849c5516299c65f681d1a79 +Subproject commit f182593d629ff22d2fd72255a9c0249f483b83e6 From 31f01fa82945e057c604259accdd32d0e8c0797b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 29 Jan 2021 19:54:26 +0200 Subject: [PATCH 02/22] Update submodules on '6.0' in qt/qt5 Change-Id: Iace8fab8f2a397fbd4f9b6bfc6d6a34d1241887a Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 0d92fe11..6e762882 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0d92fe119da3144f6334faa83563e52728a16dda +Subproject commit 6e7628821dc4cb3b4f1a6356bbe839e94c58a81f diff --git a/qtdeclarative b/qtdeclarative index 37b6e360..d7890626 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 37b6e360f1c75427cdff1a5b222633b5606b662a +Subproject commit d7890626464042acf2495a26a999da7887354d90 diff --git a/qtdoc b/qtdoc index 9b5766ea..3ab01f95 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9b5766ea0bc18c0e39404a25bab207e43e185afd +Subproject commit 3ab01f952e40bd00702ca1244fe99a017bfa7fd1 diff --git a/qtqa b/qtqa index 4b38b8c9..fb8051c4 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 4b38b8c9f0cb8a50c7bf9a7fd90b2d0fb00d4799 +Subproject commit fb8051c4ef590f88ee5ae6f09bbf29f24106f3d5 diff --git a/qtquick3d b/qtquick3d index bf0f2bca..1ac94243 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit bf0f2bca2147749f898c8fd74909a1c516c31f51 +Subproject commit 1ac942432ab1703fa7751f4cfe790e9510600837 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 8a162faa..26c91c76 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 8a162faa30aeb87bc9ef1ac06e21699f3f7fb446 +Subproject commit 26c91c768ef71da9d7cbef6417d1b9c8332d2e23 diff --git a/qtquicktimeline b/qtquicktimeline index 7d0e7971..f9613160 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 7d0e7971578fdd738f7cbd03672915ab632b24ef +Subproject commit f9613160d25551bc12e78af2628785131815903c diff --git a/qtshadertools b/qtshadertools index 7fda7add..1b45a35d 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 7fda7add278bef6a9ae1658da2bfedb64a0b04ad +Subproject commit 1b45a35d8889f1a864de0dfaa88546a819b29c21 diff --git a/qtsvg b/qtsvg index e5985c41..2c6430d0 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit e5985c4188b9fad5ddca7f9a6299109eadbc97f3 +Subproject commit 2c6430d0e46d5cf3591b506a4db9c3eb8fcc39f6 diff --git a/qttools b/qttools index 912d5f0e..9ce121ab 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 912d5f0ef83a33640d44fd42d0dde7b26c7425d0 +Subproject commit 9ce121ab882c23ae70463499b4da710e45787ca8 diff --git a/qttranslations b/qttranslations index f182593d..23ffc25a 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f182593d629ff22d2fd72255a9c0249f483b83e6 +Subproject commit 23ffc25a3a710f5a8bfafcf6fec65588b14c4751 diff --git a/qtwayland b/qtwayland index 8b2da3dd..034af03f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8b2da3dd8960178a4ad47d8866fe0bb64ae1fb26 +Subproject commit 034af03f181c1c6e4827ac216017f6e41afb7498 From a80e52c26d8422bea10860502bf24ef1229d3ff0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 1 Feb 2021 16:56:29 +0200 Subject: [PATCH 03/22] Update submodules on '6.0' in qt/qt5 Change-Id: Iffc70df49abf0b2ac871d4a4ac085dfd8b225e19 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index 6e762882..b61275ee 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6e7628821dc4cb3b4f1a6356bbe839e94c58a81f +Subproject commit b61275ee72ae2a895dee3652aca886859962cdb2 diff --git a/qtdeclarative b/qtdeclarative index d7890626..7c69db7c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d7890626464042acf2495a26a999da7887354d90 +Subproject commit 7c69db7c38a226c6f76e6189c7772afffb16884c diff --git a/qtdoc b/qtdoc index 3ab01f95..1833632d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3ab01f952e40bd00702ca1244fe99a017bfa7fd1 +Subproject commit 1833632d28afccb531bb766acc13866981e998c7 diff --git a/qtquick3d b/qtquick3d index 1ac94243..04392748 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 1ac942432ab1703fa7751f4cfe790e9510600837 +Subproject commit 04392748f384d9b3d1ebf03d0c81d6ed911bf9b7 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 26c91c76..65d1cb19 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 26c91c768ef71da9d7cbef6417d1b9c8332d2e23 +Subproject commit 65d1cb192ed3d7e569f102f0a701e03cc4771561 diff --git a/qtquicktimeline b/qtquicktimeline index f9613160..8e67f522 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit f9613160d25551bc12e78af2628785131815903c +Subproject commit 8e67f52250b942aab9f876b92bf71268ddfee7d0 diff --git a/qtshadertools b/qtshadertools index 1b45a35d..dab902a7 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 1b45a35d8889f1a864de0dfaa88546a819b29c21 +Subproject commit dab902a7b28dc20117053fd3230cbbe85ea2a1ff diff --git a/qtsvg b/qtsvg index 2c6430d0..be82ed5b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2c6430d0e46d5cf3591b506a4db9c3eb8fcc39f6 +Subproject commit be82ed5b39b194e5598aa1035faf95e669b27389 diff --git a/qttools b/qttools index 9ce121ab..62f652fc 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9ce121ab882c23ae70463499b4da710e45787ca8 +Subproject commit 62f652fc4422c0446511c7c9eb88739424e242ec diff --git a/qttranslations b/qttranslations index 23ffc25a..2262b00d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 23ffc25a3a710f5a8bfafcf6fec65588b14c4751 +Subproject commit 2262b00d6147cca9e2c19759996617280f6c9a83 diff --git a/qtwayland b/qtwayland index 034af03f..5b53861e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 034af03f181c1c6e4827ac216017f6e41afb7498 +Subproject commit 5b53861ec27e3dce13ab2991020fa11a9827e968 From e29f1bb96bbb618e4ca4f818fb5686d17906e874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Mon, 25 Jan 2021 13:04:06 +0200 Subject: [PATCH 04/22] Provisioning: Update Squish for Qt6 These are snapshot packages from Froglogic, not available for macOS yet, thus it will still use Qt5.15 based Squish. Only Linux and Win packages are updated now. Along with the Squish for Qt6 we need the Squish for Qt5 to be able to run Creator tests (since Creator is still Qt5 based). Change-Id: Iec0294e1de036db004633ee6b95e1e68a6dd23a5 Reviewed-by: Qt CI Bot Reviewed-by: Heikki Halmet (cherry picked from commit d86303a561a0179003802b9591ae8b7690033d16) Reviewed-by: Qt Cherry-pick Bot --- .../provisioning/common/unix/squishInstall.sh | 44 +++++++++++++------ .../common/windows/squishInstall.ps1 | 8 ++-- 2 files changed, 35 insertions(+), 17 deletions(-) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index bce68549..a189ea87 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -41,19 +41,20 @@ set -ex # This script will fetch and extract pre-buildt squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.6.1" -qtBranch="515x" +version="6.7-20210119-1632" +qtBranch="60x" installFolder="/opt" squishFolder="$installFolder/squish" preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable" -licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/.squish-3-license" +licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/515x/.squish-3-license" licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a" if uname -a |grep -q Darwin; then - compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" + version="6.6.1" + compressedFolder="prebuild-squish-$version-515x-macx86_64.tar.gz" sha1="9fff9a7cb037214d21f47f2cc53747885fd1f2ae" else compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" - sha1="3a50052caafa3ca583b7edf754227999d7185ffa" + sha1="8780665c3560456cd86980802cb24513233444fe" fi mountFolder="/tmp/squish" @@ -96,7 +97,8 @@ sudo mv "$installFolder/rta_squish_$version" "$squishFolder" if uname -a |grep -q "Ubuntu"; then if [ ! -e "/usr/lib/tcl8.6" ]; then sudo mkdir /usr/lib/tcl8.6 - sudo cp "$squishFolder/squish_for_qt/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ + #this needs to be copied only to squish_for_qt6 + sudo cp "$squishFolder/squish_for_qt6/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ fi fi @@ -108,18 +110,34 @@ sudo chown qt:$usersGroup "$HOME/.squish-3-license" echo "Set commands for environment variables in .bashrc" if uname -a |grep -q "Ubuntu"; then - echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.profile - echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.profile + echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.profile + echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.profile else echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc fi -echo "Verifying Squish" -if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then - echo "Squish for Qt installation tested successfully" +echo "Verifying Squish, available installations:" +ls -la $squishFolder +if uname -a |grep -q Darwin; then + if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt installation tested successfully" + else + echo "Squish for Qt test failed! Package wasn't installed correctly." + exit 1 + fi else - echo "Squish for Qt test failed! Package wasn't installed correctly." - exit 1 + if "$squishFolder/squish_for_qt5/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt5 installation tested successfully" + else + echo "Squish for Qt5 test failed! Package wasn't installed correctly." + exit 1 + fi + if "$squishFolder/squish_for_qt6/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt6 installation tested successfully" + else + echo "Squish for Qt6 test failed! Package wasn't installed correctly." + exit 1 + fi fi diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index c615f9eb..dbd6da16 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -36,12 +36,12 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "6.6.1" -$qtBranch = "515x" +$version = "6.7-20210112-1612" +$qtBranch = "60x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable" -$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" +$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\515x" # Squish license $licensePackage = ".squish-3-license" @@ -60,7 +60,7 @@ $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\Curren if ($OSVersion -eq "Windows 10 Enterprise") { $winVersion = "win10" if (Is64BitWinHost) { - $sha1 = "17b5bec83f448877e42e5effdc7daf723d157800" + $sha1 = "628bb65cf515d08df388b0dc4d5b403e4c6657b2" } else { $sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705" #Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild From 2a55470ef86980fe5cacc23e1a27dbfb598c1e1e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 2 Feb 2021 14:11:03 +0200 Subject: [PATCH 05/22] Provisioning: Disable multicast advertisements To get rid of the computer name notification multicat advertisements needs to be disabled. This notification seems to affect to autotest by causing misleading failures. Task-number: QTBUG-89746 Change-Id: I2365092ee05cc731b78e17c56eee7c4370a9f0a7 Reviewed-by: Toni Saario (cherry picked from commit a3c798e76a8cc9c6b4dfc3c178b45f0a294ecf77) Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh index aed78aee..1195f95a 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/05-systemsetup.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2020 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -104,3 +104,5 @@ sudo rm -f "$targetFile" sudo sed -i'.orig' -e 's:^#/net:/net:' -e 's:hidefromfinder,nosuid:hidefromfinder,nosuid,locallocks,nocallback:' /etc/auto_master sudo automount -cv +# Disable multicast advertisements +sudo defaults write /Library/Preferences/com.apple.mDNSResponder.plist NoMulticastAdvertisements -bool true From f2c905c4138f3d22f4715d2faafb4bb3ae997933 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 4 Feb 2021 14:58:54 +0200 Subject: [PATCH 06/22] Update submodules on '6.0' in qt/qt5 Change-Id: I12e2f718c5a7cb41a09f965f49681356dfb593c2 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtrepotools | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qtbase b/qtbase index b61275ee..87fcbbe7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b61275ee72ae2a895dee3652aca886859962cdb2 +Subproject commit 87fcbbe753612dcbf16273d4ef812f87f59d9908 diff --git a/qtdeclarative b/qtdeclarative index 7c69db7c..23263498 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7c69db7c38a226c6f76e6189c7772afffb16884c +Subproject commit 232634984e04deab21c40b99ac637a744416d51d diff --git a/qtdoc b/qtdoc index 1833632d..1c228d6d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1833632d28afccb531bb766acc13866981e998c7 +Subproject commit 1c228d6dabb7fccac53d3fbb9ea1cd52a10bb969 diff --git a/qtqa b/qtqa index fb8051c4..c50683e9 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit fb8051c4ef590f88ee5ae6f09bbf29f24106f3d5 +Subproject commit c50683e9d8b96112366af8dab91403cdc877a221 diff --git a/qtquick3d b/qtquick3d index 04392748..ca944e1c 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 04392748f384d9b3d1ebf03d0c81d6ed911bf9b7 +Subproject commit ca944e1ca6ea70fdaa848cdb56363376ebc9411b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 65d1cb19..47049d07 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 65d1cb192ed3d7e569f102f0a701e03cc4771561 +Subproject commit 47049d07c8e994c7e2f2435e064f884f4042fbb5 diff --git a/qtquicktimeline b/qtquicktimeline index 8e67f522..c5202136 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 8e67f52250b942aab9f876b92bf71268ddfee7d0 +Subproject commit c52021368f6b5c8775c9d57826c6cbe1c6628513 diff --git a/qtrepotools b/qtrepotools index 7efc56e5..a829867f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 7efc56e59dfd7cc300f92e3c3e7744202fd7b021 +Subproject commit a829867f0873227451099d77597706b5efb5ed10 diff --git a/qtshadertools b/qtshadertools index dab902a7..e590ed84 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit dab902a7b28dc20117053fd3230cbbe85ea2a1ff +Subproject commit e590ed8483bee08fde5c79dab7937c275dea5347 diff --git a/qtsvg b/qtsvg index be82ed5b..0442823e 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit be82ed5b39b194e5598aa1035faf95e669b27389 +Subproject commit 0442823ee97fcb3454b95d9e6ca577d654ce4b76 diff --git a/qttools b/qttools index 62f652fc..ca6ecf23 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 62f652fc4422c0446511c7c9eb88739424e242ec +Subproject commit ca6ecf231ac5a18d8b128197e65f5307a4e663f9 diff --git a/qttranslations b/qttranslations index 2262b00d..e1013e75 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 2262b00d6147cca9e2c19759996617280f6c9a83 +Subproject commit e1013e75e7748c23d02b318607172c3783ed74b2 diff --git a/qtwayland b/qtwayland index 5b53861e..1e6eb01d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5b53861ec27e3dce13ab2991020fa11a9827e968 +Subproject commit 1e6eb01db77dc2340c984dafbe510f998630de31 From c993737748b808641755704719efd59ddb98beed Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 4 Feb 2021 23:39:52 +0200 Subject: [PATCH 07/22] Update submodules on '6.0' in qt/qt5 Change-Id: Ieefb03ef3a6c969ddf13c2fde68959ada75e869b Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 87fcbbe7..3409cda1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 87fcbbe753612dcbf16273d4ef812f87f59d9908 +Subproject commit 3409cda1bccff865598b29001db8598434707816 diff --git a/qtdeclarative b/qtdeclarative index 23263498..a16ba29f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 232634984e04deab21c40b99ac637a744416d51d +Subproject commit a16ba29f6fd5a72fc5b30a87eaf78f10ad9a9791 diff --git a/qtdoc b/qtdoc index 1c228d6d..8c8df7f6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1c228d6dabb7fccac53d3fbb9ea1cd52a10bb969 +Subproject commit 8c8df7f6b96c9e154fe32ae98f8e4e2563249f80 diff --git a/qtqa b/qtqa index c50683e9..f9984b47 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit c50683e9d8b96112366af8dab91403cdc877a221 +Subproject commit f9984b473a5a84623d88d46a2cfdf03ca25c09b9 diff --git a/qtquick3d b/qtquick3d index ca944e1c..6c78a19d 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit ca944e1ca6ea70fdaa848cdb56363376ebc9411b +Subproject commit 6c78a19dfd5f17cc315b3aaefd3fb9478e12263d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 47049d07..b16c0c0f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 47049d07c8e994c7e2f2435e064f884f4042fbb5 +Subproject commit b16c0c0fd4e6b1e011f44d4bd9e8a27c37eda57f diff --git a/qtquicktimeline b/qtquicktimeline index c5202136..43f762ca 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit c52021368f6b5c8775c9d57826c6cbe1c6628513 +Subproject commit 43f762ca0a295b3154568e2f0c686180bb24abd1 diff --git a/qtshadertools b/qtshadertools index e590ed84..a26f2897 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit e590ed8483bee08fde5c79dab7937c275dea5347 +Subproject commit a26f289771fd265ad909832c61d80fffd1017373 diff --git a/qtsvg b/qtsvg index 0442823e..0d891508 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 0442823ee97fcb3454b95d9e6ca577d654ce4b76 +Subproject commit 0d8915084c8b2524da2e3f7eb3d6b24122ce030d diff --git a/qttools b/qttools index ca6ecf23..43f069d0 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ca6ecf231ac5a18d8b128197e65f5307a4e663f9 +Subproject commit 43f069d0044969d4e1a0d35483c0e8708c47a890 diff --git a/qttranslations b/qttranslations index e1013e75..4ae38bc1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit e1013e75e7748c23d02b318607172c3783ed74b2 +Subproject commit 4ae38bc193935766b1d2fec69ffe4da3b8196b90 diff --git a/qtwayland b/qtwayland index 1e6eb01d..46a1d6a4 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1e6eb01db77dc2340c984dafbe510f998630de31 +Subproject commit 46a1d6a47e08b7defd083c73e33793e2c85505aa From 7e1996649185f8d58c020959862951d0a6bb7ad1 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 4 Dec 2020 15:01:14 +0100 Subject: [PATCH 08/22] CI: remove InsignificantTests flag for win10 msvc2019 developer build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3949 Change-Id: I3e39a082fe5d2a22f7e263185b5032fd4f0928e5 Reviewed-by: Liang Qi (cherry picked from commit d3fc95535cb2b9a543d5d043d7535806fdafd9f0) Reviewed-by: Qt CI Bot Reviewed-by: Tony Sarajärvi --- coin/platform_configs/cmake_platforms.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index c43c0959..7aa567fb 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -101,7 +101,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-52' Compiler: 'MSVC2019' - Features: ['InsignificantTests', 'Sccache', "DebugAndRelease"] + Features: ['Sccache', "DebugAndRelease"] Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' Environment variables: [ 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', From 110bd157912de012cb04920514679e3ffaf04182 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 8 Feb 2021 05:45:13 +0200 Subject: [PATCH 09/22] Update submodules on '6.0' in qt/qt5 Change-Id: Ie907cd41df3fa7243df79cc2c1aab0d856d4e136 Reviewed-by: Qt Submodule Update Bot --- qtquick3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtquick3d b/qtquick3d index 6c78a19d..7110c4e5 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 6c78a19dfd5f17cc315b3aaefd3fb9478e12263d +Subproject commit 7110c4e58de674b5202dedef2fb33d93bec1dcf3 From c5571e6885d5a4e5d02b760322580f185b738b5d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 8 Feb 2021 10:05:17 +0200 Subject: [PATCH 10/22] Update submodules on '6.0' in qt/qt5 Change-Id: I50f2fe5d59e974d3e1f29cac787d04d7ced56f30 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 3409cda1..c67eaed8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3409cda1bccff865598b29001db8598434707816 +Subproject commit c67eaed8468c36629597aead9a768c9fe711ad85 diff --git a/qtdeclarative b/qtdeclarative index a16ba29f..7dc357bc 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a16ba29f6fd5a72fc5b30a87eaf78f10ad9a9791 +Subproject commit 7dc357bc41de0c002ba7c3d9d874205d9926c443 diff --git a/qtdoc b/qtdoc index 8c8df7f6..8050bde8 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8c8df7f6b96c9e154fe32ae98f8e4e2563249f80 +Subproject commit 8050bde897f97c0966603dc8aaa3a45dbb192616 diff --git a/qtqa b/qtqa index f9984b47..e2a0aac0 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit f9984b473a5a84623d88d46a2cfdf03ca25c09b9 +Subproject commit e2a0aac01c0f466d6c546ac01918de017c977883 diff --git a/qtquick3d b/qtquick3d index 7110c4e5..b9bf523f 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 7110c4e58de674b5202dedef2fb33d93bec1dcf3 +Subproject commit b9bf523ff18d24a25c78129c521ab9051316db6c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b16c0c0f..2ab67762 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b16c0c0fd4e6b1e011f44d4bd9e8a27c37eda57f +Subproject commit 2ab67762e80bff091dd0eb3b131785e42a4830b0 diff --git a/qtquicktimeline b/qtquicktimeline index 43f762ca..0bb18a4e 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 43f762ca0a295b3154568e2f0c686180bb24abd1 +Subproject commit 0bb18a4eb164626a4eacd9153635d711613f5be7 diff --git a/qtshadertools b/qtshadertools index a26f2897..9d8f3bde 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit a26f289771fd265ad909832c61d80fffd1017373 +Subproject commit 9d8f3bde40056a4af7afd0f1fb08298906c9e6cc diff --git a/qtsvg b/qtsvg index 0d891508..29cbe7da 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 0d8915084c8b2524da2e3f7eb3d6b24122ce030d +Subproject commit 29cbe7da2b312bf3d09e9e1b3c6f30542018fccc diff --git a/qttools b/qttools index 43f069d0..30c83ca2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 43f069d0044969d4e1a0d35483c0e8708c47a890 +Subproject commit 30c83ca242ed73e1ea5090aae25ac6b692a46010 diff --git a/qttranslations b/qttranslations index 4ae38bc1..71a02de6 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 4ae38bc193935766b1d2fec69ffe4da3b8196b90 +Subproject commit 71a02de6a9c1a71fc2e8db684dd24922a570fe2d diff --git a/qtwayland b/qtwayland index 46a1d6a4..824e3e90 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 46a1d6a47e08b7defd083c73e33793e2c85505aa +Subproject commit 824e3e903d7a0006939a40522c614db4a32bfa85 From cbeb5e362bb8f606206bcb66c54649ede6be2d1e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 9 Feb 2021 06:59:13 +0200 Subject: [PATCH 11/22] Update submodules on '6.0' in qt/qt5 Change-Id: Ic118aac957e922a49878209116f207ac5258e09c Reviewed-by: Qt Submodule Update Bot --- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index 7dc357bc..2a5b952a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7dc357bc41de0c002ba7c3d9d874205d9926c443 +Subproject commit 2a5b952a624abd2ea45192861f8f56479743aa8b diff --git a/qtdoc b/qtdoc index 8050bde8..eb8ae0ff 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8050bde897f97c0966603dc8aaa3a45dbb192616 +Subproject commit eb8ae0ffcb3fec47204a6f5f012aa9fb655e8641 diff --git a/qtquick3d b/qtquick3d index b9bf523f..390e373f 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit b9bf523ff18d24a25c78129c521ab9051316db6c +Subproject commit 390e373ff5777a4b7a6f3c13b709d52ab4e96500 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 2ab67762..1e5c5696 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 2ab67762e80bff091dd0eb3b131785e42a4830b0 +Subproject commit 1e5c569680dbab3bd7941b495c17ce5d1ef701c5 diff --git a/qtquicktimeline b/qtquicktimeline index 0bb18a4e..7afa47c1 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 0bb18a4eb164626a4eacd9153635d711613f5be7 +Subproject commit 7afa47c140770f930158262007df5a938313f084 diff --git a/qttools b/qttools index 30c83ca2..5eb1bdde 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 30c83ca242ed73e1ea5090aae25ac6b692a46010 +Subproject commit 5eb1bddefb1254ba31e0402e5d986a07965ca681 diff --git a/qttranslations b/qttranslations index 71a02de6..46279733 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 71a02de6a9c1a71fc2e8db684dd24922a570fe2d +Subproject commit 4627973346e36bb763cabfa8433e12ea2bc03ec6 diff --git a/qtwayland b/qtwayland index 824e3e90..aaf84518 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 824e3e903d7a0006939a40522c614db4a32bfa85 +Subproject commit aaf845185ef0ccf0dfe29ccf779a7bd3966f10f0 From 390ed2657924f86b5acea8205f529118209c3dd3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 9 Feb 2021 13:07:09 +0200 Subject: [PATCH 12/22] Update submodules on '6.0' in qt/qt5 Change-Id: If09d174898031b7bed71e6c2be7d4d730ad26b90 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index c67eaed8..56981d30 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c67eaed8468c36629597aead9a768c9fe711ad85 +Subproject commit 56981d3073355c80437786f5d479043e1471a571 diff --git a/qtdeclarative b/qtdeclarative index 2a5b952a..9c7b761f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2a5b952a624abd2ea45192861f8f56479743aa8b +Subproject commit 9c7b761fe369f8ccd7486acc7d875917613cdeed diff --git a/qtdoc b/qtdoc index eb8ae0ff..4b0036ba 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit eb8ae0ffcb3fec47204a6f5f012aa9fb655e8641 +Subproject commit 4b0036ba99045f08349fd891d20094208059d21a diff --git a/qtqa b/qtqa index e2a0aac0..7b2bca1a 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e2a0aac01c0f466d6c546ac01918de017c977883 +Subproject commit 7b2bca1aaba0a9aeb9f6802ab41958138b2cc805 diff --git a/qtquick3d b/qtquick3d index 390e373f..3c3a3e6c 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 390e373ff5777a4b7a6f3c13b709d52ab4e96500 +Subproject commit 3c3a3e6c031840b84b61dbe9d7598661e5cb50a8 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1e5c5696..d23893a2 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1e5c569680dbab3bd7941b495c17ce5d1ef701c5 +Subproject commit d23893a2f8e2315a19baee3b76637db38aee64b9 diff --git a/qtquicktimeline b/qtquicktimeline index 7afa47c1..d2b0dac9 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 7afa47c140770f930158262007df5a938313f084 +Subproject commit d2b0dac9257c6e4b239347b17d17e5bfe5d26bd2 diff --git a/qtshadertools b/qtshadertools index 9d8f3bde..fc3a3449 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 9d8f3bde40056a4af7afd0f1fb08298906c9e6cc +Subproject commit fc3a3449c124ecdcebebd39d1e84e88e8544a54f diff --git a/qtsvg b/qtsvg index 29cbe7da..d93dd794 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 29cbe7da2b312bf3d09e9e1b3c6f30542018fccc +Subproject commit d93dd794209c49258c1e6711c425a0182f38e862 diff --git a/qttools b/qttools index 5eb1bdde..0492f155 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 5eb1bddefb1254ba31e0402e5d986a07965ca681 +Subproject commit 0492f155d11e0eb4d653ee0615185760a2ced315 diff --git a/qttranslations b/qttranslations index 46279733..8a230303 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 4627973346e36bb763cabfa8433e12ea2bc03ec6 +Subproject commit 8a2303033dc2acd906732e30871bbe1f2a314926 diff --git a/qtwayland b/qtwayland index aaf84518..1625c7cb 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit aaf845185ef0ccf0dfe29ccf779a7bd3966f10f0 +Subproject commit 1625c7cbea4e6e0232e50994e1bbc983b5f71069 From 35dcd712b4f8f019ff86e397094666ea54162236 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Feb 2021 07:03:11 +0200 Subject: [PATCH 13/22] Update submodules on '6.0' in qt/qt5 Change-Id: I6fa1f9ac2ae6a416d86852906767e479b066a005 Reviewed-by: Qt Submodule Update Bot --- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index 9c7b761f..4b2eabdf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9c7b761fe369f8ccd7486acc7d875917613cdeed +Subproject commit 4b2eabdf21ff71d557bae36f99cf3998dafe324c diff --git a/qtdoc b/qtdoc index 4b0036ba..ea13f2a6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 4b0036ba99045f08349fd891d20094208059d21a +Subproject commit ea13f2a6833d6cbed7a651f2813efcb5c6aee58f diff --git a/qtqa b/qtqa index 7b2bca1a..606ce770 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 7b2bca1aaba0a9aeb9f6802ab41958138b2cc805 +Subproject commit 606ce77002931224aa5f69b5bfe8d8d897d0b787 diff --git a/qtquick3d b/qtquick3d index 3c3a3e6c..1722b8dd 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 3c3a3e6c031840b84b61dbe9d7598661e5cb50a8 +Subproject commit 1722b8dd09eb362e4f22a7599f1edb79a681e50f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d23893a2..72cee2cd 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d23893a2f8e2315a19baee3b76637db38aee64b9 +Subproject commit 72cee2cddff69c58978d47d1886026f9b12aee87 diff --git a/qtquicktimeline b/qtquicktimeline index d2b0dac9..28a119c9 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit d2b0dac9257c6e4b239347b17d17e5bfe5d26bd2 +Subproject commit 28a119c9fd24a0ee5b313142540f8aafc432e72c diff --git a/qttools b/qttools index 0492f155..d470ec30 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0492f155d11e0eb4d653ee0615185760a2ced315 +Subproject commit d470ec3086ef92675ed547dc4f13441a19d4ab89 diff --git a/qttranslations b/qttranslations index 8a230303..89da8055 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 8a2303033dc2acd906732e30871bbe1f2a314926 +Subproject commit 89da8055b54da6d9cd73fed881a42fed8ab9587a diff --git a/qtwayland b/qtwayland index 1625c7cb..7a484851 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1625c7cbea4e6e0232e50994e1bbc983b5f71069 +Subproject commit 7a484851e9fa5bdb59e80d5ca7ec36c764e97a18 From 79bc54cba4eca3f2b34f460ed8d70a710e2a6c29 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Feb 2021 11:44:06 +0200 Subject: [PATCH 14/22] Update submodules on '6.0' in qt/qt5 Change-Id: I4f041f9beb0d5b5a62e6e5129d2a91cd2cd6f26d Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index 56981d30..e3ef9f29 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 56981d3073355c80437786f5d479043e1471a571 +Subproject commit e3ef9f29fbe18bcece91e186aace44f109e18418 diff --git a/qtdeclarative b/qtdeclarative index 4b2eabdf..76aa032b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4b2eabdf21ff71d557bae36f99cf3998dafe324c +Subproject commit 76aa032bb5554945fe05f6e71b8a8cee7ba73c17 diff --git a/qtdoc b/qtdoc index ea13f2a6..310f838c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ea13f2a6833d6cbed7a651f2813efcb5c6aee58f +Subproject commit 310f838c791a028714e6b7481b126f1ff3fe180f diff --git a/qtqa b/qtqa index 606ce770..0da6281a 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 606ce77002931224aa5f69b5bfe8d8d897d0b787 +Subproject commit 0da6281a0906195ed5035ce9e136c1240c002666 diff --git a/qtquick3d b/qtquick3d index 1722b8dd..d90e9d5d 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 1722b8dd09eb362e4f22a7599f1edb79a681e50f +Subproject commit d90e9d5d52aec4dcdace9646f69ce164dd26f9bc diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 72cee2cd..db38a13e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 72cee2cddff69c58978d47d1886026f9b12aee87 +Subproject commit db38a13e6282f98aff607609b94f23010f2e50c4 diff --git a/qtquicktimeline b/qtquicktimeline index 28a119c9..50d697bf 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 28a119c9fd24a0ee5b313142540f8aafc432e72c +Subproject commit 50d697bfdad5109b845d35740b92dcf0b400e4bf diff --git a/qtshadertools b/qtshadertools index fc3a3449..21151ad3 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit fc3a3449c124ecdcebebd39d1e84e88e8544a54f +Subproject commit 21151ad3feb60e7a24ac08b7064d2856f311a47c diff --git a/qtsvg b/qtsvg index d93dd794..5c724ab4 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d93dd794209c49258c1e6711c425a0182f38e862 +Subproject commit 5c724ab45e367e79598d597e2055b50e4d4d29f8 diff --git a/qttools b/qttools index d470ec30..d9ea4dd0 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d470ec3086ef92675ed547dc4f13441a19d4ab89 +Subproject commit d9ea4dd0d58ddc5e1cfd84ecfb2be0e2ecfc2298 diff --git a/qttranslations b/qttranslations index 89da8055..f4d189bf 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 89da8055b54da6d9cd73fed881a42fed8ab9587a +Subproject commit f4d189bf46f934827d20ac631dc59891a9f8ff7e diff --git a/qtwayland b/qtwayland index 7a484851..3bab0b34 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7a484851e9fa5bdb59e80d5ca7ec36c764e97a18 +Subproject commit 3bab0b342c9588641d03396009d18920392f5ac8 From 8f899fc8d6f19acd1028e945aa93222fc4980f7e Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 10 Feb 2021 11:29:57 +0100 Subject: [PATCH 15/22] init-repository: Allow 'tqtc-' prefix for qt5 repository Change-Id: Ic4b14e4e6efd43e54a241000e090981ce8b6c651 Reviewed-by: Paul Wicking Reviewed-by: Edward Welbourne (cherry picked from commit 6f7f1cd5508e03be6ee570b4b0d873475d7801dd) Reviewed-by: Qt Cherry-pick Bot --- init-repository | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/init-repository b/init-repository index 2e0ddcde..81c9bb74 100755 --- a/init-repository +++ b/init-repository @@ -640,12 +640,13 @@ sub run chomp(my $url = `git config remote.origin.url`); die("Have no origin remote.\n") if (!$url); $url =~ s,\.git$,,; - $url =~ s/qt5$//; + $url =~ s/((?:tqtc-)?qt5)$//; + my $qtrepo = $1 or 'qt5'; $self->{'base-url'} = $url; - $self->git_clone_all_submodules('qt5', $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}}); + $self->git_clone_all_submodules($qtrepo, $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}}); - $self->git_add_remotes('qt5'); + $self->git_add_remotes($qtrepo); $self->git_install_hooks; From 35bc8bf6664b9fa3b3daddf38d8151f9974df87f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 15 Feb 2021 05:45:04 +0200 Subject: [PATCH 16/22] Update submodules on '6.0' in qt/qt5 Change-Id: I31fb9746c5c3c1e1cd60e3cd79b1b2e589085578 Reviewed-by: Qt Submodule Update Bot --- qtqa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtqa b/qtqa index 0da6281a..68b9471c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0da6281a0906195ed5035ce9e136c1240c002666 +Subproject commit 68b9471c6630cebb4a24bb0dd72a6219126ba5cd From 640e95a2843db325fa8edab448e83501d3458fe3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 15 Feb 2021 11:05:23 +0200 Subject: [PATCH 17/22] Update submodules on '6.0' in qt/qt5 Change-Id: I0ddb1a365114ba043f7d2d051dea7c2985e99069 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index e3ef9f29..2e541d2a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e3ef9f29fbe18bcece91e186aace44f109e18418 +Subproject commit 2e541d2ae2f66b45fa8181b5b1904ee234a78b77 diff --git a/qtdeclarative b/qtdeclarative index 76aa032b..21d5d463 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 76aa032bb5554945fe05f6e71b8a8cee7ba73c17 +Subproject commit 21d5d46321db3dfd6b60502cfa6401e850c42d74 diff --git a/qtdoc b/qtdoc index 310f838c..b4de6659 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 310f838c791a028714e6b7481b126f1ff3fe180f +Subproject commit b4de66591a4199fa9bab64fe6f934f28af5ed2ef diff --git a/qtqa b/qtqa index 68b9471c..8e4cd93c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 68b9471c6630cebb4a24bb0dd72a6219126ba5cd +Subproject commit 8e4cd93c5f62f7826d0aacfaa1302db45227e32f diff --git a/qtquick3d b/qtquick3d index d90e9d5d..84450d89 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit d90e9d5d52aec4dcdace9646f69ce164dd26f9bc +Subproject commit 84450d89d69ed45a73e91a98cd317e6abc38a0dc diff --git a/qtquickcontrols2 b/qtquickcontrols2 index db38a13e..6db222f0 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit db38a13e6282f98aff607609b94f23010f2e50c4 +Subproject commit 6db222f0d455f8062587c51c8936d8de82e001ab diff --git a/qtquicktimeline b/qtquicktimeline index 50d697bf..9ebe4883 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 50d697bfdad5109b845d35740b92dcf0b400e4bf +Subproject commit 9ebe48832514ccacd6b43dee6342edb4b0812546 diff --git a/qtshadertools b/qtshadertools index 21151ad3..e3e6b213 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 21151ad3feb60e7a24ac08b7064d2856f311a47c +Subproject commit e3e6b2131bc57f1149556f6cf5591f136e278a8f diff --git a/qtsvg b/qtsvg index 5c724ab4..c5e22497 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 5c724ab45e367e79598d597e2055b50e4d4d29f8 +Subproject commit c5e22497d84c931639db0c880213705de88ecd87 diff --git a/qttools b/qttools index d9ea4dd0..9ca82227 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d9ea4dd0d58ddc5e1cfd84ecfb2be0e2ecfc2298 +Subproject commit 9ca822277996236fc2ad8a539a1ee358aa61738e diff --git a/qttranslations b/qttranslations index f4d189bf..d9f190f1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f4d189bf46f934827d20ac631dc59891a9f8ff7e +Subproject commit d9f190f1dc9c9817cd7b8398bafa42ca4b826775 diff --git a/qtwayland b/qtwayland index 3bab0b34..229f5f9f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3bab0b342c9588641d03396009d18920392f5ac8 +Subproject commit 229f5f9fc5d639d06715f41281402111a1f5f6c7 From a3ee8d931b85244d7ad640caed4304cdf5dfebfe Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 19 Feb 2021 07:12:43 +0200 Subject: [PATCH 18/22] Update submodules on '6.0' in qt/qt5 Change-Id: I53c60a9e3b496844bd7a5cb086f7f323b8ac4725 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt5compat b/qt5compat index 6a40adea..f3736776 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 6a40adeaff8a683c6132fd16e131589b56b22e6c +Subproject commit f3736776fc1fee98c5e7e9143af9c6416655114a diff --git a/qtbase b/qtbase index 2e541d2a..3a4f8e4e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2e541d2ae2f66b45fa8181b5b1904ee234a78b77 +Subproject commit 3a4f8e4e0954245b6fa493a98a8158b71395cfa9 diff --git a/qtdeclarative b/qtdeclarative index 21d5d463..cffa1df6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 21d5d46321db3dfd6b60502cfa6401e850c42d74 +Subproject commit cffa1df6a4de096e95badac757061de0d1744858 diff --git a/qtdoc b/qtdoc index b4de6659..3da50aa7 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b4de66591a4199fa9bab64fe6f934f28af5ed2ef +Subproject commit 3da50aa7d1ff1602664088125798d7e96f3e01eb diff --git a/qtqa b/qtqa index 8e4cd93c..baeb9178 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8e4cd93c5f62f7826d0aacfaa1302db45227e32f +Subproject commit baeb9178137e86aa6462d44bc025f114a4ec5f19 diff --git a/qtquick3d b/qtquick3d index 84450d89..37228268 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 84450d89d69ed45a73e91a98cd317e6abc38a0dc +Subproject commit 37228268b6aa91d80b49d7021b2edf236bb4d156 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6db222f0..6aba959e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6db222f0d455f8062587c51c8936d8de82e001ab +Subproject commit 6aba959eaacdb452e66290f82a354c1cfe8ed768 diff --git a/qtquicktimeline b/qtquicktimeline index 9ebe4883..db5eaea8 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 9ebe48832514ccacd6b43dee6342edb4b0812546 +Subproject commit db5eaea8edb5a281e97c8922956099995ebc0b8d diff --git a/qtshadertools b/qtshadertools index e3e6b213..c4c79920 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit e3e6b2131bc57f1149556f6cf5591f136e278a8f +Subproject commit c4c79920c375d08613fa6c6be2d73b28e4b5d780 diff --git a/qtsvg b/qtsvg index c5e22497..7a4054b7 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit c5e22497d84c931639db0c880213705de88ecd87 +Subproject commit 7a4054b7ae3fbe147f19f89b8c41a20031d89638 diff --git a/qttools b/qttools index 9ca82227..e8dcf5d2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9ca822277996236fc2ad8a539a1ee358aa61738e +Subproject commit e8dcf5d293cabec128bbd79c536dccea7536b70e diff --git a/qttranslations b/qttranslations index d9f190f1..6ff92d7d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit d9f190f1dc9c9817cd7b8398bafa42ca4b826775 +Subproject commit 6ff92d7ddea563b3c578519c55e8fb9444dfe668 diff --git a/qtwayland b/qtwayland index 229f5f9f..2486e4cf 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 229f5f9fc5d639d06715f41281402111a1f5f6c7 +Subproject commit 2486e4cf8db713a8b7493dd96ffcab1116198589 From 7fc20312129da64b22f63d9401c1e65b1eb846da Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 24 Feb 2021 14:54:22 +0200 Subject: [PATCH 19/22] Drop failing qmake builds from Android We are not supporting to build Qt 6.0 with qmake so it is better to drop these failing targets instead of wasting time to fix the regression. These targets are already dropped from newer releases so it is OK to drop them from Qt 6.0 as well Fixes: QTBUG-91356 Change-Id: Id5cd4c9758ea7375aca72d23b4aa648e8479869d Reviewed-by: Ulf Hermann Reviewed-by: Joerg Bornemann --- coin/platform_configs/default.yaml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 9417bdee..4b48cb27 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -53,14 +53,6 @@ Configurations: Compiler: 'Clang' Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang' -- - Template: 'qtci-macos-10.14-x86_64' - Target os: 'Android_ANY' - Target arch: 'multi' - Compiler: 'Clang' - Target compiler: 'Clang' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r21d -android-ndk-host darwin-x86_64' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QEMU' @@ -91,15 +83,6 @@ Configurations: Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] Features: ['DisableTests', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib' -- - Template: 'qtci-windows-10-x86_64-52' - Target os: 'Android_ANY' - Target arch: 'multi' - Compiler: 'Mingw' - Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] - Target compiler: 'Clang' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r21d' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' From d57ad7e73731a517e6dab22eb09c210afdd4b82c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 24 Feb 2021 18:43:33 +0200 Subject: [PATCH 20/22] Update submodules on '6.0' in qt/qt5 Change-Id: I0a76b94296ac3b9593e5b7b1f3a8b194d1bf19dc Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt5compat b/qt5compat index f3736776..aca3a0ae 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit f3736776fc1fee98c5e7e9143af9c6416655114a +Subproject commit aca3a0ae35be7f1419e047f829e02040ad341689 diff --git a/qtbase b/qtbase index 3a4f8e4e..47be67d6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3a4f8e4e0954245b6fa493a98a8158b71395cfa9 +Subproject commit 47be67d65a15a3736f19b7d7e13abe64e79946a7 diff --git a/qtdeclarative b/qtdeclarative index cffa1df6..26c6177d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit cffa1df6a4de096e95badac757061de0d1744858 +Subproject commit 26c6177d325f1ce80259df5ec914ba145115b269 diff --git a/qtdoc b/qtdoc index 3da50aa7..81a72dda 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3da50aa7d1ff1602664088125798d7e96f3e01eb +Subproject commit 81a72dda925a97aa63a3941d7781c4dfaf53a768 diff --git a/qtqa b/qtqa index baeb9178..87c31c36 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit baeb9178137e86aa6462d44bc025f114a4ec5f19 +Subproject commit 87c31c368e188bff2af9aa23c9f96b43c25df238 diff --git a/qtquick3d b/qtquick3d index 37228268..1a95c597 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 37228268b6aa91d80b49d7021b2edf236bb4d156 +Subproject commit 1a95c59771a9087008ebc872bfa8e0383e15a783 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6aba959e..daf0eb63 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6aba959eaacdb452e66290f82a354c1cfe8ed768 +Subproject commit daf0eb63a252afd71fc9e0e6f6a39cec83f3a027 diff --git a/qtquicktimeline b/qtquicktimeline index db5eaea8..ef57e591 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit db5eaea8edb5a281e97c8922956099995ebc0b8d +Subproject commit ef57e591227678db8a36f7f0ce1b176693e604df diff --git a/qtshadertools b/qtshadertools index c4c79920..a184e2f1 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit c4c79920c375d08613fa6c6be2d73b28e4b5d780 +Subproject commit a184e2f1ab24ef535e3eb8ca15b22355497856f9 diff --git a/qtsvg b/qtsvg index 7a4054b7..40d20b69 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 7a4054b7ae3fbe147f19f89b8c41a20031d89638 +Subproject commit 40d20b691c2d22d563e926fbec463a8768744327 diff --git a/qttools b/qttools index e8dcf5d2..96782497 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e8dcf5d293cabec128bbd79c536dccea7536b70e +Subproject commit 96782497cc7097a468b684ec8d91d6d83c4f996b diff --git a/qttranslations b/qttranslations index 6ff92d7d..b8739b7b 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 6ff92d7ddea563b3c578519c55e8fb9444dfe668 +Subproject commit b8739b7b0bac1784b379b64235c1c58246595260 diff --git a/qtwayland b/qtwayland index 2486e4cf..e1667b6a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2486e4cf8db713a8b7493dd96ffcab1116198589 +Subproject commit e1667b6ae74682952f913bd72260d2d090a93b44 From 7df463631a4b5db1da1bfbc227f137dafb303ef4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 25 Feb 2021 00:28:06 +0200 Subject: [PATCH 21/22] Update submodules on '6.0' in qt/qt5 Change-Id: Ide3b0713a0df4e693129eba2c3729d7ebc8cfbcc Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt5compat b/qt5compat index aca3a0ae..0ca149f8 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit aca3a0ae35be7f1419e047f829e02040ad341689 +Subproject commit 0ca149f826eb9610a1f70bf691aa805e5b0570cc diff --git a/qtbase b/qtbase index 47be67d6..d0dbb793 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 47be67d65a15a3736f19b7d7e13abe64e79946a7 +Subproject commit d0dbb79363858bfabc4b7798f821e351b7306bfb diff --git a/qtdeclarative b/qtdeclarative index 26c6177d..309448ce 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 26c6177d325f1ce80259df5ec914ba145115b269 +Subproject commit 309448ce1e505f758cc64f3b97f72074174f43b0 diff --git a/qtdoc b/qtdoc index 81a72dda..b88b0ece 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 81a72dda925a97aa63a3941d7781c4dfaf53a768 +Subproject commit b88b0ece21b6daed4cdae5d89a9d833a4b11a99f diff --git a/qtqa b/qtqa index 87c31c36..b0eee13d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 87c31c368e188bff2af9aa23c9f96b43c25df238 +Subproject commit b0eee13d4390ae7bdde161b9659a2922b0a83c59 diff --git a/qtquick3d b/qtquick3d index 1a95c597..2b2dc6e2 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 1a95c59771a9087008ebc872bfa8e0383e15a783 +Subproject commit 2b2dc6e22982895e3ea87e391bd32a18fb059ea4 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index daf0eb63..cd25f3ed 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit daf0eb63a252afd71fc9e0e6f6a39cec83f3a027 +Subproject commit cd25f3ed51dbea35068a8305f9b3c3b5966aa49e diff --git a/qtquicktimeline b/qtquicktimeline index ef57e591..693bf349 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit ef57e591227678db8a36f7f0ce1b176693e604df +Subproject commit 693bf349972b01df5de698976eebc190052161be diff --git a/qtshadertools b/qtshadertools index a184e2f1..4dc9cfe3 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit a184e2f1ab24ef535e3eb8ca15b22355497856f9 +Subproject commit 4dc9cfe31fb012657b931035ce59748c3d184a5f diff --git a/qtsvg b/qtsvg index 40d20b69..bbfe43f0 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 40d20b691c2d22d563e926fbec463a8768744327 +Subproject commit bbfe43f087be7ebe29a24f9710c4eb83d95c0d7e diff --git a/qttools b/qttools index 96782497..d648541d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 96782497cc7097a468b684ec8d91d6d83c4f996b +Subproject commit d648541d03617b7f2701b871a32a4af6a0807d19 diff --git a/qttranslations b/qttranslations index b8739b7b..88fc07a0 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit b8739b7b0bac1784b379b64235c1c58246595260 +Subproject commit 88fc07a0f95cdf88f56e0976fcec360d754fed3f diff --git a/qtwayland b/qtwayland index e1667b6a..a4eed19b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e1667b6ae74682952f913bd72260d2d090a93b44 +Subproject commit a4eed19becaa3e8efc22423f62d5967e4e4d2a7e From 46dddf87bcb154432533083cf2bfebb3d4b3e3f7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 25 Feb 2021 06:10:36 +0200 Subject: [PATCH 22/22] Update submodules on '6.0' in qt/qt5 Change-Id: I5c50419286749cfbea278fe07929f947ffe1aaa7 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt5compat b/qt5compat index 0ca149f8..739d144c 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 0ca149f826eb9610a1f70bf691aa805e5b0570cc +Subproject commit 739d144cba52bdba738c14de41c45659bddf8ab1 diff --git a/qtbase b/qtbase index d0dbb793..723077eb 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d0dbb79363858bfabc4b7798f821e351b7306bfb +Subproject commit 723077eb3529810aa3b99d8c06f9b81a586763c9 diff --git a/qtdeclarative b/qtdeclarative index 309448ce..da46b97e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 309448ce1e505f758cc64f3b97f72074174f43b0 +Subproject commit da46b97ed5a56ce3db8e903053dd10bb9b7d2904 diff --git a/qtdoc b/qtdoc index b88b0ece..5290cda9 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b88b0ece21b6daed4cdae5d89a9d833a4b11a99f +Subproject commit 5290cda943d013b5e630b9bbf8c6d8e2f79f0726 diff --git a/qtquick3d b/qtquick3d index 2b2dc6e2..60a51c97 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 2b2dc6e22982895e3ea87e391bd32a18fb059ea4 +Subproject commit 60a51c975cedb9ddd82c4109a47f6fd8938e02fa diff --git a/qtquickcontrols2 b/qtquickcontrols2 index cd25f3ed..7be5c507 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit cd25f3ed51dbea35068a8305f9b3c3b5966aa49e +Subproject commit 7be5c50775781593483b5956df15f3e7b1e225d4 diff --git a/qtquicktimeline b/qtquicktimeline index 693bf349..b3ff9f76 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 693bf349972b01df5de698976eebc190052161be +Subproject commit b3ff9f762e2884d637fdb3a24ecadfbcadde2e68 diff --git a/qtshadertools b/qtshadertools index 4dc9cfe3..03ee874d 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 4dc9cfe31fb012657b931035ce59748c3d184a5f +Subproject commit 03ee874da27b88b46f06abd124d8a5345f028210 diff --git a/qtsvg b/qtsvg index bbfe43f0..af7b4e8d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit bbfe43f087be7ebe29a24f9710c4eb83d95c0d7e +Subproject commit af7b4e8d7d0836b778bcafba6d34ea36c43a010d diff --git a/qttools b/qttools index d648541d..e9c0625d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d648541d03617b7f2701b871a32a4af6a0807d19 +Subproject commit e9c0625d07ed4d476cd8fdba4cfb4d2509f46317 diff --git a/qttranslations b/qttranslations index 88fc07a0..50facb10 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 88fc07a0f95cdf88f56e0976fcec360d754fed3f +Subproject commit 50facb10cb7b62545a0c5be4fec0ae91a0db636e diff --git a/qtwayland b/qtwayland index a4eed19b..49276bc3 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a4eed19becaa3e8efc22423f62d5967e4e4d2a7e +Subproject commit 49276bc3bfb5578e9dfa3b1fe9be7f63d5996513