Update submodules on '6.8.2 in qt/qt5'

Change-Id: I96b8a3df6dbdb0b67342240c34c643c15b12057e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Add Ubuntu and Windows 11 arm64 targets for QSR 2.2
2025-12-25 17:36:13 +08:00 · 2025-01-24 17:51:13 +00:00 · 2025-01-23 13:06:41 +02:00 · 2025-01-21 13:25:10 +00:00 · 2025-01-20 06:29:39 +00:00
46 changed files with 124 additions and 101 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.8
+	branch = 6.8.2
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.8
+	branch = 6.8.2
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.8
+	branch = 6.8.2
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.8
+	branch = 6.8.2
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.8
+	branch = 6.8.2
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,7 +68,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = dev
+	branch = 6.8.2
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.8
+	branch = 6.8.2
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.8
+	branch = 6.8.2
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,87 +252,87 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.8
+	branch = 6.8.2
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.8
+	branch = 6.8.2
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.8
+	branch = 6.8.2
 	status = addon
--- a/coin/platform_configs/qtsaferenderer-runtime.yaml
+++ b/coin/platform_configs/qtsaferenderer-runtime.yaml
@@ -8,16 +8,16 @@ Include: [
  cmake_platforms.yaml: [
    "ubuntu-22.04",
    "ubuntu-22.04-documentation",
+    "ubuntu-24.04-arm64",
    "opensuse-15.5-developer-build",
    "sles-15_sp5-static",
-    "windows-10_22h2-msvc2019",
    "windows-10_22h2-msvc2022",
-    "windows-10_22h2-msvc2019-developer-build",
    "rhel-8.10",
    "windows-10_22h2-mingw13",
-    "windows-10_22h2-mingw13-developer-build",
-    "windows-10_22h2-llvm",
-    "windows-11_23H2-msvc2019"
+    "windows-11_23H2-mingw13-developer-build",
+    "windows-11_23H2-llvm",
+    "windows-11_23H2-msvc2022",
+    "windows-11_22h2-arm64-msvc2022"
  ],
  cmake_platforms_qemu_qnx710.yaml: [
    "qnx-710-x86_64-developer-build-on-linux",
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -8,14 +8,15 @@ Include: [
  cmake_platforms.yaml: [
    "ubuntu-22.04",
    "ubuntu-22.04-documentation",
+    "ubuntu-24.04-arm64",
    "opensuse-15.5-developer-build",
    "sles-15_sp5-static",
-    "windows-10_22h2-msvc2019",
    "windows-10_22h2-msvc2022",
    "rhel-8.10",
    "windows-10_22h2-mingw13",
-    "windows-10_22h2-llvm",
-    "windows-11_23H2-msvc2019"
+    "windows-11_23H2-llvm",
+    "windows-11_23H2-msvc2022",
+    "windows-11_22h2-arm64-msvc2022"
  ],
  cmake_platforms_qemu_qnx710.yaml: [
    "qnx-710-x86_64-developer-build-on-linux",
@@ -26,7 +27,7 @@ Include: [
 # Static build configurations for tools
 Configurations:
 -
-    Id: 'macos-latest-xcode-universal-static-build'
+    Id: 'macOS-12-latest-xcode-universal_Static'
    Template: 'qtci-macos-12-x86_64-107'
    Compiler: 'Clang'
    Target arch: 'x86_64-arm64'
@@ -46,9 +47,31 @@ Configurations:
        'NON_QTBASE_CMAKE_ARGS=-DINPUT_headersclean=ON'
    ]
 -
-    Id: 'Windows-MSVC2019_Static'
+    Id: 'Ubuntu-24.04-arm64_Static'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+    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'
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
+        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
+    ]
+-
+    Id: 'Windows-MSVC2022-arm64_Static'
+    Template: 'qtci-windows-11_22H2-aarch64-54'
+    Compiler: 'MSVC2022'
+    Features: ['Packaging', 'UseConfigure', 'MinimalStaticTests']
+    Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-psql -no-opengl'
+    Environment variables: [
+        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
+        'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+    ]
+-
+    Id: 'Windows-MSVC2022_Static'
    Template: 'qtci-windows-10_22H2-x86_64-52'
-    Compiler: 'MSVC2019'
+    Compiler: 'MSVC2022'
    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'
    Environment variables: [
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-axivion-bauhaus-suite.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-axivion-bauhaus-suite.sh
@@ -22,18 +22,18 @@ DownloadAndExtract () {


 # Axivion Bauhaus Suite
-sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_8_4-x86_64-gnu_linux.tar.gz"
-targetFile="bauhaus-suite-7_8_4-x86_64-gnu_linux.tar.gz"
-sha1="519f84237a4f55700dfb34767ba5bb342f142012"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_9_1-x86_64-gnu_linux.tar.gz"
+targetFile="bauhaus-suite-7_9_1-x86_64-gnu_linux.tar.gz"
+sha1="43d18d55087ce02009b850553405af55ba4e37e2"
 cd "$HOME"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$HOME"

 mkdir "$HOME/.bauhaus"
 cd "$HOME/.bauhaus"
-wget http://ci-files01-hki.ci.qt.io/input/axivion/Qt_Evaluation_QSR_INTERN_20250118.key
+wget http://ci-files01-hki.ci.qt.io/input/axivion/QT_11427439_2025-10-07.key
 cd "$HOME"

 #Axivion configuration
 cp -r "${BASH_SOURCE%/*}/../common/linux/axivion/"  "$HOME/"

-echo "Axivion Bauhaus Suite = 7.8.4" >> ~/versions.txt
+echo "Axivion Bauhaus Suite = 7.9.1" >> ~/versions.txt
--- 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	480041bb0b	Update submodules on '6.8.2 in qt/qt5' Change-Id: I96b8a3df6dbdb0b67342240c34c643c15b12057e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-01-24 17:51:13 +00:00
Antti Kokko	fd3268e815	Add Ubuntu and Windows 11 arm64 targets for QSR 2.2 Targets Ubuntu 24.04 arm64 & Windows 11 22H2 arm64 MSVC 2022 added. Static and dynamic build targets for tooling repository. Dynamic build targets for runtime repository. Task-number: QSR-2686 Pick-to: 6.8 Change-Id: I8946a4b107ebc7c652f7f1a3a50193fa62d8ed56 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>	2025-01-23 13:06:41 +02:00
Matti Paaso	ad6a3499ef	Provisioning: Update Axivion bauhaus suite and license file Task-number: QTQAINFRA-6880 Change-Id: I92a70dcb14bbba0ded889894059f2de849b1f557 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `45491c61fc`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit `3579a0c95c`) (cherry picked from commit `e600f0a85b`)	2025-01-21 13:25:10 +00:00
Jani Heikkinen	2248e7b084	Adjust submodule branches Change-Id: If108a8c82fc778e224982b1e6d0e4c3fc6533bf0	2025-01-20 06:29:39 +00:00