Update submodules on '6.8.0 in qt/qt5'

Change-Id: Id5147c9f3ed485a435a1a36cc70a503745c20407
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

.gitmodules

@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.8
+	branch = 6.8.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.8
+	branch = 6.8.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.8
+	branch = 6.8.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.8
+	branch = 6.8.0
 	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.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.8
+	branch = 6.8.0
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.8
+	branch = 6.8.0
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.8
+	branch = 6.8.0
 	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.0
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.8
+	branch = 6.8.0
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.8
+	branch = 6.8.0
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.8
+	branch = 6.8.0
 	status = addon

coin/platform_configs/cmake_platforms.yaml

@@ -43,29 +43,29 @@ Configurations:
     Id: 'ubuntu-24.04-arm64-documentation'
     Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
-    Features: ['Documentation', 'UseConfigure', 'DoNotRunTests']
-    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb'
+    Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests']
+    Configure arguments: '-make examples -developer-build -c++std c++20 -linker lld -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb'
     Environment variables: [
         'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
     ]
 -
     Id: 'ubuntu-24.04-arm64'
     Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
-    Features: ['Packaging', 'UseConfigure', 'DoNotRunTests']
+    Features: ['Sccache', 'Packaging', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -qpa offscreen\;xcb'
     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}} -DINPUT_headersclean=ON'
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON'
     ]
 # Test on Ubuntu 24.04 ARM64 offscreen
 -
     Id: 'ubuntu-24.04-arm64-offscreen-tests'
     Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
-    Features: ['TestOnly', 'InsignificantTests']
+    Features: ['TestOnly']
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
         'QT_QPA_OFFSCREEN_NO_GLX=1',
@@ -160,7 +160,23 @@ Configurations:
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -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 -DFEATURE_qdoc=OFF',
+        'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+    ]
+-
+    Id: 'windows-11_23H2-msvc2022-arm64'
+    Template: 'qtci-windows-11_23H2-x86_64-53'
+    Compiler: 'MSVC2022'
+    Target arch: 'arm64'
+    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Platform dependency: 'windows-11_23H2-msvc2022'
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
+        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
+        'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
+        'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
+        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
 -
@@ -188,23 +204,11 @@ Configurations:
     Id: 'debian-11.6-arm64'
     Template: 'qtci-linux-Debian-11.6-aarch64-50'
     Compiler: 'GCC'
-    Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
+    Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-doubleconversion -qt-harfbuzz -no-libudev -bundled-xcb-xinput -qpa offscreen\;xcb'
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
     ]
-# Test on Debian-11.6 offscreen
--
-    Id: 'debian-11.6-arm64-offscreen-tests'
-    Template: 'qtci-linux-Debian-11.6-aarch64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'InsignificantTests', 'TestOnly']
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'QT_QPA_OFFSCREEN_NO_GLX=1',
-        'QT_QPA_PLATFORM=offscreen'
-    ]
-    Platform dependency: 'debian-11.6-arm64'
 -
     Id: 'ios-universal'
     Template: 'qtci-macos-13-x86_64-103'

coin/platform_configs/cmake_platforms_static_tests.yaml

@@ -10,9 +10,9 @@ Configurations:
         'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
     ]
 -
-    Id: 'windows-10_22h2-minimal-static'
-    Template: 'qtci-windows-10_22H2-x86_64-52'
-    Compiler: 'MSVC2019'
+    Id: 'windows-11_23H2-minimal-static'
+    Template: 'qtci-windows-11_23H2-x86_64-53'
+    Compiler: 'MSVC2022'
     Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
     Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib'
     Environment variables: [

coin/platform_configs/qt-creator.yaml

@@ -3,18 +3,18 @@ Module only: True
 Configurations:
 -
     Template: 'qtci-windows-10_22H2-x86_64-52'
-    Compiler: 'MSVC2019'
+    Compiler: 'MSVC2022'
     Features: ['Packaging', 'Sccache', 'DebugAndRelease']
     Configure arguments: ''
     Environment variables: []
-    Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
+    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 -
     Template: 'qtci-windows-10_22H2-x86_64-52'
-    Compiler: 'MSVC2019'
+    Compiler: 'MSVC2022'
     Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
     Configure arguments: ''
     Environment variables: []
-    Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
+    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 -
     Template: 'qtci-linux-RHEL-8.8-x86_64-50'
     Compiler: 'GCC'

coin/platform_configs/qt5.yaml

@@ -3,14 +3,4 @@ Include: [
     cmake_platforms.yaml,
     address_sanitizer_platforms.yaml
 ]
-Configurations:
-# Test on Debian-11.6 Wayland
--
-    Id: 'debian-11.6-arm64-wayland-tests'
-    Template: 'qtci-linux-Debian-11.6-aarch64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
-    ]
-    Platform dependency: 'debian-11.6-arm64'
+Configurations: []

coin/platform_configs/qtbase-linux-arm64-offscreen.yaml

@@ -1,26 +0,0 @@
-Version: 2
-Configurations:
-# Test on Ubuntu 24.04 ARM64 offscreen
--
-    Id: 'ubuntu-24.04-arm64-offscreen-qtbase-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
-    Compiler: 'GCC'
-    Features: ['TestOnly']
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'QT_QPA_OFFSCREEN_NO_GLX=1',
-        'QT_QPA_PLATFORM=offscreen'
-    ]
-    Platform dependency: 'ubuntu-24.04-arm64'
-# Test on Debian-11.6 offscreen
--
-    Id: 'debian-11.6-arm64-offscreen-qtbase-tests'
-    Template: 'qtci-linux-Debian-11.6-aarch64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly']
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'QT_QPA_OFFSCREEN_NO_GLX=1',
-        'QT_QPA_PLATFORM=offscreen'
-    ]
-    Platform dependency: 'debian-11.6-arm64'

coin/platform_configs/qtbase.yaml

@@ -9,7 +9,6 @@ Include: [
     wasm_qtbase_tests.yaml,
     cmake_platforms_qemu_vxworks_buildtest.yaml,
     qtlite.yaml,
-    qtbase-linux-arm64-offscreen.yaml,
     qtbase-new-compiler-testing.yaml
 ]
 Configurations: []

coin/platform_configs/qtlite.yaml

@@ -1,10 +1,10 @@
 Version: 2
 Configurations:
 -
-    Id: 'debian-11.6-static-qtlite-arm64'
-    Template: 'qtci-linux-Debian-11.6-aarch64-50'
+    Id: 'ubuntu-24.04-arm64-static-qtlite'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
-    Features: ['UseConfigure', 'DoNotRunTests', 'MinimalStaticTests']
+    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'MinimalStaticTests']
     Configure arguments: >
         -nomake examples
         -release

coin/platform_configs/qtwayland.yaml

@@ -4,19 +4,6 @@ Include: [
     address_sanitizer_platforms.yaml
 ]
 Configurations:
-# Test on Ubuntu 22.04 Wayland
--
-    Id: 'ubuntu-22.04-documentation-wayland-tests'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'TestDocs', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
-    Platform dependency: 'ubuntu-22.04-documentation'
--
-    Id: 'ubuntu-22.04-wayland-tests'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
-    Platform dependency: 'ubuntu-22.04'
 # Test on Ubuntu 24.04 ARM64 Wayland
 -
     Id: 'ubuntu-24.04-arm64-documentation-wayland-tests'
@@ -24,32 +11,10 @@ Configurations:
     Compiler: 'GCC'
     Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests']
     Platform dependency: 'ubuntu-24.04-arm64-documentation'
--
-    Id: 'ubuntu-24.04-arm64-wayland-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests']
-    Platform dependency: 'ubuntu-24.04-arm64'
 # Test on Ubuntu 24.04 x64 Wayland
--
-    Id: 'ubuntu-24.04-x64-documentation-wayland-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests']
-    Platform dependency: 'ubuntu-24.04-x64-documentation'
 -
     Id: 'ubuntu-24.04-x64-wayland-tests'
     Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
     Compiler: 'GCC'
     Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests']
     Platform dependency: 'ubuntu-24.04-x64'
-# Test on Debian-11.6 Wayland
--
-    Id: 'debian-11.6-arm64-wayland-tests'
-    Template: 'qtci-linux-Debian-11.6-aarch64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests']
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
-    ]
-    Platform dependency: 'debian-11.6-arm64'

coin/provisioning/common/linux/sccache.sh

@@ -6,7 +6,14 @@ set -ex
 
 source "${BASH_SOURCE%/*}/../unix/sccache.sh"
 
-targetArch=x86_64-unknown-linux-musl
 targetVersion=0.2.14
-sha1=281680c0fc2c09173e94d12ba45d9f1b8e62e5b3
+
+if [[ $(uname -m) == 'aarch64' ]]; then
+  targetArch=aarch64-unknown-linux-musl
+  sha1=0f9b57c423d77f7aa89bb642864ac7689d84d6a0
+else
+  targetArch=x86_64-unknown-linux-musl
+  sha1=281680c0fc2c09173e94d12ba45d9f1b8e62e5b3
+fi
+
 installSccache "$targetArch" "$targetVersion" "$sha1"

coin/provisioning/common/macos/mimersql.sh

@@ -12,20 +12,11 @@ os="$1"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 
-mimerSqlVersion="11.0.7G"
-if [ "$os" = "macos" ]; then
-    arch=$(uname -m)
-    if [ "$arch" = "x86_64" ]; then
-        mimerSqlPackageName="mimersql-110_x86_64.tgz"
-        SHA1="d748f87b72e7188c527f131db2590f552f18f544"
-    else
-        mimerSqlPackageName="mimersql-110_arm64.tgz"
-        SHA1="f209c97074d096e50e637441073e8aa355c5116e"
-    fi
-else
-    mimerSqlPackageName="mimersql-110_universal.tgz"
-    SHA1="eab32be623f1cbde7c29cea0f0ca4332b8ca502b"
-fi
+mimerSqlVersion="11.0.8E"
+
+mimerSqlPackageName="mimersql-1108E_universal.tgz"
+SHA1="8077db02be2b54147eb4a48ce4a7a2ff1159fb4d"
+
 
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/mac/$mimerSqlPackageName"
 AltUrl="https://install.mimer.com/qt/macOS/$mimerSqlPackageName"

coin/provisioning/common/unix/sccache.sh

@@ -19,6 +19,7 @@ function installSccache {
 
     sudo mkdir -p /usr/local/sccache
     sudo tar -C /usr/local/sccache -x -z --totals --strip-components=1 --file="$targetFile"
+    sudo chmod +x /usr/local/sccache/sccache
 
     # add sccache __before__ the real compiler
     SetEnvVar "PATH" "/usr/local/sccache:\$PATH"
@@ -32,4 +33,7 @@ function installSccache {
     chmod 755 "$HOME/sccache_wrapper/sccache"
     SetEnvVar "PATH" "$HOME/sccache_wrapper:\$PATH"
 
+    # Prevents some random network I/O errors from failing compilation
+    # Does not seem to affect much though
+    SetEnvVar "SCCACHE_IGNORE_SERVER_IO_ERROR" "1"
 }

coin/provisioning/common/windows/install-ffmpeg.ps1

@@ -85,6 +85,7 @@ function InstallMingwFfmpeg {
 
 function InstallMsvcFfmpeg {
     Param (
+        [string]$hostArch,
         [bool]$isArm64
     )
 
@@ -98,10 +99,13 @@ function InstallMsvcFfmpeg {
         $arch = "arm64"
         $buildSystem += "-arm64"
         $ffmpegDirEnvVar += "_ARM64"
-        $config += " --enable-cross-compile --arch=arm64 --disable-asm"
+        $config += " --arch=arm64 --disable-asm"
+        if ($hostArch -eq "amd64") {
+            $config += " --enable-cross-compile"
+        }
     }
 
-    $result = EnterVSDevShell -Arch $arch
+    $result = EnterVSDevShell -HostArch $hostArch -Arch $arch
     if (-Not $result) {
         return $false
     }
@@ -112,7 +116,7 @@ function InstallMsvcFfmpeg {
         # As ffmpeg build system creates lib*.a file we have to rename them to *.lib files to be recognized by WIN32
         Write-Host "Rename libraries lib*.a -> *.lib"
         try {
-            $msvcDir = [System.Environment]::GetEnvironmentVariable("FFMPEG_DIR_MSVC", [System.EnvironmentVariableTarget]::Machine)
+            $msvcDir = [System.Environment]::GetEnvironmentVariable($ffmpegDirEnvVar, [System.EnvironmentVariableTarget]::Machine)
             Get-ChildItem "$msvcDir\lib\lib*.a" | ForEach-Object {
                 $NewName = $_.Name -replace 'lib(\w+).a$', '$1.lib'
                 $Destination = Join-Path -Path $_.Directory.FullName -ChildPath $NewName
@@ -201,17 +205,45 @@ function InstallAndroidArmv7 {
     return $result
 }
 
-$mingwRes = InstallMingwFfmpeg
-$llvmMingwRes = InstallLlvmMingwFfmpeg
-$androidArmV7Res = InstallAndroidArmv7
-$msvcRes = InstallMsvcFfmpeg -isArm64 $false
-$msvcArm64Res = InstallMsvcFfmpeg -isArm64 $true
+function InstallFfmpegsAMD64 {
+    $hostArch = "amd64"
+    $mingwRes = InstallMingwFfmpeg
+    $llvmMingwRes = InstallLlvmMingwFfmpeg
+    $androidArmV7Res = InstallAndroidArmv7
+    $msvcRes = InstallMsvcFfmpeg -hostArch $hostArch -isArm64 $false
+    $msvcArm64Res = InstallMsvcFfmpeg -hostArch $hostArch -isArm64 $true
 
-Write-Host "Ffmpeg installation results:"
-Write-Host "  mingw:" $(if ($mingwRes) { "OK" } else { "FAIL" })
-Write-Host "  msvc:" $(if ($msvcRes) { "OK" } else { "FAIL" })
-Write-Host "  msvc-arm64:" $(if ($msvcArm64Res) { "OK" } else { "FAIL" })
-Write-Host "  llvm-mingw:" $(if ($llvmMingwRes) { "OK" } else { "FAIL" })
-Write-Host "  android-armv7:" $(if ($androidArmV7Res) { "OK" } else { "FAIL" })
+    Write-Host "Ffmpeg installation results:"
+    Write-Host "  mingw:" $(if ($mingwRes) { "OK" } else { "FAIL" })
+    Write-Host "  llvm-mingw:" $(if ($llvmMingwRes) { "OK" } else { "FAIL" })
+    Write-Host "  android-armv7:" $(if ($androidArmV7Res) { "OK" } else { "FAIL" })
+    Write-Host "  msvc:" $(if ($msvcRes) { "OK" } else { "FAIL" })
+    Write-Host "  msvc-arm64:" $(if ($msvcArm64Res) { "OK" } else { "FAIL" })
 
-exit $(if ($mingwRes -and $msvcRes -and $msvcArm64Res -and $llvmMingwRes -and $androidArmV7Res) { 0 } else { 1 })
+    exit $(if ($mingwRes -and $msvcRes -and $msvcArm64Res -and $llvmMingwRes -and $androidArmV7Res) { 0 } else { 1 })
+}
+
+function InstallFfmpegsARM64 {
+    $hostArch = "arm64"
+    $msvcArm64Res = InstallMsvcFfmpeg -hostArch $hostArch -isArm64 $true
+
+    Write-Host "Ffmpeg installation results:"
+    Write-Host "  msvc-arm64:" $(if ($msvcArm64Res) { "OK" } else { "FAIL" })
+
+    exit $(if ($msvcArm64Res) { 0 } else { 1 })
+}
+
+$cpu_arch = Get-CpuArchitecture
+switch ($cpu_arch) {
+    arm64 {
+        InstallFfmpegsARM64
+        Break
+    }
+    x64 {
+        InstallFfmpegsAMD64
+        Break
+    }
+    default {
+        throw "Unknown architecture $cpu_arch"
+    }
+}

coin/provisioning/qtci-linux-Debian-11.6-aarch64/20-sccache.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/linux/sccache.sh"

coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/20-sccache.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/linux/sccache.sh"

coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh

@@ -229,6 +229,10 @@ installPackages+=(uml-utilities)
 installPackages+=(jq)
 # For building
 installPackages+=(cmake)
+# extra linkers
+installPackages+=(lld)
+# Fix dependencies in shared ffmpeg libs
+installPackages+=(patchelf)
 
 echo "Running update for apt"
 waitLoop

coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/03-install-nodejs.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+# Copyright (C) 2023 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+# shellcheck source=../common/linux/install-nodejs.sh
+source "${BASH_SOURCE%/*}/../common/linux/install-nodejs.sh"

coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/20-sccache.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/linux/sccache.sh"

coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh

@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+# Copyright (C) 2024 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+# shellcheck source=../common/unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+
+set -ex
+
+# This script will install ICU
+
+icuVersion="73.2"
+icuLocationLib="/usr/local/lib"
+icuLocationInclude="/usr/local/include"
+sha1="82f3ed54fd7ea8ff469d9000164e4dc23378fc8c"
+baseBinaryPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Ubuntu24.04-aarch64.7z"
+baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Ubuntu24.04-aarch64.7z"
+
+sha1Dev="37c2528df9d2b5cba1765fe8036e69b7c326a1e1"
+develPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Ubuntu24.04-aarch64-devel.7z"
+develPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Ubuntu24.04-aarch64-devel.7z"
+
+echo "Installing custom ICU $icuVersion $sha1 packages on Ubuntu to $icuLocationLib"
+
+targetFile=$(mktemp)
+sudo mkdir -p "$icuLocationLib"
+sudo mkdir -p "$icuLocationInclude"
+DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile"
+sudo 7z x -y -o$icuLocationLib "$targetFile"
+sudo rm "$targetFile"
+
+echo "Installing custom ICU devel packages on Ubuntu"
+
+tempDir=$(mktemp -d)
+
+targetFile=$(mktemp)
+DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile"
+7z x -y -o"$tempDir" "$targetFile"
+
+sudo cp -a "$tempDir"/lib/* "$icuLocationLib"
+sudo cp -a "$tempDir"/include/* "$icuLocationInclude"
+
+sudo rm "$targetFile"
+sudo rm -fr "$tempDir"
+
+sudo /sbin/ldconfig
+
+echo "ICU = $icuVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/60-install_protobuf.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Copyright (C) 2018 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+set -ex
+
+# shellcheck source=../common/unix/install_protobuf.sh
+source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh"
+

coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"

coin/provisioning/qtci-windows-11_22H2-aarch64/10-install-msys2.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-msys2.ps1"

coin/provisioning/qtci-windows-11_22H2-aarch64/90-install-ffmpeg.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\install-ffmpeg.ps1"