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" diff --git a/qt5compat b/qt5compat index 99777e6b..61aa6903 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 99777e6b1d346a0b5b87ff47448e01d7e589ceb5 +Subproject commit 61aa690352b2d5b5a0e781b1938f7ea17e7d8d56 diff --git a/qtbase b/qtbase index 31597533..e066c4d4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 315975335816314c849c7d6fa914800d16ff719b +Subproject commit e066c4d4bf1a0008a1993802c4e5b97f8df974dc diff --git a/qtdeclarative b/qtdeclarative index 6160f471..5b0a4213 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6160f471fc12fe7ce701f8bd9aad2111ddc9176b +Subproject commit 5b0a4213ce2fcd38e7a818fdc48635e7c19014e0 diff --git a/qtdoc b/qtdoc index 327b407f..ee1dd582 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 327b407f2758f225db8757499289efa3296ed428 +Subproject commit ee1dd582a9c121ca9a520fa54aaf349839ceb96a diff --git a/qtqa b/qtqa index 85be2c2f..95d33e44 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 85be2c2f08e1e759e1f0862c812df7253af83014 +Subproject commit 95d33e445703f0322466d199ef8e259d9714a643 diff --git a/qtquick3d b/qtquick3d index dfcb069a..6978d2b8 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit dfcb069aad6ea62369da70b2e66ce9ea6cf3fe62 +Subproject commit 6978d2b8b579a77abd5875d28fe61e3fada4eb8b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 14dbf1dc..bb7ef004 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 14dbf1dc596fb311c10b235952e9070f5e6c66f1 +Subproject commit bb7ef004ae52f9d6fc78608fd5c7be5031395695 diff --git a/qtquicktimeline b/qtquicktimeline index 61078ef4..d40d4d2d 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 61078ef4996c74acff9c520b253d22b6c6f0c537 +Subproject commit d40d4d2d51af74f47ab8f21126e21966a8b1f778 diff --git a/qtshadertools b/qtshadertools index cf6d74e9..af1bdc7a 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit cf6d74e993409eb7695909df0c874fab659af6bb +Subproject commit af1bdc7aced7cce7406ad0db481261cc4c15a0ec diff --git a/qtsvg b/qtsvg index 68e1442b..3ea889f3 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 68e1442ba3e7ac9b31f5e119332bb4b579cef4e8 +Subproject commit 3ea889f30aa9bc63b938342412e33c7686053d35 diff --git a/qttools b/qttools index 09b559ab..f00d0ad2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 09b559ab8dd88e7fbb172ce16ebac0c991d63738 +Subproject commit f00d0ad23be576d2ccfa47ef2018344db1048035 diff --git a/qttranslations b/qttranslations index ac5ecf2d..b4b5adc4 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit ac5ecf2da8aa2f632814f7beb0ca9fcac10c98f0 +Subproject commit b4b5adc4d8aaf3529a63d0958e310bc11a6ce882 diff --git a/qtwayland b/qtwayland index 8ab42898..65d717a2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8ab42898f75e97c90bc86eed64c3a8995e9eb297 +Subproject commit 65d717a27a4917fe39c538067f7defbe115f2e83