Update submodules on '6.5.2 in qt/qt5'

Change-Id: I08ce333a6e43447f3990211b5ac38f8e42b361ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-12-25 01:16:14 +08:00 · 2023-07-07 21:59:52 +00:00 · 2023-07-06 03:18:34 +00:00 · 2023-07-03 05:53:15 +00:00 · 2023-06-30 03:01:24 +00:00 · 2023-06-29 08:05:21 +00:00
46 changed files with 88 additions and 95 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.5
+	branch = 6.5.2
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.5
+	branch = 6.5.2
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.5
+	branch = 6.5.2
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.5
+	branch = 6.5.2
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.5
+	branch = 6.5.2
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.5
+	branch = 6.5.2
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,80 +252,80 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.5
+	branch = 6.5.2
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.5
+	branch = 6.5.2
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.5
+	branch = 6.5.2
 	status = preview
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.5
+	branch = 6.5.2
 	status = preview
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.5
+	branch = 6.5.2
 	status = addon
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -193,16 +193,6 @@ Configurations:
        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
    ]
-
-    Id: 'debian-11.6-arm64'
-    Template: 'qtci-linux-Debian-11.6-aarch64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'InsignificantTests']
-    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
-    ]
-
 -
    Id: 'ios-universal'
    Template: 'qtci-macos-12-x86_64-105'
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -27,7 +27,8 @@ Include: [
 Configurations:
 -
    Id: 'macos-latest-xcode-universal-static-build'
-    Template: 'qtci-macos-12-x86_64-106'
+    Template: 'qtci-macos-12-x86_64-105'
+    Target os: 'MacOS_12_Static'
    Compiler: 'Clang'
    Target arch: 'x86_64-arm64'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
@@ -38,6 +39,7 @@ Configurations:
 -
    Id: 'Linux-RHEL_8_4_Static'
    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Target os: 'RHEL_8_4_Static'
    Compiler: 'GCC'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
    Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql'
@@ -48,6 +50,7 @@ Configurations:
 -
    Id: 'Windows-MSVC2019_Static'
    Template: 'qtci-windows-10_22H2-x86_64-50'
+    Target os: 'Windows_10_Static'
    Compiler: 'MSVC2019'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
    Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql -plugin-sql-sqlite -plugin-sql-odbc'
--- 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
--- 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	808f63250c	Update submodules on '6.5.2 in qt/qt5' Change-Id: I08ce333a6e43447f3990211b5ac38f8e42b361ec Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-07-07 21:59:52 +00:00
Qt Submodule Update Bot	a4dd97eb2d	Update submodules on '6.5.2 in qt/qt5' Change-Id: I55a7dd7be1fd229077b58841bdc18e36b2130720 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-07-06 03:18:34 +00:00
Qt Submodule Update Bot	6a564e2ca7	Update submodules on '6.5.2 in qt/qt5' Change-Id: I3d71880c99cb558eef88d72828aaf3541b50e624 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-07-03 05:53:15 +00:00
Teemu Holappa	3597addab2	Change macOS12 template from 106 to 105 Provisioning fails in 106 template. Change-Id: Ia0a39b9006cc63d0e587bd18fc189e2a47408635 Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> (cherry picked from commit `075592750a`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2023-06-30 03:01:24 +00:00
Antti Kokko	39e71874c6	Update qtsaferenderer.yaml, add 'Target os' field Add 'Target os' field for static configurations to make sure targets are not overwritten when exporting the integration. Change-Id: I0c1b6602423b97f5be5dd7d146a37a3f41eced00 Reviewed-by: Teemu Holappa <teemu.holappa@qt.io> (cherry picked from commit `7d3fec671f`)	2023-06-29 08:05:21 +00:00
Qt Submodule Update Bot	f03a47caad	Update submodules on '6.5.2 in qt/qt5' Change-Id: Ib898a31bbbd5a530c1ba186cc526e7fc18967730 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-06-29 03:18:06 +00:00
Qt Submodule Update Bot	8d51a12667	Update submodules on '6.5.2 in qt/qt5' Change-Id: Idc7793963822f06128cdb54b715bc789af5b73bf Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-06-22 19:47:47 +00:00
Qt Submodule Update Bot	4588fcb542	Update submodules on '6.5.2 in qt/qt5' Change-Id: I259edde0e386119211f5df28ceaf08f1a8e0acc8 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>	2023-06-22 11:42:47 +00:00
Qt Submodule Update Bot	74d6db944a	Update submodules on '6.5.2 in qt/qt5' Change-Id: I15fc4b0110ee6628c49a4352007222ab461d55aa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2023-06-20 03:37:38 +00:00
Simo Fält	b6707952cd	COIN: Disable linux on arm config again The only host is down for now. Change-Id: I82cc9461a16d054da6611f2e2ee0be6426755660 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> (cherry picked from commit `82327bfc4d`)	2023-06-15 09:08:31 +00:00
Jani Heikkinen	4b88657d9a	Adjust submodule branches Change-Id: I95a0939954706d50ac9a808832f5ef268e2c2958	2023-06-14 06:23:00 +01:00