Merge branch 6.0 into pyside6.0

Change-Id: I05fa6f532707188361192e94ac3b60f6392e6d94

14 files 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"
diff --git a/qt5compat b/qt5compat
-Subproject 99777e6b1d346a0b5b87ff47448e01d7e589ceb
+Subproject 61aa690352b2d5b5a0e781b1938f7ea17e7d8d5
diff --git a/qtbase b/qtbase
-Subproject 315975335816314c849c7d6fa914800d16ff719
+Subproject e066c4d4bf1a0008a1993802c4e5b97f8df974d
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 6160f471fc12fe7ce701f8bd9aad2111ddc9176
+Subproject 5b0a4213ce2fcd38e7a818fdc48635e7c19014e
diff --git a/qtdoc b/qtdoc
-Subproject 327b407f2758f225db8757499289efa3296ed42
+Subproject ee1dd582a9c121ca9a520fa54aaf349839ceb96
diff --git a/qtqa b/qtqa
-Subproject 85be2c2f08e1e759e1f0862c812df7253af8301
+Subproject 95d33e445703f0322466d199ef8e259d9714a64
diff --git a/qtquick3d b/qtquick3d
-Subproject dfcb069aad6ea62369da70b2e66ce9ea6cf3fe6
+Subproject 6978d2b8b579a77abd5875d28fe61e3fada4eb8
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject 14dbf1dc596fb311c10b235952e9070f5e6c66f
+Subproject bb7ef004ae52f9d6fc78608fd5c7be503139569
diff --git a/qtquicktimeline b/qtquicktimeline
-Subproject 61078ef4996c74acff9c520b253d22b6c6f0c53
+Subproject d40d4d2d51af74f47ab8f21126e21966a8b1f77
diff --git a/qtshadertools b/qtshadertools
-Subproject cf6d74e993409eb7695909df0c874fab659af6b
+Subproject af1bdc7aced7cce7406ad0db481261cc4c15a0e
diff --git a/qtsvg b/qtsvg
-Subproject 68e1442ba3e7ac9b31f5e119332bb4b579cef4e
+Subproject 3ea889f30aa9bc63b938342412e33c7686053d3
diff --git a/qttools b/qttools
-Subproject 09b559ab8dd88e7fbb172ce16ebac0c991d6373
+Subproject f00d0ad23be576d2ccfa47ef2018344db104803
diff --git a/qttranslations b/qttranslations
-Subproject ac5ecf2da8aa2f632814f7beb0ca9fcac10c98f
+Subproject b4b5adc4d8aaf3529a63d0958e310bc11a6ce88
diff --git a/qtwayland b/qtwayland
-Subproject 8ab42898f75e97c90bc86eed64c3a8995e9eb29
+Subproject 65d717a27a4917fe39c538067f7defbe115f2e8