From 3ca11e2a8149b15a9fbb0992c0bf7c79a1657b31 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 21 Apr 2021 06:45:05 +0300 Subject: [PATCH 1/4] Update submodules on '6.0' in qt/qt5 Change-Id: I2529007ab237613b90c2a42a3d21ead1fdc0869c Reviewed-by: Qt Submodule Update Bot From aee07f92f1e34071c362f3abd49126609710be9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Mon, 19 Apr 2021 07:52:21 +0300 Subject: [PATCH 2/4] Provisioning: Fix Squish for Qt6 on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add correct Squish package to the 'squish_for_qt6' location. Change-Id: Ib997092a5d6350d9b7298d7cc8baf5a2afaca702 Reviewed-by: Heikki Halmet (cherry picked from commit 03821e82a5103560bbcf9c58de3989f6710dd899) Reviewed-by: Johanna Äijälä Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/unix/squishInstall.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 6de8116d..4e7a5dca 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -49,9 +49,12 @@ preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/515x/.squish-3-license" licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a" if uname -a |grep -q Darwin; then - version="6.7-20210301-1401" - compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" - sha1="562d065ed810f03cb0dad4cf81a4fc688bc813ec" + #macOS package had to redo, so it's having same filename but different location to + #keep previous provisioning in working state + preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable/6.7_rerun" + version="6.7-20210301-1401" + compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" + sha1="e82701ffc1eb465dce3163ce7eab9ccaedc568c1" else compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" sha1="80b3f36e760963a6989a49c79818bf8671d1932a" From 2679542ace21a59b95b7df423f80f9917b515094 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 22 Apr 2021 04:47:10 +0300 Subject: [PATCH 3/4] Update submodules on '6.0' in qt/qt5 Change-Id: Ibbf36132d18a38a37b0777ffaa0350f74553bc9a 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 99777e6b..0f684b4c 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 99777e6b1d346a0b5b87ff47448e01d7e589ceb5 +Subproject commit 0f684b4c62ee9e188fd4801ad88d629f5deb3fc8 diff --git a/qtbase b/qtbase index 31597533..b4580e9e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 315975335816314c849c7d6fa914800d16ff719b +Subproject commit b4580e9ea9b7a7e867a8ea88741822abe5ea7926 diff --git a/qtdeclarative b/qtdeclarative index 6160f471..164c2965 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6160f471fc12fe7ce701f8bd9aad2111ddc9176b +Subproject commit 164c2965835e462b421a48c937a1d73fe40eeca7 diff --git a/qtdoc b/qtdoc index 327b407f..7e4d859e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 327b407f2758f225db8757499289efa3296ed428 +Subproject commit 7e4d859eede3bf0bfdb7cd3154458878fdb8b8c7 diff --git a/qtqa b/qtqa index 85be2c2f..d2454e01 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 85be2c2f08e1e759e1f0862c812df7253af83014 +Subproject commit d2454e015b87eb66023c0ec00f4a1feafe16ea03 diff --git a/qtquick3d b/qtquick3d index dfcb069a..b5ebbb8c 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit dfcb069aad6ea62369da70b2e66ce9ea6cf3fe62 +Subproject commit b5ebbb8c83699fdb573a168acec596e725002525 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 14dbf1dc..b7c6ff28 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 14dbf1dc596fb311c10b235952e9070f5e6c66f1 +Subproject commit b7c6ff2831aa684fc5835e40ba8e33c12f9c86b2 diff --git a/qtquicktimeline b/qtquicktimeline index 61078ef4..aefdb3be 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 61078ef4996c74acff9c520b253d22b6c6f0c537 +Subproject commit aefdb3be4ececa57be1ae360973ed9f5b79ec018 diff --git a/qtshadertools b/qtshadertools index cf6d74e9..bde12a96 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit cf6d74e993409eb7695909df0c874fab659af6bb +Subproject commit bde12a96810542a40a160279b0b903580e0b022c diff --git a/qtsvg b/qtsvg index 68e1442b..a9b0ead3 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 68e1442ba3e7ac9b31f5e119332bb4b579cef4e8 +Subproject commit a9b0ead399b452437af4af045294519c31f86e98 diff --git a/qttools b/qttools index 09b559ab..55ae5bf0 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 09b559ab8dd88e7fbb172ce16ebac0c991d63738 +Subproject commit 55ae5bf022eba6521345aff6afba89cb8729ea6a diff --git a/qttranslations b/qttranslations index ac5ecf2d..653edf5a 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit ac5ecf2da8aa2f632814f7beb0ca9fcac10c98f0 +Subproject commit 653edf5abddd5e5db1ce532d7a81c7118ca4eeec diff --git a/qtwayland b/qtwayland index 8ab42898..e0a25b76 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8ab42898f75e97c90bc86eed64c3a8995e9eb297 +Subproject commit e0a25b765e7c4c9ad5ff5e683ebbecaec4a3a644 From 2658c06d6d4c3e41dfde1be1b56f24d8f6401ccc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 22 Apr 2021 09:31:26 +0300 Subject: [PATCH 4/4] Update submodules on '6.0' in qt/qt5 Change-Id: Ifcbc679e1fb807086e899ac7fabe65790e737a84 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 0f684b4c..61aa6903 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 0f684b4c62ee9e188fd4801ad88d629f5deb3fc8 +Subproject commit 61aa690352b2d5b5a0e781b1938f7ea17e7d8d56 diff --git a/qtbase b/qtbase index b4580e9e..e066c4d4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b4580e9ea9b7a7e867a8ea88741822abe5ea7926 +Subproject commit e066c4d4bf1a0008a1993802c4e5b97f8df974dc diff --git a/qtdeclarative b/qtdeclarative index 164c2965..5b0a4213 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 164c2965835e462b421a48c937a1d73fe40eeca7 +Subproject commit 5b0a4213ce2fcd38e7a818fdc48635e7c19014e0 diff --git a/qtdoc b/qtdoc index 7e4d859e..ee1dd582 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7e4d859eede3bf0bfdb7cd3154458878fdb8b8c7 +Subproject commit ee1dd582a9c121ca9a520fa54aaf349839ceb96a diff --git a/qtqa b/qtqa index d2454e01..95d33e44 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit d2454e015b87eb66023c0ec00f4a1feafe16ea03 +Subproject commit 95d33e445703f0322466d199ef8e259d9714a643 diff --git a/qtquick3d b/qtquick3d index b5ebbb8c..6978d2b8 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit b5ebbb8c83699fdb573a168acec596e725002525 +Subproject commit 6978d2b8b579a77abd5875d28fe61e3fada4eb8b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b7c6ff28..bb7ef004 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b7c6ff2831aa684fc5835e40ba8e33c12f9c86b2 +Subproject commit bb7ef004ae52f9d6fc78608fd5c7be5031395695 diff --git a/qtquicktimeline b/qtquicktimeline index aefdb3be..d40d4d2d 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit aefdb3be4ececa57be1ae360973ed9f5b79ec018 +Subproject commit d40d4d2d51af74f47ab8f21126e21966a8b1f778 diff --git a/qtshadertools b/qtshadertools index bde12a96..af1bdc7a 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit bde12a96810542a40a160279b0b903580e0b022c +Subproject commit af1bdc7aced7cce7406ad0db481261cc4c15a0ec diff --git a/qtsvg b/qtsvg index a9b0ead3..3ea889f3 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a9b0ead399b452437af4af045294519c31f86e98 +Subproject commit 3ea889f30aa9bc63b938342412e33c7686053d35 diff --git a/qttools b/qttools index 55ae5bf0..f00d0ad2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 55ae5bf022eba6521345aff6afba89cb8729ea6a +Subproject commit f00d0ad23be576d2ccfa47ef2018344db1048035 diff --git a/qttranslations b/qttranslations index 653edf5a..b4b5adc4 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 653edf5abddd5e5db1ce532d7a81c7118ca4eeec +Subproject commit b4b5adc4d8aaf3529a63d0958e310bc11a6ce882 diff --git a/qtwayland b/qtwayland index e0a25b76..65d717a2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e0a25b765e7c4c9ad5ff5e683ebbecaec4a3a644 +Subproject commit 65d717a27a4917fe39c538067f7defbe115f2e83