Update submodules on '6.2.2 in qt/qt5'

Change-Id: I119b254553d9b073a142d73b9337e1cdf0bc95f8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-12-25 01:16:14 +08:00 · 2021-11-26 18:20:57 +00:00 · 2021-11-25 07:09:19 +00:00 · 2021-11-25 04:49:19 +00:00 · 2021-11-21 11:46:58 +02:00 · 2021-11-16 08:33:09 +02:00
40 changed files with 90 additions and 79 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,53 +1,53 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.2
+	branch = 6.2.2
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.2
+	branch = 6.2.2
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.2
+	branch = 6.2.2
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 6.2
+	branch = 6.2.2
 	status = ignore
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.2
+	branch = 6.2.2
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.2
+	branch = 6.2.2
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.2
+	branch = 6.2.2
 	status = ignore
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,183 +117,183 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 6.2
+	branch = 6.2.2
 	status = ignore
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 6.2
+	branch = 6.2.2
 	status = ignore
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.2
+	branch = 6.2.2
 	status = ignore
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 6.2
+	branch = 6.2.2
 	status = ignore
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.2
+	branch = 6.2.2
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.2
+	branch = 6.2.2
 	status = addon
--- a/coin/provisioning/common/windows/install-mingw.ps1
+++ b/coin/provisioning/common/windows/install-mingw.ps1
@@ -47,9 +47,10 @@ function InstallMinGW
    $envvar = $envvar -replace '["."]'
    $targetdir = "C:\$envvar"

+    $url_original = "https://github.com/cristianadam/mingw-builds/releases/download/v" + $version + "-" + $revision + "/" + $arch + "-" + $version + "-release-" + $threading + "-" + $ex_handling + "-" + $build_ver + "-" + $revision + ".7z"
    $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z"
    $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip"
-    Download $url_cache $url_cache $mingwPackage
+    Download $url_original $url_cache $mingwPackage
    Verify-Checksum $mingwPackage $sha1

    Extract-7Zip $mingwPackage $TARGETDIR
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw1120_64.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw1120_64.ps1
@@ -3,9 +3,9 @@
 # This script will install 64-bit MinGW 11.2.0
 # Note! MinGW version is 9.0.0 but the GCC version is 11.2 which is used with the naming of MinGW

-$release = "mingw-w64-x86_64-11.2.0-release-posix-seh-rt_v9-rev1"
+$release = "MinGW-w64-x86_64-11.2.0-release-posix-seh-rt_v9-rev1"

-$sha1    = "5554791dc13468bf44e2e519c6691f2deecd000c"
+$sha1    = "76bbfd135633d3d414e06cd7bf70cae94d2311db"

 InstallMinGW $release $sha1

--- a/coin/provisioning/qtci-windows-10_21H1-x86_64/09-install-mingw1120_64.ps1
+++ b/coin/provisioning/qtci-windows-10_21H1-x86_64/09-install-mingw1120_64.ps1
@@ -0,0 +1,10 @@
+. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
+
+# This script will install 64-bit MinGW 11.2.0
+# Note! MinGW version is 9.0.0 but the GCC version is 11.2 which is used with the naming of MinGW
+
+$release = "MinGW-w64-x86_64-11.2.0-release-posix-seh-rt_v9-rev1"
+
+$sha1    = "76bbfd135633d3d414e06cd7bf70cae94d2311db"
+
+InstallMinGW $release $sha1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	4050918cab	Update submodules on '6.2.2 in qt/qt5' Change-Id: I119b254553d9b073a142d73b9337e1cdf0bc95f8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-11-26 18:20:57 +00:00
Qt Submodule Update Bot	3f65ba69e5	Update submodules on '6.2.2 in qt/qt5' Change-Id: Icfac8d14e1a188d24da0f1b8eb7349f3f1dcd058 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-11-25 07:09:19 +00:00
Qt Submodule Update Bot	6598e872b9	Update submodules on '6.2.2 in qt/qt5' Change-Id: I1150f7866959befc8e67870a2ebe5dfbc40a55c8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-11-25 04:49:19 +00:00
Heikki Halmet	cc5146b530	Provisioning: Change using GitHub package for MinGW 11.2.0 Change-Id: I094015202659cd5a5c3231e64a47bb1725e88327 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit `278516d142`)	2021-11-21 11:46:58 +02:00
Jani Heikkinen	acf479cc4c	Adjust submodule branches Change-Id: I42b5dfbcdfcbc4320de55a15b4623e4eb55dd241	2021-11-16 08:33:09 +02:00