Update submodules on '6.10 in qt/qt5'

Change-Id: Ia8baaabda537396f0bbb607d0c2caca72e86217d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Adjust submodule branches
2026-01-03 13:37:42 +08:00 · 2025-06-09 23:14:37 +00:00 · 2025-06-02 05:49:15 +01:00 · 2025-05-24 20:01:27 +00:00 · 2025-05-22 18:21:34 +00:00 · 2025-05-20 17:45:41 +00:00
420 changed files with 4003 additions and 1954 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.9
+	branch = 6.10
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.9
+	branch = 6.10
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.9
+	branch = 6.10
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.9
+	branch = 6.10
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.9
+	branch = 6.10
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,7 +68,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = 6.9
+	branch = 6.10
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.9
+	branch = 6.10
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.9
+	branch = 6.10
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.9
-	status = addon
+	branch = 6.10
+	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.9
-	status = addon
+	branch = 6.10
+	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,88 +252,88 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.9
+	branch = 6.10
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.9
+	branch = 6.10
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.9
+	branch = 6.10
 	status = addon
--- a/coin/instructions/cmake_run_ctest.yaml
+++ b/coin/instructions/cmake_run_ctest.yaml
@@ -0,0 +1,29 @@
+type: Group
+instructions:
+  - type: AppendToEnvironmentVariable
+    variableName: CTEST_ARGS
+    variableValue: " -V"
+
+  - type: AppendToEnvironmentVariable
+    variableName: CTEST_ARGS
+    variableValue: " --stop-on-failure"
+    enable_if:
+      condition: property
+      property: features
+      contains_value: AbortTestingOnFirstFailure
+
+  - type: AppendToEnvironmentVariable
+    variableName: CTEST_ARGS
+    variableValue: " --no-label-summary"
+
+  - type: Group
+    instructions:
+      - type: ExecuteCommand
+        command: "{{.Env.TESTS_ENV_PREFIX}} ctest {{.Env.CTEST_ARGS}}"
+        executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+        ignoreExitCode: false
+        maxTimeInSeconds: 14400
+        maxTimeBetweenOutput: 14400
+        userMessageOnFailure: >
+          Failed to run tests.
+
--- a/coin/instructions/coin_run_top_level_cmake_tests.yaml
+++ b/coin/instructions/coin_run_top_level_cmake_tests.yaml
@@ -0,0 +1,27 @@
+type: Group
+instructions:
+  - !include "{{qt/qtbase}}/prepare_building_env.yaml"
+
+  - type: SetBuildDirectory
+    directory: "{{.SourceDir}}/run_cmake_tests_build"
+  - type: MakeDirectory
+    directory: "{{.BuildDir}}"
+  - type: ChangeDirectory
+    directory: "{{.BuildDir}}"
+
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_ARGS
+    variableValue: "{{.Env.CMAKE_ARGS}} {{.Env.COMMON_CMAKE_ARGS}}"
+  - type: EnvironmentVariable
+    variableName: CONFIGURE_ENV_PREFIX
+    variableValue: "{{.Env.ENV_PREFIX}}"
+
+  - type: ExecuteCommand
+    command: "{{.Env.CONFIGURE_ENV_PREFIX}} cmake {{.SourceDir}}/tests/manual/RunCMake"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to configure the RunCMake tests.
+
+  - !include "{{qt/qt5}}/cmake_run_ctest.yaml"
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -6,7 +6,26 @@ accept_configuration:

 instructions:
  Build:
-    - !include "{{qt/qt5}}/coin_qt_build_template.yaml"
+    - type: Group
+      instructions:
+        - !include "{{qt/qt5}}/coin_qt_build_template.yaml"
+      enable_if:
+        condition: property
+        property: features
+        not_contains_value: "TopLevelRunCMakeTests"
+    - type: Group
+      instructions:
+        - !include "{{qt/qt5}}/coin_run_top_level_cmake_tests.yaml"
+      enable_if:
+        condition: property
+        property: features
+        contains_value: "TopLevelRunCMakeTests"

  Test:
-    - !include "{{qt/qt5}}/coin_bic_tests.yaml"
+    - type: Group
+      instructions:
+        - !include "{{qt/qt5}}/coin_bic_tests.yaml"
+      enable_if:
+        condition: property
+        property: features
+        not_contains_value: "TopLevelRunCMakeTests"
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -87,7 +87,7 @@ Configurations:
    Id: 'ubuntu-24.04-x64'
    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM', 'DocsGenerationV2']
+    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
    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'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
@@ -99,13 +99,13 @@ Configurations:
    Id: 'ubuntu-24.04-x64-developer-build-x11-tests'
    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly', 'InsignificantTests']
+    Features: ['Sccache', 'TestOnly']
    Platform dependency: 'ubuntu-24.04-x64-developer-build'
 -
    Id: 'ubuntu-24.04-x64-x11-tests'
    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly', 'InsignificantTests']
+    Features: ['Sccache', 'TestOnly']
    Platform dependency: 'ubuntu-24.04-x64'
 -
    Id: 'opensuse-15.6-developer-build'
@@ -118,9 +118,19 @@ Configurations:
        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
    ]
+-
+    Id: 'sles-15_sp5-static'
+    Template: 'qtci-linux-SLES-15_SP5-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
+    Environment variables: [
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
+    ]
 -
    Id: 'sles-15_sp6-static'
-    Template: 'qtci-linux-SLES-15_SP6-x86_64-52'
+    Template: 'qtci-linux-SLES-15_SP6-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
@@ -142,7 +152,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_23H2-msvc2022'
-    Template: 'qtci-windows-11_23H2-x86_64-54'
+    Template: 'qtci-windows-11_23H2-x86_64-55'
    Compiler: 'MSVC2022'
    Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -152,6 +162,18 @@ Configurations:
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
+-
+    Id: 'windows-11_24H2-msvc2022'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'MSVC2022'
+    Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
+    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
+    Environment variables: [
+        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+    ]
 -
    Id: 'windows-11_22h2-arm64-msvc2022'
    Template: 'qtci-windows-11_22H2-aarch64-55'
@@ -163,44 +185,31 @@ Configurations:
        '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-11_23h2-arm64-msvc2022'
-    Template: 'qtci-windows-11_23H2-aarch64-53'
-    Compiler: 'MSVC2022'
-    Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
-    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-11_23H2-msvc2022-arm64'
-    Template: 'qtci-windows-11_23H2-x86_64-54'
+    Template: 'qtci-windows-11_23H2-x86_64-55'
    Compiler: 'MSVC2022'
    Target arch: 'arm64'
-    Features: ['Sccache', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Sccache', 'DoNotRunTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Platform dependency: 'windows-10_22h2-mingw13'
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer -no-feature-run-opengl-tests',
-        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}} -DQT_FORCE_BUILD_TOOLS=ON',
+        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -no-sql-db2 -no-opengl -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
+        '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}}',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
 -
-    Id: 'windows-11_23H2-msvc2022-arm64-23H2'
-    Template: 'qtci-windows-11_23H2-x86_64-54'
+    Id: 'windows-11_24H2-msvc2022-arm64'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'MSVC2022'
    Target arch: 'arm64'
-    Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Platform dependency: 'windows-10_22h2-mingw13'
+    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
+    Platform dependency: 'windows-11_24H2-msvc2022'
    Environment variables: [
-        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
        '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',
@@ -216,16 +225,9 @@ Configurations:
    Features: ['TestOnly']
    Configure arguments: '-no-opengl -cross-compiled'
    Platform dependency: 'windows-11_23H2-msvc2022-arm64'
-
-    Id: 'windows-11-x86_64-arm64-tests-23H2'
-    Template: 'qtci-windows-11_23H2-aarch64-53'
-    Compiler: 'MSVC2022'
-    Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
-    Configure arguments: '-cross-compiled'
-    Platform dependency: 'windows-11_23H2-msvc2022-arm64-23H2'
 -
    Id: 'windows-11_23H2-msvc2022-developer-build'
-    Template: 'qtci-windows-11_23H2-x86_64-54'
+    Template: 'qtci-windows-11_23H2-x86_64-55'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
    Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
@@ -235,6 +237,18 @@ Configurations:
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
    ]
+-
+    Id: 'windows-11_24H2-msvc2022-developer-build'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'MSVC2022'
+    Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples', 'InsignificantTests']
+    Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
+    Environment variables: [
+        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
+    ]
 -
    Id: 'rhel-8.10'
    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
@@ -249,7 +263,7 @@ Configurations:
    Id: 'rhel-9.4'
    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Packaging','Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
@@ -262,12 +276,24 @@ Configurations:
    Target arch: 'arm64'
    Compiler: 'Clang'
    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-x86_64'
+    Platform dependency: 'macos-universal-on-arm64'
    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include -DFFMPEG_DIR={{.Env.FFMPEG_DIR_IOS}} -DQT_DEPLOY_FFMPEG=TRUE',
    ]
+-
+    Id: 'visionos-developer-build'
+    Template: 'qtci-macos-15-arm-104'
+    Target os: 'IOS_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-universal-on-arm64'
+    Features: ['Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-developer-build -no-warnings-are-errors -nomake examples -nomake tests -platform macx-visionos-clang',
+    ]
 -
    Id: 'windows-10_22h2-mingw13'
    Template: 'qtci-windows-10_22H2-x86_64-53'
@@ -283,7 +309,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_23H2-llvm'
-    Template: 'qtci-windows-11_23H2-x86_64-54'
+    Template: 'qtci-windows-11_23H2-x86_64-55'
    Compiler: 'Clang'
    Features: ['Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
@@ -294,9 +320,22 @@ Configurations:
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_llvm_mingw}}',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
    ]
+-
+    Id: 'windows-11_24H2-llvm'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'Clang'
+    Features: ['Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
+    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
+    Environment variables: [
+        'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_llvm_mingw}}',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
+    ]
 -
    Id: 'windows-11_23H2-mingw13-developer-build'
-    Template: 'qtci-windows-11_23H2-x86_64-54'
+    Template: 'qtci-windows-11_23H2-x86_64-55'
    Compiler: 'Mingw'
    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
    Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
@@ -307,6 +346,19 @@ Configurations:
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
    ]
+-
+    Id: 'windows-11_24H2-mingw13-developer-build'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'Mingw'
+    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples', 'InsignificantTests']
+    Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
+    Environment variables: [
+        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
+        'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
+    ]
 -
    Id: 'jammy-arm64-debian-pkg-packaging'
    Template: 'qtci-linux-Debian-11.6-aarch64-50'
@@ -342,7 +394,7 @@ Configurations:
        'DEBIAN_RULES_REF=6.9_gles',
        'COIN_TARGET_DIST=tqtc-bookworm',
        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
-        'COIN_SBUILD_CHROOT=bookworm-arm64-sbuild',
+        'COIN_SBUILD_CHROOT=stable-arm64-sbuild',
        'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main',
        'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
    ]
--- a/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml
@@ -14,6 +14,20 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples',
        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target'
    ]
+-
+    Id: 'vxworks-imx8-buildtest'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Target os: 'VxWorks'
+    Target arch: 'ARMv7'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'ubuntu-22.04'
+    Features: ['VMSize8', 'UseConfigure', 'DoNotRunTests', 'DoNotUploadTests']
+    Environment variables: [
+        'WIND_CC_SYSROOT=/opt/nxp_imx8_1_0_6_3_VSB',
+        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples',
+        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target'
+    ]
 -
    Id: 'vxworks-x86_64-buildtest'
    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
--- a/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml
@@ -8,7 +8,7 @@ Configurations:
    Compiler: 'Clang'
    Target compiler: 'Clang'
    Platform dependency: 'vxworks-imx6-buildtest'
-    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly']
    Environment variables: [
        'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_2_VSB',
        'VXWORKS_TEST_LIBS_PATH=/opt/fsl_imx6_2_0_6_2_VSB/usr/lib/common;/opt/fsl_imx6_2_0_6_2_VSB/usr/root/llvm/bin;/opt/fsl_imx6_2_0_6_2_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib',
@@ -23,7 +23,7 @@ Configurations:
    Compiler: 'Clang'
    Target compiler: 'Clang'
    Platform dependency: 'vxworks-x86_64-buildtest'
-    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly']
    Environment variables: [
        'WIND_CC_SYSROOT=/opt/itl_generic_skylake_VSB',
        'VXWORKS_TEST_LIBS_PATH=/opt/itl_generic_skylake_VSB/usr/lib/common;/opt/itl_generic_skylake_VSB/usr/root/llvm/bin;/opt/itl_generic_skylake_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib',
--- a/coin/platform_configs/cmake_platforms_static_release.yaml
+++ b/coin/platform_configs/cmake_platforms_static_release.yaml
@@ -3,7 +3,7 @@ Configurations:

 -
    Id: 'windows-11_23H2-msvc2022-minimal-static-test'
-    Template: 'qtci-windows-11_23H2-x86_64-54'
+    Template: 'qtci-windows-11_23H2-x86_64-55'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'UseConfigure', 'Packaging', 'MinimalStaticTests']
    Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++20 -no-feature-sql-psql'
@@ -13,6 +13,18 @@ Configurations:
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
+-
+    Id: 'windows-11_24H2-msvc2022-minimal-static-test'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'MSVC2022'
+    Features: ['Sccache', 'UseConfigure', 'MinimalStaticTests', 'InsignificantTests']
+    Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++20 -no-feature-sql-psql'
+    Environment variables: [
+        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
+        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+    ]
 -
    Id: 'windows-11_22h2-arm64-msvc2022-minimal-static-test'
    Template: 'qtci-windows-11_22H2-aarch64-55'
@@ -24,19 +36,6 @@ Configurations:
        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
-
-    Id: 'windows-11_23h2-arm64-msvc2022-minimal-static-test'
-    Template: 'qtci-windows-11_23H2-aarch64-53'
-    Compiler: 'MSVC2022'
-    Features: ['UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
-    Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++17 -no-sql-psql'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF',
-        'VCPKG_HOST_TRIPLET=arm64-windows-qt',
-        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
 -
    Id: 'rhel-8.10-minimal-static-test'
    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
--- a/coin/platform_configs/cmake_platforms_static_tests.yaml
+++ b/coin/platform_configs/cmake_platforms_static_tests.yaml
@@ -1,17 +1,26 @@
 Version: 2
 Configurations:
 -
-    Id: 'sles-15_sp6-minimal-static'
-    Template: 'qtci-linux-SLES-15_SP6-x86_64-52'
+    Id: 'sles-15_sp5-minimal-static'
+    Template: 'qtci-linux-SLES-15_SP5-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
    Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
    Environment variables: [
        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
    ]
+-
+    Id: 'sles-15_sp6-minimal-static'
+    Template: 'qtci-linux-SLES-15_SP6-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure', 'InsignificantTests']
+    Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
+    Environment variables: [
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
+    ]
 -
    Id: 'windows-11_23H2-minimal-static'
-    Template: 'qtci-windows-11_23H2-x86_64-54'
+    Template: 'qtci-windows-11_23H2-x86_64-55'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
    Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
@@ -21,6 +30,18 @@ Configurations:
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
    ]
+-
+    Id: 'windows-11_24H2-minimal-static'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'MSVC2022'
+    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure', 'InsignificantTests']
+    Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
+    Environment variables: [
+        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
+    ]
 -
    Id: 'macos-minimal-static'
    Template: 'qtci-macos-14-arm-106'
--- a/coin/platform_configs/cmake_platforms_target_android.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android.yaml
@@ -2,18 +2,18 @@ Version: 2
 Configurations:
 -
    Id: 'android-arm64-on-macos'
-    Template: 'qtci-macos-13-x86_64-103'
+    Template: 'qtci-macos-14-arm-106'
    Target os: 'Android_ANY'
    Target arch: 'arm64'
    Compiler: 'Clang'
    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-x86_64'
+    Platform dependency: 'macos-universal-on-arm64'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
    ]
 -
    Id: 'android-armv7-on-windows'
@@ -26,10 +26,10 @@ Configurations:
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
    ]
 -
    Id: 'android-9-x86-on-linux'
@@ -41,10 +41,10 @@ Configurations:
    Platform dependency: 'rhel-8.10'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
        'ANDROID_EMULATOR=emulator_x86_api_28'
    ]
 -
@@ -57,10 +57,10 @@ Configurations:
    Platform dependency: 'rhel-8.10'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
        'ANDROID_EMULATOR=emulator_x86_64_api_35'
    ]
 -
@@ -71,11 +71,11 @@ Configurations:
    Compiler: 'GCC'
    Target compiler: 'Clang'
    Platform dependency: 'rhel-8.10'
-    Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
+    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
        'ANDROID_EMULATOR=emulator_x86_64_api_36'
    ]
--- a/coin/platform_configs/ios-tests.yaml
+++ b/coin/platform_configs/ios-tests.yaml
@@ -7,7 +7,7 @@ Configurations:
    Target arch: 'arm64'
    Compiler: 'Clang'
    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-x86_64'
+    Platform dependency: 'macos-universal-on-arm64'
    Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'
--- a/coin/platform_configs/linux_android_tests_developer.yaml
+++ b/coin/platform_configs/linux_android_tests_developer.yaml
@@ -10,8 +10,8 @@ Configurations:
    Platform dependency: 'rhel-8.10'
    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
        'NON_QTBASE_TARGET_CMAKE_ARGS=',
        'ANDROID_EMULATOR=emulator_x86_api_28']
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -8,29 +8,17 @@ Configurations:
    # Build on recent macOS version with latest Xcode

    -
-        Id: 'macos-universal-on-x86_64'
-        Template: 'qtci-macos-15-x86_64-103'
+        Id: 'macos-universal-on-arm64'
+        Template: 'qtci-macos-15-arm-104'
        Compiler: 'Clang'
        Target arch: 'x86_64-arm64'
-        Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+        Features: ['Packaging', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
        Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
        Environment variables: [
            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
            'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_FEATURE_open62541_security=OFF',
        ]

-    -
-        Id: 'macos-universal-on-arm64'
-        Template: 'qtci-macos-14-arm-106'
-        Compiler: 'Clang'
-        Target arch: 'x86_64-arm64'
-        Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-        Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
-        Environment variables: [
-            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"',
-            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
-        ]
-
    # Test on all supported macOS versions (deployment targets)

    # On x86_64
@@ -40,19 +28,19 @@ Configurations:
        Template: 'qtci-macos-13-x86_64-103'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
+        Platform dependency: 'macos-universal-on-arm64'
    -
        Id: 'macos-14-x86_64-tests'
        Template: 'qtci-macos-14-x86_64-105'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
+        Platform dependency: 'macos-universal-on-arm64'
    -
        Id: 'macos-15-x86_64-tests'
        Template: 'qtci-macos-15-x86_64-103'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
+        Platform dependency: 'macos-universal-on-arm64'

    # And arm64

@@ -61,45 +49,18 @@ Configurations:
        Template: 'qtci-macos-13-arm-107'
        Compiler: 'Clang'
        Features: ['TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
+        Platform dependency: 'macos-universal-on-arm64'
    -
        Id: 'macos-14-arm64-tests'
        Template: 'qtci-macos-14-arm-106'
        Compiler: 'Clang'
        Features: ['TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
+        Platform dependency: 'macos-universal-on-arm64'
    -
        Id: 'macos-15-arm64-tests'
        Template: 'qtci-macos-15-arm-104'
        Compiler: 'Clang'
        Features: ['TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
-
-    # Test the universal packaging built on arm64
-
-    -
-        Id: 'macos-13-arm-on-arm64-tests'
-        Template: 'qtci-macos-13-arm-107'
-        Compiler: 'Clang'
-        Features: ['TestOnly']
-        Platform dependency: 'macos-universal-on-arm64'
-    -
-        Id: 'macos-13-arm-on-x86_64-tests'
-        Template: 'qtci-macos-13-x86_64-103'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-universal-on-arm64'
-    -
-        Id: 'macos-14-arm-on-x86_64-tests'
-        Template: 'qtci-macos-14-x86_64-105'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-universal-on-arm64'
-    -
-        Id: 'macos-15-arm-on-x86_64-tests'
-        Template: 'qtci-macos-15-x86_64-103'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'InsignificantTests']
        Platform dependency: 'macos-universal-on-arm64'

    # =========================================================================
@@ -146,5 +107,5 @@ Configurations:
        Id: 'macos-15-arm64-developer-build-tests'
        Template: 'qtci-macos-15-arm-104'
        Compiler: 'Clang'
-        Features: ['TestOnly', 'InsignificantTests']
+        Features: ['TestOnly']
        Platform dependency: 'macos-arm64-developer-build'
--- a/coin/platform_configs/meta-boot2qt-qcom-hwe.yaml
+++ b/coin/platform_configs/meta-boot2qt-qcom-hwe.yaml
@@ -0,0 +1,4 @@
+Version: 2
+Module only: True
+Include: [yocto.yaml]
+Configurations: []
--- a/coin/platform_configs/nightly_android_namespace.yaml
+++ b/coin/platform_configs/nightly_android_namespace.yaml
@@ -1,33 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        'rhel-8.10'
-    ],
-    cmake_platforms_target_android.yaml: [
-        'android-15-x86_64-on-linux',
-        'android-9-x86-on-linux'
-    ]
-]
-Configurations: []
-# Android nightly to check for -qtnamespace errors/issues
-Overrides:
-
-    Id: 'android-15-x86_64-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-qtnamespace TestNamespace -nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_35'
-    ]
-
-    Id: 'android-9-x86-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-qtnamespace TestNamespace -nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
-        'ANDROID_EMULATOR=emulator_x86_api_28'
-    ]
--- a/coin/platform_configs/nightly_android_ndk1.yaml
+++ b/coin/platform_configs/nightly_android_ndk1.yaml
@@ -1,58 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        'rhel-8.10',
-        'windows-10_22h2-mingw13'
-    ],
-    cmake_platforms_target_android.yaml: [
-        'android-15-x86_64-on-linux',
-        'android-9-x86-on-linux',
-        'android-armv7-on-windows',
-        'android-arm64-on-macos'
-    ],
-    macos.yaml: [
-        'macos-universal-on-arm64'
-    ]
-]
-Configurations: []
-# Android nightly to check for older (but still supported for the branch) NDKs
-Overrides:
-
-    Id: 'android-15-x86_64-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_35'
-    ]
-
-    Id: 'android-9-x86-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}',
-        'ANDROID_EMULATOR=emulator_x86_api_28'
-    ]
-
-    Id: 'android-armv7-on-windows'
-    Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}'
-    ]
-
-    Id: 'android-arm64-on-macos'
-    Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}'
-    ]
--- a/coin/platform_configs/nightly_android_ndk2.yaml
+++ b/coin/platform_configs/nightly_android_ndk2.yaml
@@ -1,58 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        'rhel-8.10',
-        'windows-10_22h2-mingw13'
-    ],
-    cmake_platforms_target_android.yaml: [
-        'android-15-x86_64-on-linux',
-        'android-9-x86-on-linux',
-        'android-armv7-on-windows',
-        'android-arm64-on-macos'
-    ],
-    macos.yaml: [
-        'macos-universal-on-arm64'
-    ]
-]
-Configurations: []
-# Android nightly to check for older (but still supported for the branch) NDKs
-Overrides:
-
-    Id: 'android-15-x86_64-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_35'
-    ]
-
-    Id: 'android-9-x86-on-linux'
-    Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}',
-        'ANDROID_EMULATOR=emulator_x86_api_28'
-    ]
-
-    Id: 'android-armv7-on-windows'
-    Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}'
-    ]
-
-    Id: 'android-arm64-on-macos'
-    Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}'
-    ]
--- a/coin/platform_configs/nightly_examples_and_tests.yaml
+++ b/coin/platform_configs/nightly_examples_and_tests.yaml
@@ -0,0 +1,14 @@
+Version: 2
+Configurations:
+-
+    Id: 'ubuntu-24.04-x64-examples-and-tests-build'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'NoSubmoduleDependencies']
+    Configure arguments: '-make examples -make tests'
+    Environment variables: [
+        'COMMON_CMAKE_ARGS=-DQT_BUILD_EXAMPLES_AS_EXTERNAL=OFF -DQT_GENERATE_SBOM=OFF',
+        'COMMON_NON_QTBASE_CMAKE_ARGS=-DQT_BUILD_EXAMPLES_AS_EXTERNAL=OFF -DQT_GENERATE_SBOM=OFF',
+        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
+    ]
--- a/coin/platform_configs/nightly_qt5_axivion.yaml
+++ b/coin/platform_configs/nightly_qt5_axivion.yaml
@@ -1,13 +1,12 @@
 Version: 2
 Module only: True
-Configurations:
+Include: [
+  cmake_platforms.yaml: [
+    "ubuntu-22.04"
+  ]
+]
+Configurations: []
+Overrides:
 -
-    Id: 'ubuntu-22.04-axivion'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Axivion', 'DisableTests', 'UseConfigure', 'VMSize8']
-    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'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE'
-    ]
+    Id: 'ubuntu-22.04'
+    Features: ['Axivion', 'DisableTests', 'UseConfigure', 'VMSize16']
--- a/coin/platform_configs/nightly_top_level_run_cmake_tests.yaml
+++ b/coin/platform_configs/nightly_top_level_run_cmake_tests.yaml
@@ -0,0 +1,9 @@
+Version: 2
+Configurations:
+-
+    Id: 'ubuntu-24.04-x64-run-cmake-tests'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'NoSubmoduleDependencies', 'TopLevelRunCMakeTests', 'DisableTests', 'VMSize16']
+    Configure arguments: ''
+    Environment variables: []
--- a/coin/platform_configs/nightly_unity_builds.yaml
+++ b/coin/platform_configs/nightly_unity_builds.yaml
@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
    Id: 'windows-11_23H2-msvc2022-unity-build'
-    Template: 'qtci-windows-11_23H2-x86_64-54'
+    Template: 'qtci-windows-11_23H2-x86_64-55'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests']
    Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib'
@@ -12,6 +12,18 @@ Configurations:
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
+-
+    Id: 'windows-11_24H2-msvc2022-unity-build'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'MSVC2022'
+    Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests', 'InsignificantTests']
+    Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib'
+    Environment variables: [
+        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DQT_UNITY_BUILD=ON',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+    ]
 -
    Id: 'rhel-8.10-unity-build'
    Template: 'qtci-linux-RHEL-8.10-x86_64-50'
--- a/coin/platform_configs/nightly_windows.yaml
+++ b/coin/platform_configs/nightly_windows.yaml
@@ -0,0 +1,21 @@
+Version: 2
+Configurations: []
+Include: [
+    cmake_platforms.yaml: [
+        'windows-11_23H2-msvc2022-developer-build',
+        'windows-11_23H2-mingw13-developer-build',
+        'windows-11_23H2-llvm'
+    ]
+]
+# Windows nightly to check for -qtnamespace errors/issues
+Overrides:
+-
+    Id: 'windows-11_23H2-msvc2022-developer-build'
+    Configure arguments: '-qtnamespace TestNamespace -debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
+-
+    Id: 'windows-11_23H2-mingw13-developer-build'
+    Configure arguments: '-qtnamespace TestNamespace -developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
+-
+    Id: 'windows-11_23H2-llvm'
+    Features: ['Sccache', 'UseConfigure']
+    Configure arguments: '-qtnamespace TestNamespace -release -force-debug-info -separate-debug-info -nomake examples'
--- a/coin/platform_configs/precheck.yaml
+++ b/coin/platform_configs/precheck.yaml
@@ -6,6 +6,7 @@ Include: [
    "ubuntu-22.04-developer-build",
    "ubuntu-22.04-developer-build-x11-tests",
    "windows-11_23H2-msvc2022-developer-build",
+    "windows-11_24H2-msvc2022-developer-build",
    "ios-universal"
  ],
  macos.yaml: [
--- a/coin/platform_configs/qt-creator.yaml
+++ b/coin/platform_configs/qt-creator.yaml
@@ -2,12 +2,19 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-11_23H2-x86_64-54'
+    Template: 'qtci-windows-11_23H2-x86_64-55'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease']
    Configure arguments: ''
    Environment variables: []
    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
+-
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'MSVC2022'
+    Features: ['Sccache', 'DebugAndRelease', 'InsignificantTests']
+    Configure arguments: ''
+    Environment variables: []
+    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 -
    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
    Compiler: 'GCC'
@@ -28,7 +35,14 @@ Configurations:
    Environment variables: []
 # without tests
 -
-    Template: 'qtci-windows-11_23H2-x86_64-54'
+    Template: 'qtci-windows-11_23H2-x86_64-55'
+    Compiler: 'MSVC2022'
+    Features: ['Sccache', 'DebugAndRelease', 'DisableTests']
+    Configure arguments: ''
+    Environment variables: []
+    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
+-
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease', 'DisableTests']
    Configure arguments: ''
@@ -36,12 +50,19 @@ Configurations:
    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 # oldest Qt version
 -
-    Template: 'qtci-windows-11_23H2-x86_64-54'
+    Template: 'qtci-windows-11_23H2-x86_64-55'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
    Configure arguments: ''
    Environment variables: []
    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
+-
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'MSVC2022'
+    Features: ['Sccache', 'DebugAndRelease', 'OldestQt', 'InsignificantTests']
+    Configure arguments: ''
+    Environment variables: []
+    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 -
    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
    Compiler: 'GCC'
--- a/coin/platform_configs/qtcharts.yaml
+++ b/coin/platform_configs/qtcharts.yaml
@@ -14,3 +14,7 @@ Overrides:
 -
    Id: 'vxworks-x86_64-tests'
    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
+# Remove imx8 tests.
+-
+    Id: 'vxworks-imx8-buildtest'
+    Features: ['VMSize8', 'UseConfigure', 'DisableTests']
--- a/coin/platform_configs/qtgamepad.yaml
+++ b/coin/platform_configs/qtgamepad.yaml
@@ -0,0 +1,6 @@
+Version: 2
+Include: [
+    cmake_platforms.yaml,
+    address_sanitizer_platforms.yaml
+    ]
+Configurations: []
--- a/coin/platform_configs/qtgradleplugin.yaml
+++ b/coin/platform_configs/qtgradleplugin.yaml
@@ -0,0 +1,23 @@
+Version: 2
+Include: []
+Configurations:
+-
+    Id: 'qtgp-on-linux'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['TestOnly']
+-
+    Id: 'qtgp-on-macos'
+    Template: 'qtci-macos-14-arm-106'
+    Compiler: 'Clang'
+    Features: ['TestOnly']
+-
+    Id: 'qtgp-on-windows'
+    Template: 'qtci-windows-11_23H2-x86_64-55'
+    Compiler: 'MSVC2022'
+    Features: ['TestOnly']
+-
+    Id: 'qtgp-on-windows-24h2'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'MSVC2022'
+    Features: ['TestOnly', 'InsignificantTests']
--- a/coin/platform_configs/qtlite.yaml
+++ b/coin/platform_configs/qtlite.yaml
@@ -195,6 +195,8 @@ Configurations:
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
        'NON_QTBASE_CMAKE_ARGS=
         -DFEATURE_qdoc=off
+         -DFEATURE_quick3d_assimp=off
+         -DFEATURE_quick3dxr_openxr=off
         -DFEATURE_qml_animation=off
         -DFEATURE_qml_debug=off
         -DFEATURE_qml_jit=off
--- a/coin/platform_configs/qtmultimedia.yaml
+++ b/coin/platform_configs/qtmultimedia.yaml
@@ -6,3 +6,8 @@ Include: [
    address_sanitizer_platforms.yaml
    ]
 Configurations: []
+Overrides:
+# Remove imx8 tests.
+-
+    Id: 'vxworks-imx8-buildtest'
+    Features: ['VMSize8', 'UseConfigure', 'DisableTests']
--- a/coin/platform_configs/qtquick3d.yaml
+++ b/coin/platform_configs/qtquick3d.yaml
@@ -4,7 +4,8 @@ Include: [
    integrity.yaml,
    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    address_sanitizer_platforms.yaml
+    address_sanitizer_platforms.yaml,
+    qtlite.yaml
 ]
 Configurations: []
 Overrides:
--- a/coin/platform_configs/qtsaferenderer-runtime.yaml
+++ b/coin/platform_configs/qtsaferenderer-runtime.yaml
@@ -1,20 +1,25 @@
 Version: 2
 Include: [
  macos.yaml: [
-     "macos-universal-on-x86_64",
-     "macos-13-x86_64-tests",
-     "macos-13-arm-on-arm64-tests"
+     "macos-universal-on-arm64",
+     "macos-13-x86_64-tests"
  ],
  cmake_platforms.yaml: [
    "ubuntu-22.04",
    "ubuntu-22.04-developer-build",
+    "ubuntu-24.04-arm64",
    "opensuse-15.6-developer-build",
+    "sles-15_sp5-static",
    "sles-15_sp6-static",
    "windows-10_22h2-msvc2022",
    "rhel-8.10",
    "windows-10_22h2-mingw13",
    "windows-11_23H2-mingw13-developer-build",
    "windows-11_23H2-llvm",
+    "windows-11_23H2-msvc2022",
+    "windows-11_24H2-mingw13-developer-build",
+    "windows-11_24H2-llvm",
+    "windows-11_24H2-msvc2022",
    "windows-11_22h2-arm64-msvc2022"
  ],
  cmake_platforms_qemu_qnx710.yaml: [
@@ -29,9 +34,16 @@ Include: [
    "qemu-arm64-developer-build",
    "qemu-armv7-developer-build",
    "qemu-mips64-developer-build"
-  ]
+  ],
+  offline_documentation.yaml
 ]
 Configurations:
+-
+    Id: 'macos-13-arm64-tests'
+    Template: 'qtci-macos-13-arm-107'
+    Compiler: 'Clang'
+    Features: ['TestOnly']
+    Platform dependency: 'macos-universal-on-arm64'
 -
    Id: 'Axivion-QEMU_build'
    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -1,33 +1,40 @@
 Version: 2
 Include: [
  macos.yaml: [
-     "macos-universal-on-x86_64",
-     "macos-13-x86_64-tests",
-     "macos-13-arm-on-arm64-tests"
+     "macos-universal-on-arm64",
+     "macos-14-x86_64-tests",
+     "macos-14-arm64-tests"
  ],
  cmake_platforms.yaml: [
    "ubuntu-22.04",
    "ubuntu-22.04-developer-build",
+    "ubuntu-24.04-arm64",
    "opensuse-15.6-developer-build",
+    "sles-15_sp5-static",
    "sles-15_sp6-static",
    "windows-10_22h2-msvc2022",
    "rhel-8.10",
    "windows-10_22h2-mingw13",
    "windows-11_23H2-mingw13-developer-build",
    "windows-11_23H2-llvm",
+    "windows-11_23H2-msvc2022",
+    "windows-11_24H2-mingw13-developer-build",
+    "windows-11_24H2-llvm",
+    "windows-11_24H2-msvc2022",
    "windows-11_22h2-arm64-msvc2022"
  ],
  cmake_platforms_qemu_qnx710.yaml: [
    "qnx-710-x86_64-developer-build-on-linux",
    "qnx-710-arm64-on-linux",
    "qnx-710-armv7-on-linux"
-  ]
+  ],
+  offline_documentation.yaml
 ]
 # Static build configurations for tools
 Configurations:
 -
-    Id: 'macos-latest-xcode-universal-static-build'
-    Template: 'qtci-macos-13-arm-107'
+    Id: 'macos-14-latest-xcode-universal_Static'
+    Template: 'qtci-macos-14-arm-106'
    Compiler: 'Clang'
    Target arch: 'x86_64-arm64'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
@@ -45,6 +52,28 @@ Configurations:
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
        'NON_QTBASE_CMAKE_ARGS=-DINPUT_headersclean=ON'
    ]
+-
+    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-53'
--- a/coin/platform_configs/qtvirtualkeyboard.yaml
+++ b/coin/platform_configs/qtvirtualkeyboard.yaml
@@ -14,3 +14,7 @@ Overrides:
 -
    Id: 'vxworks-x86_64-tests'
    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
+# Remove imx8 tests.
+-
+    Id: 'vxworks-imx8-buildtest'
+    Features: ['VMSize8', 'UseConfigure', 'DisableTests']
--- a/coin/platform_configs/qtwayland.yaml
+++ b/coin/platform_configs/qtwayland.yaml
@@ -3,4 +3,18 @@ Include: [
    cmake_platforms.yaml,
    address_sanitizer_platforms.yaml
 ]
-Configurations: []
+Configurations:
+# Test on Ubuntu 24.04 ARM64 Wayland
+-
+    Id: 'ubuntu-24.04-arm64-developer-build-wayland-tests'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests']
+    Platform dependency: 'ubuntu-24.04-arm64-developer-build'
+# Test on Ubuntu 24.04 x64 Wayland
+-
+    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'
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -4,9 +4,11 @@ Include: [
        "documentation-warnings",
        "rhel-8.10",
        'windows-10_22h2-mingw13',
+        'ubuntu-22.04-developer-build',
+        'ubuntu-22.04-developer-build-x11-tests'
    ],
    macos.yaml: [
-        'macos-universal-on-x86_64'
+        'macos-universal-on-arm64'
    ],
    cmake_platforms_target_android.yaml: [
        'android-arm64-on-macos',
@@ -27,8 +29,8 @@ Configurations:
    Platform dependency: 'rhel-8.10'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_34'
@@ -43,8 +45,8 @@ Configurations:
    Platform dependency: 'rhel-8.10'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_29'
--- a/coin/platform_configs/tqtc-qtpip.yaml
+++ b/coin/platform_configs/tqtc-qtpip.yaml
@@ -6,7 +6,7 @@ Include: [
    "rhel-8.10"
  ],
  macos.yaml: [
-    "macos-universal-on-x86_64"
+    "macos-universal-on-arm64"
  ]
 ]
 Configurations: []
--- a/coin/pre-provisioning/qtci-linux-CentOS-8.3-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-CentOS-8.3-x86_64/README_MANUAL_INSTALLATIONS
@@ -42,6 +42,8 @@ su
 echo "add_drivers+=\"virtio-blk\"" >> /etc/dracut.conf.d/virtio.conf
 dracut -f

+yum -y install qemu-guest-agent
+
 # Fetch and run coin-setup
 Download http://coin/coin/binary/linux_amd64/coin-setup
 run './coin-setup'
--- a/coin/pre-provisioning/qtci-linux-RHEL-8.10-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-RHEL-8.10-x86_64/README_MANUAL_INSTALLATIONS
@@ -46,6 +46,8 @@ su
 echo "add_drivers+=\" virtio-blk \"" >> /etc/dracut.conf.d/virtio.conf
 dracut -f

+yum -y install qemu-guest-agent
+
 # Do these from Opennebula UI!

 # Enable network connection from right upper corner
--- a/coin/pre-provisioning/qtci-linux-RHEL-8.2-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-RHEL-8.2-x86_64/README_MANUAL_INSTALLATIONS
@@ -41,6 +41,8 @@ su
 echo "add_drivers+=\"virtio-blk\"" >> /etc/dracut.conf.d/virtio.conf
 dracut -f

+yum -y install qemu-guest-agent
+
 # Fetch and run coin-setup
 Download http://coin/coin/binary/linux_amd64/coin-setup
 run './coin-setup'
--- a/coin/pre-provisioning/qtci-linux-RHEL-8.4-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-RHEL-8.4-x86_64/README_MANUAL_INSTALLATIONS
@@ -52,6 +52,8 @@ su
 echo "add_drivers+=\"virtio-blk\"" >> /etc/dracut.conf.d/virtio.conf
 dracut -f

+yum -y install qemu-guest-agent
+
 # Enable network connection from right upper corner

 # Fetch and run coin-setup
--- a/coin/pre-provisioning/qtci-linux-RHEL-8.6-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-RHEL-8.6-x86_64/README_MANUAL_INSTALLATIONS
@@ -46,13 +46,15 @@ su
 echo "add_drivers+=\"virtio-blk\"" >> /etc/dracut.conf.d/virtio.conf
 dracut -f

+yum -y install qemu-guest-agent
+
 # Do these from Opennebula UI!

 # Enable network connection from right upper corner

 Devices:
    * Displays: Resolution 1280 x 800
-    
+
 # Fetch and run coin-setup
 Download http://coin/coin/binary/linux_amd64/coin-setup
 # run as qt user
--- a/coin/pre-provisioning/qtci-linux-RHEL-8.8-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-RHEL-8.8-x86_64/README_MANUAL_INSTALLATIONS
@@ -46,6 +46,8 @@ su
 echo "add_drivers+=\" virtio-blk \"" >> /etc/dracut.conf.d/virtio.conf
 dracut -f

+yum -y install qemu-guest-agent
+
 # Do these from Opennebula UI!

 # Enable network connection from right upper corner
--- a/coin/pre-provisioning/qtci-linux-RHEL-9.0-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-RHEL-9.0-x86_64/README_MANUAL_INSTALLATIONS
@@ -42,6 +42,8 @@ su
 echo "add_drivers+=\" virtio-blk \"" >> /etc/dracut.conf.d/virtio.conf
 dracut -f

+yum -y install qemu-guest-agent
+
 # Enable network connection from right upper corner

 # Fetch and run coin-setup
--- a/coin/pre-provisioning/qtci-linux-RHEL-9.2-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-RHEL-9.2-x86_64/README_MANUAL_INSTALLATIONS
@@ -42,6 +42,8 @@ su
 echo "add_drivers+=\" virtio-blk \"" >> /etc/dracut.conf.d/virtio.conf
 dracut -f

+yum -y install qemu-guest-agent
+
 # Do these from Opennebula UI!

 # Enable network connection from right upper corner
--- a/coin/pre-provisioning/qtci-linux-RHEL-9.4-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-RHEL-9.4-x86_64/README_MANUAL_INSTALLATIONS
@@ -38,6 +38,9 @@ sudo grub2-mkconfig -o /boot/grub2/grub.cfg
 su
 echo "add_drivers+=\" virtio-blk \"" >> /etc/dracut.conf.d/virtio.conf
 dracut -f
+
+yum -y install qemu-guest-agent
+
 # Do these from Opennebula UI!

 # Enable network connection from right upper corner
--- a/coin/pre-provisioning/qtci-linux-SLES-15_SP3-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-SLES-15_SP3-x86_64/README_MANUAL_INSTALLATIONS
@@ -37,6 +37,8 @@ sudo ./coin-setup
 sudo echo "add_drivers+=\"virtio-blk\"" >> /etc/dracut.conf.d/virtio.conf
 sudo dracut -f

+sudo zypper -nq install qemu-guest-agent
+
 # Add these to '/etc/polkit-default-privs.local'
 org.freedesktop.udisks2.filesystem-mount                yes
 org.freedesktop.udisks2.filesystem-mount-other-seat     yes
--- a/coin/pre-provisioning/qtci-linux-SLES-15_SP4-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-SLES-15_SP4-x86_64/README_MANUAL_INSTALLATIONS
@@ -31,6 +31,8 @@ sudo su -
 echo "add_drivers+=\"virtio-blk\"" >/etc/dracut.conf.d/virtio.conf
 dracut -f

+sudo zypper -nq install qemu-guest-agent
+
 # Add these to /etc/polkit-default-privs.local
 org.freedesktop.udisks2.filesystem-mount yes
 org.freedesktop.udisks2.filesystem-mount-other-seat yes
--- a/coin/pre-provisioning/qtci-linux-SLES-15_SP5-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-SLES-15_SP5-x86_64/README_MANUAL_INSTALLATIONS
@@ -35,6 +35,8 @@ sudo su -
 echo 'add_drivers+=" virtio-blk "' >/etc/dracut.conf.d/virtio.conf
 dracut -f

+sudo zypper -nq install qemu-guest-agent
+
 # Add these to /etc/polkit-default-privs.local
 org.freedesktop.udisks2.filesystem-mount yes
 org.freedesktop.udisks2.filesystem-mount-other-seat yes
--- a/coin/pre-provisioning/qtci-linux-SLES-15_SP6-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-SLES-15_SP6-x86_64/README_MANUAL_INSTALLATIONS
@@ -35,6 +35,8 @@ sudo su -
 echo 'add_drivers+=" virtio-blk "' >/etc/dracut.conf.d/virtio.conf
 dracut -f

+sudo zypper -nq install qemu-guest-agent
+
 # Disable coredump
 chkconfig kdump off
 echo 'Storage=none' >> /etc/systemd/coredump.conf.d/custom.conf
@@ -78,10 +80,3 @@ chmod 755 ./coin-setup
 run ./coin-setup

 sudo reboot now
-
-# Select login session type
-After reboot into user qt:
- log out
- select session type "Gnome Classic" in session selector on the login sreen (gear wheel on bottom right)
- reboot again with sudo reboot now
- verify that auto login lands in normal desktop
--- a/coin/pre-provisioning/qtci-linux-Ubuntu-20.04-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-Ubuntu-20.04-x86_64/README_MANUAL_INSTALLATIONS
@@ -51,6 +51,8 @@ run 'sudo apt install openssh-server'
 # Disable firewall
 run 'sudo ufw disable'

+run 'sudo apt install qemu-guest-agent'
+
 # Fetch and run coin-setup (in Opennebula)
 Download http://coin/coin/binary/linux_amd64/coin-setup
 run './coin-setup'
--- a/coin/pre-provisioning/qtci-linux-Ubuntu-24.04-aarch64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-Ubuntu-24.04-aarch64/README_MANUAL_INSTALLATIONS
@@ -51,6 +51,8 @@ run 'sudo apt install openssh-server'
 # Disable firewall
 run 'sudo ufw disable'

+run 'sudo apt install qemu-guest-agent'
+
 # Fetch and run coin-setup (in Opennebula)
 Download http://coin/coin/binary/linux_arm64/coin-setup
 run 'chmod +x ./coin-setup' to make it executable
--- a/coin/pre-provisioning/qtci-linux-Ubuntu-24.04-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-Ubuntu-24.04-x86_64/README_MANUAL_INSTALLATIONS
@@ -51,6 +51,8 @@ run 'sudo apt install openssh-server'
 # Disable firewall
 run 'sudo ufw disable'

+run 'sudo apt install qemu-guest-agent'
+
 # Fetch and run coin-setup (in Opennebula)
 Download http://coin/coin/binary/linux_amd64/coin-setup
 run 'chmod +x ./coin-setup' to make it executable
--- a/coin/pre-provisioning/qtci-linux-openSUSE-15.4-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-openSUSE-15.4-x86_64/README_MANUAL_INSTALLATIONS
@@ -40,3 +40,5 @@ Display and Monitor - Display Configuration - 1280x800
 Power Management: Screen Energy Saving - unselect

 add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
+
+sudo zypper -nq install qemu-guest-agent
--- a/coin/pre-provisioning/qtci-linux-openSUSE-15.5-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-openSUSE-15.5-x86_64/README_MANUAL_INSTALLATIONS
@@ -32,4 +32,6 @@ Power Management: Screen Energy Saving - unselect
                  Suspend Session - unselect
 YaST - Hardware - Sound - Add Dummy soundcard

+sudo zypper -nq install qemu-guest-agent
+
 Reboot
--- a/coin/pre-provisioning/qtci-linux-openSUSE-15.6-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-openSUSE-15.6-x86_64/README_MANUAL_INSTALLATIONS
@@ -36,4 +36,6 @@ Power Management: Screen Energy Saving - unselect
                  Suspend Session - unselect
 YaST - Hardware - Sound - Add Dummy soundcard

+sudo zypper -nq install qemu-guest-agent
+
 Reboot
--- a/coin/pre-provisioning/qtci-macos-arm/README
+++ b/coin/pre-provisioning/qtci-macos-arm/README
@@ -19,10 +19,10 @@
    - Edit sudoers file: sudo visudo
    - Add a line for qt user: qt ALL=(ALL) NOPASSWD: ALL
  - Download and run coin setup binaries from http://coin/coin/setup
-    - Check /Users/qt folder for bootstrap agent
-  - Add COIN bootstrap agent, terminal and ssh keygen wrapper to full disk access
-  - Add access for COIN bootstrap agent to bluetooth
-  - Enable VNC renmote access
+    - DO NOT use sudo when running coin-setup
+    - Check /Users/qt folder for the bootstrap agent binary file
+  - Add terminal and ssh keygen wrapper to full disk access
+  - Enable VNC remote access
  - Shutdown the virtual machine

 * Enable backtraces (https://bugreports.qt.io/browse/QTQAINFRA-5933)
@@ -32,9 +32,9 @@
  - Shutdown the virtual machine

 * Push virtual machine to Tart registry with tags latest and CI
-  - /Users/oneadmin/tart.app/Contents/MacOS/tart push "<macos-version>" "tart-registry.ci.qt.io/<macos-version>:latest" "tart-registry.ci.qt.io/<macos-version>:CI"
+  - /Users/oneadmin/tart.app/Contents/MacOS/tart push --insecure "<macos-version>" "tart-registry.ci.qt.io:5000/<macos-version>:latest" "tart-registry.ci.qt.io:5000/<macos-version>:CI"

-* Add Tier1 image to Opennebula by logging getting into Opennebula container
+* Add Tier1 image to Opennebula by logging into Opennebula container
  - Create a dummy file to correct datastore in NFS
  - Register virtual machine to Opennebula by running register_images.sh

--- a/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/README_MANUAL_INSTALLATIONS
@@ -9,6 +9,9 @@ Custom: Install Windows only (advanced)

 # NOTE! virtio-win-0.1.204 need to be attached with virt-install
 Load driver - browse - virtio-win-0.1.204 - amd64 - w10 - Select Red Hat VirtIO SCSI controller - next - next
+Navigate to E:\guest-agent (directory on the attached drive)
+and double click qemu-ga-x86_64
+

 Region: Finland
 Keyboard layout: United Kingdom
--- a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/README_MANUAL_INSTALLATIONS
@@ -1,90 +0,0 @@
-# Follow manual pre-setup from intra to install Windows 11 ARM and virtio drivers:
-# "How to create a Windows 11 ARM tier1 image using Qemu"
-
-# Configure Windows after pre-setup
-* Enable Remote Desktop:
-   - Settings - System - Remote Desktop - On
-      - Note: Display settings cannot be changed by remote
-* Resolution set to 1280x800
-   - System > Display > Custom scaling > Advanced display
-   - 1024 x 768 is unchangable by default
-* Coin-setup:
-   - Download from https://[Coin_IP_from_build_logs]/coin/setup --> Windows Setup ARM64 .exe
-      - Open PowerShell as Administrator
-      - Run Windows Setup ARM64 .exe
-   - Verify from output that all these are OK
-      - Installing Boostrap agent
-      - Disabling fast boot
-      - Disabling firewall
-      - Disabling UAC
-      - Enabling autologin
-      - Automatic login
-      - Disabling windows updates
-* Turn off Windows defender:
-   - Microsoft Defender Antivirus turned off: Open 'gpedit.msc':  'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Microsoft Defender Antivirus'
-      - Edit 'Turn off Microsoft Defender Antivirus' > 'Enabled' > 'Apply'
-   - Reboot on Safe mode:
-      - Open msconfig - Boot tab - enable “Safe boot“ - apply - restart
-      - In Safe mode:
-         - Take Ownership of Defender:
-            - Open properties - Right click "C:\Program Files\Windows Defender\Platform" and select 'Properties'
-            - Open Security tab - Advanced - Owner: Change - Advanced - Find now - Select Administrators - Ok - Ok - Apply
-               - Close 'Platform Properties' window for actions to take effect and open 'Properties' again
-               - This should get 'Disable inheritance' available for the next step
-            - Remove all Permissions: Permissions tab - Select 'Disable inheritance'
-               - Remove all entries
-                  -Select 'Remove all inherited permissions from this object'
-                  -Select 'Replace all child object permi…' - Apply
-         - Disable Windows defender also from RegEdit:
-            - Open regedit - Navigate to 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services'
-            - Change the following folders the key Start to 4
-               - Sense (Windows defender advanced threat protection)
-               - WdBoot (Windows defender boot)
-               - WdFilter (Microsoft antimalware file system filter driver)
-               - WdNisDrv (Windows Defender Network Inspection Driver)
-               - WdNisSvc (Windows Defender Network Inspection Service)
-               - WinDefend (Windows Defender Antivirus Service)
-               - mpssvc (Windows Defender Firewall)
-   - NOTE! Without these step windows defender can't be disabled!
-   - Reboot back to normal mode
-* Background defrag disabled: 'Defragment And Optimize Drives' - 'change settings' - unchecked "run on a schedule"
-   - Run in terminal: 'schtasks /Delete /TN "Microsoft\Windows\Defrag\ScheduledDefrag"'
-   - (Running optimize drivers doesn't seem to fix the status, if there's a 10% space optimization recommended)
-* Time:
-   - Settings - System - Date & time - Time zone: '(UTC) Coordinated Universal Time'
-   - Settings - System - Date & time - "Set the time automatically: Off"
-* Regional format:
-   - Settings - Time & language - Language and region - regional format - English (United States)
-* Power saver:
-   - Settings - System - Power - Screen and sleep: set 'When plugged in, turn off my screen after' to 'never'
-* Windows search disabled:
-   - 'C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Administrative Tools\Services' - 'Windows search' - stop & disable
-* Sysmain disabled:
-   - 'C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Administrative Tools\Services' - 'SysMain' - stop & disable
-* Windows update:
-   - Settings - Windows Update - run available updates
-   - (Windows update2025-06 Cumulative Update for Windows 11 Version 23H2 for arm64-based Systems (KB5060999))
-   - After reboot disable windows updates:
-      - 'C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Administrative Tools\Services' - 'Windows update' - stop & disable
-* Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support"
-* Disable Windows Restore Points: Search 'Create a restore point' -> 'System Protection' tab -> Configure C: drive -> Disable & Delete restore points.
-* Disable widgets: Right click the task bar -> 'Taskbar settings' -> toggle off anything related to widgets.
-* (Restart Windows: shutdown /r)
-* Google Chrome installed for RTA
-* Virus & threat protection settings:
-   * Check that there's no active antivirus providers
-* Run .NET runtime optimization service: open terminal and run:
-   Start-Process -NoNewWindow -FilePath "C:\WINDOWS\Microsoft.NET\Framework64\v4.0.30319\ngen.exe" -ArgumentList ExecuteQueuedItems -Wait
-   - It may be needed to rerun after installing Visual Studio. Just run it until it prints:
-      "All compilation targets are up to date."
-* Activate Windows
-
-# Next
-Install Visual Studio 2022 by following msvc2022.txt
-
-Proceed to install pre-provisioning scripts manually to Tier1 image
- * Copying scripts happens easiest via Remote Desktop
- * Ensure to have sourced scripts e.g. helpers.ps1 included
- * If running scripts is restricted: Use these to allow scripts in Tier1
-   * Get-ExecutionPolicy -List        # To check the status
-   * Set-ExecutionPolicy RemoteSigned -Scope CurrentUser -Force
--- a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-clean-manager.ps1
+++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-clean-manager.ps1
@@ -1,8 +0,0 @@
-# This script will disable automatic disk cleanup
-
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
-
-Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\StorageSense\Parameters\StoragePolicy`" /V 04 /T REG_dWORD /D 0 /F"
-
-# Maintenance task used by the system to launch a silent auto disk cleanup when running low on free disk space.
-DisableSchedulerTask "DiskCleanup\SilentCleanup"
--- a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-defragment.ps1
+++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-defragment.ps1
@@ -1,42 +0,0 @@
-# Copyright (C) 2025 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
-
-# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask
-# thus needing its own version.
-Write-Host "Disabling defragmentation"
-$version = Get-CimInstance Win32_OperatingSystem | Select-Object -ExpandProperty Caption
-if ($version -like '*Windows 7*'){
-    $pi = New-Object System.Diagnostics.ProcessStartInfo
-    $pi.FileName = "C:\Windows\System32\schtasks.exe"
-    $pi.RedirectStandardError = $true
-    $pi.UseShellExecute  = $false
-    $pi.Arguments = "/Delete /TN `"\Microsoft\Windows\Defrag\ScheduledDefrag`" /F"
-    $prog = New-Object System.Diagnostics.Process
-    $prog.StartInfo = $pi
-    $prog.Start() | Out-Null
-    $err = $prog.StandardError.ReadToEnd()
-    $prog.WaitForExit()
-    if ($prog.ExitCode -eq 0){
-        Write-Host "Scheduled defragmentation removed"
-    } else {
-        if ($err -like '*cannot find the file*'){
-            Write-Host "No scheduled defragmentation task found"
-            exit 0
-        } else {
-            Write-Host "Error while deleting scheduled defragmentation task: $err"
-        }
-    }
-}
-else {
-    try {
-        $state = (Get-ScheduledTask -ErrorAction Stop -TaskName "ScheduledDefrag").State
-        Write-Host "Scheduled defragmentation task found in state: $state"
-    }
-    catch {
-        Write-Host "No scheduled defragmentation task found"
-        exit 0
-    }
-    Write-Host "Unregistering scheduled defragmentation task"
-    Unregister-ScheduledTask -ErrorAction Stop -Confirm:$false -TaskName ScheduledDefrag
-    Write-Host "Scheduled Defragmentation task was cancelled"
-}
--- a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-ntp.ps1
+++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-ntp.ps1
@@ -1,4 +0,0 @@
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
-
-# Disable the NTP from syncing
-Run-Executable "w32tm.exe" "/config /syncfromflags:NO"
--- a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/msvc2022.txt
+++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/msvc2022.txt
@@ -1,81 +0,0 @@
-### Visual Studio Professional 2022 Official release ###
-Visual Studio Professional 2022 version 17.14.7 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
-This VS installer 17.14.7 version sets (Latest) MSVC version as: 14.44.35207
-
-Installed MSVC-2022 Components:
-
-.NET Framework 4.8.1 targeting pack
-.NET Framework 4.8.1 SDK
-.NET Framework 4.8 targeting pack
-.NET Framework 4.8 SDK
-.NET Native
-.NET Portable Library targeting pack
-CLR data types for SQL Server
-Data sources for SQL Server support
-SQL Server Command Linne Utilities
-SQL Server Data Tools
-SQL Server Express 2019 LocalDB
-SQL Server ODBC Driver
-ClickOnce Publishing
-Developer Analytics tools
-NuGet package manager
-Text Template Transformation
-C# and Visual Basic Roslyn compilers
-C++ 2022 Redistributable Update
-C++ Cmake tools for Windows
-C++/CLI support for v143 build tools (14.44-17.14)
-C++/CLI support for v143 build tools (Latest)
-MSBuild
-MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest)
-MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (v14.44-17.14)
-.NET profiling tools
-C++ profiling tools
-JavaScript diagnostics
-Just-In-Time debugger
-C# and Visual Basic
-C++ core features
-JavaScript and TypeScript language support
-Razor Language Services
-Image and 3D model editors
-C++ ATL for latest v143 build tools (ARM)
-C++ ATL for latest v143 build tools (ARM64/ARM64EC)
-TypeScript Server
-Windows 10 SDK (10.0.18362.0)
-Windows 10 SDK (10.0.19041.0)
-Windows 10 SDK (10.0.20348.0)
-Windows 11 SDK (10.0.22000.0)
-Windows 11 SDK (10.0.22621.0)
-Windows 11 SDK (10.0.26100.3916)  # This was available --> installed for COIN-1206 (see later comment)
-Windows Universal C Runtime
-
-Windows SDK (10.0.26100.1742) has been earlier downloaded for WoA 22h2 and installed from:
-https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
-# COIN-1206
-
-These Components were not found for WoA:
-
-Connectivity and publishing tools
-Graphics debugger and GPU profiler for DirectX
-TypeScript 4.7 SDK
-
-# NOTE! Workloads were added during installation!
-
-############################################################
-### Visual Studio 2022 build tools ###
-
- Visual studio 2022 build tools version 17.14.7 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
-  * Only default installation, no additional selections
-
-# NOTE! Installing Visual Studio on ARM-powered device is not supported
-  * Otherwise Visual Studio might be slow or unusable
-  * Installer recommends "remote targeting" which is suitable for cross-platform development
-  * VS 2022 build tools has been installed as it is - VS has ARM support since 17.4, but not full support with some workloads
-  * https://learn.microsoft.com/en-us/visualstudio/install/visual-studio-on-arm-devices?view=vs-2022#supported-workloads
-
-############################################################
-### Debugging tools ###
-
-* Check that debugging tools are installed in all installed Windows SDK versions
-    * Modify 'Windows Software Development Kit - Windows <version number>' from 'Add or remove programs'
-        - Add feature 'Debugging Tools for Windows'
-############################################################
--- a/coin/pre-provisioning/qtci-windows-11_23H2-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-windows-11_23H2-x86_64/README_MANUAL_INSTALLATIONS
@@ -23,6 +23,8 @@ add DWORD value BypassSecureBootCheck value 1
 Close the regedit and the installation window ('X') to start the installation again.

 Load driver - browse - virtio-win-0.1.204 - amd64 - w10
+Navigate to E:\guest-agent (directory on the attached drive)
+and double click qemu-ga-x86_64


 Region: Finland
@@ -138,3 +140,5 @@ After reboot and startup, go to 'This PC' -> virtio-win-0.1.204 and run virtio-w
   - Open Task Scheduler: Task Scheduler Library > Microsoft > VisualStudio > Updates > right-click: BackgroundDownload > disable
 * Activate Windows
 * When everything seems ready: shut down Windows, Select 'Power off' in OpenNebula.
+
+virtio-win-0.1.271 was later installed to 23h2 -55 by running .msi installation (QTQAINFRA-6761)
--- a/coin/pre-provisioning/qtci-windows-11_24H2-x86_64/01-enable-dotnet-framework.ps1
+++ b/coin/pre-provisioning/qtci-windows-11_24H2-x86_64/01-enable-dotnet-framework.ps1
@@ -0,0 +1,22 @@
+# The DirectX SDK installer requires .Net framework 3.5 which isn't installed
+# by default
+
+$netFeature = "NetFx3"
+try {
+    $netFeatureState = (Get-WindowsOptionalFeature -Online -FeatureName "$netFeature").State
+    if ($netFeatureState -eq "Enabled") {
+        Write-Host ".Net Framework is already installed"
+        exit 0
+    }
+} catch {
+    Write-Host "Could not find .Net Framework Windows feature."
+    exit 1
+}
+
+Write-Host "Installing .Net Framework client"
+try {
+    Enable-WindowsOptionalFeature -Online -FeatureName "$netFeature" -All -NoRestart
+} catch {
+    Write-Host "Could not install .Net framework"
+    exit 1
+}
--- a/coin/pre-provisioning/qtci-windows-11_24H2-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-windows-11_24H2-x86_64/README_MANUAL_INSTALLATIONS
@@ -0,0 +1,242 @@
+# I part: Creating image
+Follow image creation instructions in intra:
+"Create a Tier1 image without vSphere directly to OpenNebula"
+
+# II part: Installing Windows
+
+On Windows setup window:
+   shift+F10 to open CMD:
+      Drvload e:\viostor\w11\amd64\viostor.inf
+
+Language to install: English (United States)
+Time and currency format: English (United States)
+Keyboard or input method: United Kingdom
+Windows 11 Enterprise
+location: finnish
+
+Load driver - browse - virtio-win-0.1.262 - amd64 - w11
+Navigate to E:\guest-agent (directory on the attached drive)
+and double click qemu-ga-x86_64
+
+Region: Finland
+Keyboard layout: United Kingdom
+Keyboard layout: English (United State)
+
+* Sign-in options - Domain join instead
+   - Add user & pw
+* Location - no
+* Find my device - no
+* Diagnostic data - Required only
+* Inking and typing - no
+* Tailored expreriences - no
+* Advertising ID - no
+
+Reboot
+
+# III part: Windows configuration before moving it to datastore
+
+* Disable secure boot and TPM in the registry
+   Open 'regedit':
+      Go to: HKEY_LOCAL_MACHINE/SYSTEM/Setup/
+      Right click 'Setup' folder: New -> Key -> Name: LabConfig
+   add DWORD value BypassTPMCheck with value 1
+      Right click 'LabConfig' folder: New -> DWORD (32-bit) -> Name: BypassTPMCheck
+      Double-click on the BypassTPMCheck, change value to 1
+   add DWORD value BypassSecureBootCheck value 1
+      repeat
+
+* Go to 'This PC' -> virtio-win-0.1.262 and run: virtio-win-qt-x64, install all virtio drivers.
+   - In the same CD, install QEMU guest agent: \guest-agent\qemu-ga-x86_64.msi
+
+* Run Windows updates.
+
+* Allow running scripts by all users
+   - Open PowerShell, type: Set-ExecutionPolicy Bypass -Scope LocalMachine
+
+* Disable encryption
+   - Settings - Privacy & security - Device encryption
+
+* Check Windows still boots fine in the host.
+
+* Turn off the VM, shrink its disk & rename it:
+   qemu-img convert -O qcow2 /tmp/disk1.qcow2 qtci-windows-11_24H2-x86_64-70.qcow2
+
+* Copy and rename the nvram file:
+   cp /var/lib/qemu/nvram/c_VAR.fd /tmp/qtci-windows-11_24H2-x86_64-70_VARS.fd
+
+# IV part: Register, deploy and continue configuring the image in OpenNebula
+
+* Move the files to datastore
+* Register the image which creates an OpenNebula template for it
+* Set the registered image as persistent in OpenNebula
+* Launch the persistent image with the template
+
+# V part: System settings
+
+* Activate Windows
+
+* Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support"
+   - Do this before disabling Windows update or defender
+
+* Run in PowerShell:
+   - Set-SmbClientConfiguration -RequireSecuritySignature $false
+
+* Rename the computer (to identify it better in CI network) with PowerShell:
+   - Rename-Computer -NewName "win11-24h2-x64" -Restart
+      - Max 15 character limit
+
+* Resolution set to 1280x800
+   - If 1280x800 is not listed in the settings, select a 1280 width (e.g. 1280x960) and:
+      - regedit -> HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\Configuration
+      - Select a key/folder and its subkeys (00/00) that has the resolution you just selected
+      - Change every height value (e.g. 960) to 800
+      - Restart Windows
+
+* Disable feedback
+   - Settings - Privacy & security - Diagnostics & feedback
+      - Feedback frequency: Never
+
+* Background defrag disabled: 'Defragment And Optimize Drives' - 'change settings' - unchecked "run on a schedule"
+   - Run in terminal: 'schtasks /Delete /TN "Microsoft\Windows\Defrag\ScheduledDefrag"'
+
+* Time:
+   - Settings - Time & language - Date & time - Time zone: 'Coordinated Universal Time'
+   - Settings - System - Date & time - "Set the time automatically: Off"
+
+* Regional format:
+   - Settings - Time & language - Language and region - regional format - English (United States)
+
+* Power saver:
+   - Settings - System - Power - Screen and sleep: set 'When plugged in, turn off my screen after' to 'never'
+
+# VI part: Install software
+
+* Install Google Chrome for RTA
+
+* Install R3 GlobalSign Root Certificate (QTQAINFRA-6473)
+
+* Install Visual Studio
+   - Install msvc2022 (see the msvc2022.txt file)
+      - Open Task Scheduler: Task Scheduler Library > Microsoft > VisualStudio > Updates > right-click: BackgroundDownload > disable
+
+# VII part: Clear out extra processes and storage
+
+* Run .NET optimization
+   - Open PowerShell, run commands:
+      - Start-Process -NoNewWindow -FilePath "C:\WINDOWS\Microsoft.NET\Framework64\v4.0.30319\ngen.exe" -ArgumentList ExecuteQueuedItems -Wait
+      - Start-Process -NoNewWindow -FilePath "C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\ngen.exe" -ArgumentList ExecuteQueuedItems -Wait
+   - Repeat this if any modification is done with Visual Studio Installer, Windows SDK, or Windows update.
+      - This will shorten the compilation of items for exceutequeueditems.ps1 in provisioning.
+
+* Disable unused startup apps with Task manager
+   - OneDrive (or uninstall it)
+   - SecurityHealthSystray
+   - Microsoft Edge
+      - Open Edge and turn off all boosts and background tasks. Task manager should not show Edge processes when Edge is off.
+
+* Disable widgets
+   - Settings - Personalization - Taskbar - Widgets: off
+
+* Uninstall Copilot
+
+* Disable hibernation
+   - Run in PowerShell: powercfg -h off
+      - This should erase the storage reserved for hibernation
+
+* Disable reserved storage
+   - Run: dism /Online /Set—ReservedStorageState /State:Disabled
+
+* Disable clean manager
+   - Settings: System -> Storage -> Storage management -> Storage Sense: Off
+
+* Disable System Restore
+   - Run: SystemPropertiesProtection (or 'Create a restore point') - System Protection - Local Disk (C:) - Configure
+      - Disable system protection
+      - Delete all restore points for this drive
+
+* Remove temporary files
+   - Settings - System - Storage - Temporary files
+      - Remove the old Windows installation
+      - Remove already chosen items e.g. Delivery Optimization Files
+      - Repeat this after any installation or update
+
+* Disable clean manager
+   - Settings: System -> Storage -> Storage management -> Storage Sense: Off
+
+# VIII part: Last step disablements
+These steps are done last, as they may block changing other Windows configs
+
+* Run the .ps1 scripts of pre-provisioning
+
+* Disable background tasks with services.msc and Task Scheduler tool
+   - Run: services.msc
+      - MicrosoftEdgeElevationService - Right click: properties - General
+         - Startup type: Disabled
+         - Services status: stop
+   - Repeat steps for:
+      - Microsoft Edge Update Service (edgeupdate)
+      - Microsoft Edge Update Service (edgeupdatem)
+      - Windows Search
+         - this is to stop Microsoft Windows Search Indexer
+      - Windows Modules Installer (TiWorker)
+      - Windows updates
+      - Update Orchestrator Service
+      - Windows Modules Installer
+      - SysMain
+         - Used for application start optimization. Causes high disk usage when VM is idle.
+      - Google Chrome Elevation Service
+      - Google Updater Internal Service (there may be multiple of these)
+      - Google Updater Service
+      - Volume Shadow Copy
+   - Run: Task Scheduler
+      - Task Scheduler Library - GoogleSystem - GoogleUpdater
+         - GoogleUpdaterTaskSystem: disable
+      - Task Scheduler Library - Microsoft - VisualStudio - Updates
+         - BackgroundDownload: disable
+
+* Coin-setup
+   - Download the coin-setup from http://[COIN IP]/coin/binary/windows_amd64/coin-setup.exe
+   - Run the executable. It should do the following configurations to Windows but you should check them.
+      - Installing Bootstrap agent
+      - Disabling fast boot
+         - Make sure it's disabled: gpedit -> Computer Configuration\Administrative Templates\System\Shutdown\
+            - Require use of fast startup -> set to "Disabled".
+      - Disabling firewall
+      - Disabling UAC
+      - Enabling autologin
+         - regedit -> HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\PasswordLess\Device
+            - DevicePasswordLessBuildVersion: 2 -> 0
+         - netplwiz -> uncheck: "Users must enter a user name and password...", apply
+      - Disabling windows updates
+         - gpedit -> Computer Configuration\Administrative Templates\Windows Components\Windows Update\Manage end user experience
+            - "Configure Automatic Updates" -> "Disabled"
+   - Bootstrap agent CMD window should now pop-up at every Windows start up.
+
+* Turn off Windows defender (do this last as this definitely blocks firewall/network feature changes):
+   - Microsoft Defender Antivirus turned off: Open 'gpedit.msc':  'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Microsoft Defender Antivirus'
+      - Edit 'Turn off Microsoft Defender Antivirus' > 'Enabled' > 'Apply'
+   - Reboot on Safe mode:
+      - Open msconfig - Boot tab - enable “Safe boot“ - apply - restart
+      - In Safe mode:
+         - Take Ownership of Defender:
+            - Open properties - Right click "C:\Program Files\Windows Defender\Platform" and select 'Properties'
+            - Open Security tab - Advanced - Owner: Change - Advanced - Find now - Select Administrators - Ok - Ok
+            Close and reopen the "Advanced Security Settings for Platform" window
+               Remove all Permissions: Permissions tab
+               - Select 'Disable inheritance'
+                  - It removes all entries
+               - Select 'Replace all child object permi…' - Apply, yes, yes
+         - Disable Windows defender also from RegEdit:
+            - Open regedit - Navigate to 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services'
+            - Change the following folders the key Start to 4
+               - Sense (Windows defender advanced threat protection)
+               - WdBoot (Windows defender boot)
+               - WdFilter (Microsoft antimalware file system filter driver)
+               - WdNisDrv (Windows Defender Network Inspection Driver)
+               - WdNisSvc (Windows Defender Network Inspection Service)
+               - WinDefend (Windows Defender Antivirus Service)
+               - mpssvc (Windows Defender Firewall)
+   - NOTE! Without these step windows defender can't be disabled!
+   - Reboot back to normal mode
+
+* When everything seems ready: shut down Windows, Select 'Power off' in OpenNebula.
--- a/coin/pre-provisioning/qtci-windows-11_24H2-x86_64/disable-ntp.ps1
+++ b/coin/pre-provisioning/qtci-windows-11_24H2-x86_64/disable-ntp.ps1
@@ -0,0 +1,2 @@
+# Disable the NTP from syncing
+w32tm.exe /config /syncfromflags:NO
--- a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-schedule-tasks.ps1
+++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-schedule-tasks.ps1
@@ -1,4 +1,4 @@
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"

 # This script will remove unneeded Tasks from Task Scheduler

--- a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-smart-app-control.ps1
+++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-smart-app-control.ps1
--- a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-update-orchestrator.ps1
+++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-update-orchestrator.ps1
--- a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windefender.ps1
+++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windefender.ps1
@@ -1,4 +1,4 @@
-# Copyright (C) 2025 The Qt Company Ltd.
+# Copyright (C) 2020 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

 # Turning off win defender.
@@ -9,7 +9,7 @@
 #     Open 'gpedit.msc': 'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Windows Defender Antivirus'
 #     Edit 'Turn off Windows Defender Antivirus' > 'Enabled' > 'Apply'

-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
+. "$PSScriptRoot\helpers.ps1"

 Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F"
 Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableRoutinelyTakingAction /T REG_dWORD /D 1 /F"
--- a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-file-protector.ps1
+++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-file-protector.ps1
--- a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-update-medic.ps1
+++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-update-medic.ps1
--- a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-updates.ps1
+++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-updates.ps1
--- a/coin/pre-provisioning/qtci-windows-11_24H2-x86_64/msvc2022.txt
+++ b/coin/pre-provisioning/qtci-windows-11_24H2-x86_64/msvc2022.txt
@@ -0,0 +1,65 @@
+### Visual Studio 2022 Official release ###
+Visual Studio 2022 version 17.9.1 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe
+This VS installer 17.9.1 version sets (Latest) MSVC version as: 14.39.33519
+
+Installed MSVC-2022 Components:
+
+.NET Framework 4.7.2 targeting pack
+.NET Framework 4.8 SDK
+.NET Framework 4.8 targeting pack
+.NET Native
+.NET Portable Library targeting pack
+CLR data types for SQL Sever
+Connectivity and publishing tools
+Data sources for SQL Server support
+SQL Server Command Linne Utilities
+SQL Server Data Tools
+SQL Server Express 2019 LocalDB
+SQL Server ODBC Driver
+ClickOnce Publishing
+Developer Analytics tools
+NuGet package manager
+Text Template Transformation
+C# and Visual Basic Roslyn compilers
+C++ 2022 Redistributable Update
+C++ Cmake tools for Windows
+C++/CLI support for v143 build tools (Latest)
+MSBuild
+MSVC v143 - VS 2022 C++ ARM build tools (Latest)
+MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest)
+MSVC v143 - VS 2022 C++ x64/x86 build tools (Latest)
+.NET profiling tools
+C++ profiling tools
+JavaScript diagnostics
+Just-In-Time debugger
+C# and Visual Basic
+C++ core features
+JavaSript and TypeScript language support
+Razor Language Services
+Graphics debugger and GPU profiler for DirectX
+Image and 3D model editors
+C++ ATL for latest v143 build tools (ARM)
+C++ ATL for latest v143 build tools (ARM64/ARM64EC)
+C++ ATL for latest v143 build tools (x86 & x64)
+TypeScript Server
+Windows Universal C Runtime
+
+Windows SDK (10.0.26100.1742) was later downloaded and installed from:
+https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
+# COIN-1206
+
+# NOTE! Work loads were added during installation!
+
+############################################################
+### Visual Studio 2022 build tools ###
+
+ Visual studio 2022 build tools version 17.9.1 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_BuildTools_msvc2022.exe"
+  * Only default installation, no additional selections
+
+############################################################
+### Debugging tools ###
+
+* Check that debugging tools are installed in Windows SDK
+    * Modify 'Windows Software Development Kit' from Add or remove programs
+        - Add feature 'Debugging Tools for Windows'
+############################################################
--- a/coin/provisioning/common/linux/android_emulator_launcher.sh
+++ b/coin/provisioning/common/linux/android_emulator_launcher.sh
@@ -25,12 +25,13 @@ function check_for_android_device
 }

 # WARNING: On the very first boot of the emulator it happens that the device
-# "finishes" booting and getprop shows boot_completed=1. But sometimes not all
-# packages have been installed (`pm list packages` shows only 16 packages
-# installed), and after around half a minute the boot animation starts spinning
-# again despite boot_completed=1 all the time. After some minutes the boot
-# animation stops again and the list of packages contains 80 packages.
-# Only then the device is fully booted, and only then is dev.bootcomplete=1.
+# "finishes" booting and getprop shows bootanim=stopped and
+# boot_completed=1. But sometimes not all packages have been installed (`pm
+# list packages` shows only 16 packages installed), and after around half a
+# minute the boot animation starts spinning (bootanim=running) again despite
+# boot_completed=1 all the time. After some minutes the boot animation stops
+# again and the list of packages contains 80 packages. Only then the device is
+# fully booted, and only then is dev.bootcomplete=1.
 #
 # To reproduce the emulator booting as the first time, you have to delete the
 # cached images found inside $HOME/.android/avd/{avd_name}.avd/ especially the
@@ -38,10 +39,11 @@ function check_for_android_device
 function check_if_fully_booted
 {
    # The "getprop" command separates lines with \r\n so we trim them
+    bootanim=$(      timeout 1 "$ADB_EXEC" shell getprop init.svc.bootanim  | tr -d '\r\n')
    boot_completed=$(timeout 1 "$ADB_EXEC" shell getprop sys.boot_completed | tr -d '\r\n')
    bootcomplete=$(  timeout 1 "$ADB_EXEC" shell getprop dev.bootcomplete   | tr -d '\r\n')
-    echo "boot_completed=$boot_completed bootcomplete=$bootcomplete"
-    [ "$boot_completed" = 1 ] && [ "$bootcomplete" = 1 ]
+    echo "bootanim=$bootanim boot_completed=$boot_completed bootcomplete=$bootcomplete"
+    [ "$bootanim" = stopped ] && [ "$boot_completed" = 1 ] && [ "$bootcomplete" = 1 ]
 }

 for counter in $(seq ${EMULATOR_MAX_RETRIES})
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2025 The Qt Company Ltd.
+# Copyright (C) 2022 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

 # This script install Android sdk and ndk.
@@ -24,21 +24,14 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android"

 toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
+ndkVersionLatest="r27c"
+ndkVersionDefault=$ndkVersionLatest
 sdkBuildToolsVersion="35.0.1"
 sdkApiLevel="android-35"
+
 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
-
-ndkVersionLatest="r27c"
 ndkSha1Latest="090e8083a715fdb1a3e402d0763c388abb03fb4e"
-
-# Non-latest (but still supported by the qt/qt5 branch) NDKs are installed for nightly targets in:
-# coin/platform_configs/nightly_android.yaml
-
-ndkVersionNightly1=$ndkVersionLatest  # Same version = skip NDK install for nightly
-ndkSha1Nightly1=$ndkSha1Latest
-
-ndkVersionNightly2=$ndkVersionLatest
-ndkSha1Nightly2=$ndkSha1Latest
+ndkSha1Default=$ndkSha1Latest

 # Android Automotive max SDK level image
 sdkApiLevelAutomotiveMax="android-34"
@@ -76,22 +69,17 @@ function InstallNdk() {
    androidNdkRoot="${targetFolder}/${zipBase}"
 }

-InstallNdk $ndkVersionLatest $ndkSha1Latest
+InstallNdk $ndkVersionDefault $ndkSha1Default
+SetEnvVar "ANDROID_NDK_ROOT_DEFAULT" "$androidNdkRoot"
+
+if [ "$ndkVersionDefault" != "$ndkVersionLatest" ]; then
+    InstallNdk $ndkVersionLatest $ndkSha1Latest
+fi
 SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$androidNdkRoot"

-if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then
-    InstallNdk $ndkVersionNightly1 $ndkSha1Nightly1
-    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY1" "$androidNdkRoot"
-fi
-
-if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
-    InstallNdk $ndkVersionNightly2 $ndkSha1Nightly2
-    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY2" "$androidNdkRoot"
-fi
-
 # To be used by vcpkg
-SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersionLatest"
-export ANDROID_NDK_HOME="$targetFolder/android-ndk-$ndkVersionLatest"
+SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersionDefault"
+export ANDROID_NDK_HOME="$targetFolder/android-ndk-$ndkVersionDefault"

 echo "Changing ownership of Android files."
 if uname -a |grep -q "el7"; then
--- a/coin/provisioning/common/linux/apt_wait_loop.sh
+++ b/coin/provisioning/common/linux/apt_wait_loop.sh
@@ -5,13 +5,9 @@
 set -ex

 function waitLoop {
-    while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1; do
-        echo "Waiting for other software managers to finish... 1/2"
-        sleep 0.5
-    done

-    while sudo fuser /var/lib/apt/lists/lock >/dev/null 2>&1; do
-        echo "Waiting for other software managers to finish... 2/2"
-        sleep 0.5
-    done
+while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do
+    echo "Waiting for other software managers to finish..."
+    sleep 0.5
+done
 }
--- a/coin/provisioning/common/linux/cmake_toolchain_files/integrity_toolchain.cmake
+++ b/coin/provisioning/common/linux/cmake_toolchain_files/integrity_toolchain.cmake
@@ -107,10 +107,11 @@ set(IntegrityPlatformGraphics_LIBRARIES_PACK
    "${EGL_LIBRARY_CHK_PATH}/libivfs.a"
 )

-list(APPEND _qt_igy_gui_libs
+set(IntegrityPlatformGraphics_REQUIRED_LIBRARIES
    "${GLESv2_LIBRARY}"
    "${IntegrityPlatformGraphics_LIBRARY}"
-    "${IntegrityPlatformGraphics_LIBRARIES_PACK}")
+    "${IntegrityPlatformGraphics_LIBRARIES_PACK}"
+)

 set(OPENGL_INCLUDE_DIR ${GL_INC_DIR})
 set(OPENGL_opengl_LIBRARY ${EGL_LIBRARY})
--- a/coin/provisioning/common/linux/install-network-test.sh
+++ b/coin/provisioning/common/linux/install-network-test.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Copyright (C) 2025 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
+
+# This script installs the CI network tester
+set -ex
+source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
+
+if [ -z ${COIN_UNIQUE_JOB_ID+x} ]; then
+    echo "This script only runs in a CI envrironment. Exiting."
+    exit 0;
+fi
+
+PREFIX="opt"
+ROOT="/${PREFIX}"
+APPNAME="CiNetworkTest"
+EXECPATH="${ROOT}/${APPNAME}/bin"
+EXEC="${EXECPATH}/${APPNAME}"
+URL="https://ci-files01-hki.ci.qt.io/input/networktestapp"
+TARBALL="CiNetworkTest-rhel-linux-x86_64-v1.1.tgz"
+sha256="3a23593f163ca2452546d20d56cabc81fed03c930d6d96334a22827da5a6840a"
+SOURCE="$URL/$TARBALL"
+InstallFromCompressedFileFromURL "$SOURCE" "" "$sha256" "$ROOT" "$PREFIX"
+
+# Ubuntu installs ICU in opt
+if grep -q "Ubuntu" /etc/os-release; then
+    export LD_LIBRARY_PATH="/opt/icu/lib64"
+fi
+
+if [ -e "$EXEC" ]; then
+    $EXEC $1 && exit 0;
+else
+    echo "Installation unsuccessful. Content of ${ROOT}:"
+    echo "-----------------------------------------------"
+    ls -l $ROOT
+    echo "-----------------------------------------------"
+fi
+exit 1;
--- a/coin/provisioning/common/linux/install-oracle.sh
+++ b/coin/provisioning/common/linux/install-oracle.sh
@@ -46,6 +46,6 @@ sudo unzip -o -q /tmp/${packageFile} -d ${installFolder}
 echo "Remove downloaded ${packageFile} ..."
 rm -rf /tmp/${packageFile}

-SetEnvVar "Oracle_ROOT" "${installFolder}/${distdir}/sdk/"
+SetEnvVar "Oracle_ROOT" "${installFolder}/${distdir}/"

 echo "Oracle Instant Client = $version" >> ~/versions.txt
--- a/coin/provisioning/common/linux/install-vcpkg-ports-android.sh
+++ b/coin/provisioning/common/linux/install-vcpkg-ports-android.sh
@@ -14,9 +14,17 @@ mkdir -p "$VCPKG_ROOT/installed"
 cp -R x86-android-qt-tmp/* "$VCPKG_ROOT/installed/"
 cp -R x86_64-android-qt-tmp/* "$VCPKG_ROOT/installed/"

-versions=$(jq -r '.overrides[] | "vcpkg \(.name) for android = \(.version)"' vcpkg.json)
-versions="${versions//vcpkg/\\nvcpkg}"
-echo "$versions" >> ~/versions.txt
+cmake "-DVCPKG_EXECUTABLE=$VCPKG_ROOT/vcpkg"\
+    "-DVCPKG_INSTALL_ROOT=$PWD/x86-android-qt-tmp"\
+    "-DOUTPUT=~/versions.txt"\
+    -P\
+    "${BASH_SOURCE%/*}/../shared/vcpkg_parse_packages.cmake"
+
+cmake "-DVCPKG_EXECUTABLE=$VCPKG_ROOT/vcpkg"\
+    "-DVCPKG_INSTALL_ROOT=$PWD/x86_64-android-qt-tmp"\
+    "-DOUTPUT=$HOME/versions.txt"\
+    -P\
+    "${BASH_SOURCE%/*}/../shared/vcpkg_parse_packages.cmake"

 rm -rf x86-android-qt-tmp
 rm -rf x86_64-android-qt-tmp
--- a/coin/provisioning/common/linux/install-vcpkg-ports.sh
+++ b/coin/provisioning/common/linux/install-vcpkg-ports.sh
@@ -7,15 +7,19 @@ echo "Installing vcpkg ports"
 pushd "${BASH_SOURCE%/*}/vcpkg" || exit
 cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" .

-"$VCPKG_ROOT/vcpkg" install --triplet x64-linux-qt --x-install-root x64-linux-qt-tmp --debug
+install_root=x64-linux-qt-tmp
+
+"$VCPKG_ROOT/vcpkg" install --triplet x64-linux-qt --x-install-root $install_root --debug
+
+cmake "-DVCPKG_EXECUTABLE=$VCPKG_ROOT/vcpkg"\
+    "-DVCPKG_INSTALL_ROOT=$PWD/$install_root"\
+    "-DOUTPUT=$HOME/versions.txt"\
+    -P\
+    "${BASH_SOURCE%/*}/../shared/vcpkg_parse_packages.cmake"

 mkdir -p "$VCPKG_ROOT/installed"
-cp -R x64-linux-qt-tmp/* "$VCPKG_ROOT/installed/"
+cp -R $install_root/* "$VCPKG_ROOT/installed/"

-versions=$(jq -r '.overrides[] | "vcpkg \(.name) = \(.version)"' vcpkg.json)
-versions="${versions//vcpkg/\\nvcpkg}"
-echo "$versions" >> ~/versions.txt
-
-rm -rf x64-linux-qt-tmp
+rm -rf $install_root

 popd || exit
--- a/coin/provisioning/common/linux/install-vcpkg.sh
+++ b/coin/provisioning/common/linux/install-vcpkg.sh
@@ -18,12 +18,43 @@ echo "Cloning the vcpkg repo"
 git clone "$vcpkgRepo" "$vcpkgRoot"
 git -C "$vcpkgRoot" checkout "tags/$vcpkgVersion"

-vcpkgToolReleaseTag=$(grep 'vcpkg_tool_release_tag=' "${BASH_SOURCE%/*}/../shared/vcpkg_tool_release_tag.txt" | cut -d '=' -f 2)
-nonDottedReleaseTag=${vcpkgVersion//-/}
+releaseTagFile="${BASH_SOURCE%/*}/../shared/vcpkg_tool_release_tag.txt"
+for line in $(cat "$releaseTagFile")
+do
+    IFS='='
+    read -ra keyValue <<< "$line"
+    unset IFS
+
+    case "${keyValue[0]}" in
+        "vcpkg_tool_release_tag")
+            vcpkgToolReleaseTag=${keyValue[1]}
+            ;;
+        "linux_sha1")
+            vcpkgToolSHA1=${keyValue[1]}
+            ;;
+    esac
+done
+
+if [ -z vcpkgToolReleaseTag ]
+then
+    echo "Unable to read release tag from $releaseTagFile"
+    echo "Content:"
+    cat $releaseTagFile
+    exit 1
+fi
+
+if [ -z vcpkgToolSHA1 ]
+then
+    echo "Unable to read vcpkg tool SHA1 from $releaseTagFile"
+    echo "Content:"
+    cat $releaseTagFile
+    exit 1
+fi
+
+nonDottedReleaseTag=${vcpkgToolReleaseTag//-/}

 vcpkgToolOfficialUrl="https://github.com/microsoft/vcpkg-tool/archive/refs/tags/$vcpkgToolReleaseTag.tar.gz"
 vcpkgToolCacheUrl="http://ci-files01-hki.ci.qt.io/input/vcpkg/vcpkg-tool-$nonDottedReleaseTag.tar.gz"
-vcpkgToolSHA1="c6029714fca0304779f10c9c1cbe4b061a2fd945"
 vcpkgToolSourceFolder="$HOME/vcpkg-tool-$vcpkgToolReleaseTag"
 vcpkgToolBuildFolder="$HOME/vcpkg-tool-$vcpkgToolReleaseTag/build"

--- a/coin/provisioning/common/linux/vx_works.sh
+++ b/coin/provisioning/common/linux/vx_works.sh
@@ -21,12 +21,13 @@ InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder"
 SetEnvVar "VXWORKS_HOME" "/opt/vxworks"
 SetEnvVar "VXWORKS_SSH" "WindRiver@172.31.1.10"

-VXWORKS_BUILD_VER="18-12-2024"
+# IMX 6
+VXWORKS_BUILD_VER="07-11-2024"
 ######### VXworks toolchain #########
 # Installs to /opt/fsl_imx6_2_0_6_2_VSB
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_vsb_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="6b5a264d08a9d34b03ff13cb28e690c5c5178569"
+sha1="f4745e9b84a781fe2c0a44abee189fcdf1c2c100"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
 SetEnvVar "WIND_CC_SYSROOT" "/opt/fsl_imx6_2_0_6_2_VSB"
@@ -35,10 +36,20 @@ SetEnvVar "WIND_CC_SYSROOT" "/opt/fsl_imx6_2_0_6_2_VSB"
 # Installs to /opt/fsl_imx6_2_0_6_2_VIP_QEMU
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_vip_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="117af91a6c93ac89727f8d8bfe4cf840ce4485c9"
+sha1="186d7da071005d67d898a56cf57b7bec664bb89e"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""

+# IMX 8
+VXWORKS_BUILD_VER="03-03-2025"
+# Installs to /opt/nxp_imx8_1_0_6_3_VSB
+PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_imx8_vsb_${VXWORKS_BUILD_VER}.tar.gz"
+AltUrl=""
+sha1="d7afe3f57748b87f6ea8932f079c18e67a58f30e"
+targetFolder="/opt/"
+InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
+
+VXWORKS_BUILD_VER="18-12-2024"
 # Installs to /opt/itl_generic_skylake_VSB
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_intel_vsb_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
--- a/coin/provisioning/common/linux/vxworks_qemu_launcher.sh
+++ b/coin/provisioning/common/linux/vxworks_qemu_launcher.sh
@@ -33,9 +33,8 @@ elif [ "$TYPE" = "intel" ]; then
    $VXWORKS_QEMU/bin/qemu-system-x86_64 \
        -M q35 \
        -smp 8 \
-        -m 8G \
+        -m 16G \
        -cpu "Skylake-Client" \
-        -enable-kvm \
        -monitor none \
        -nographic \
        -serial null \
--- a/coin/provisioning/common/macos/android.sh
+++ b/coin/provisioning/common/macos/android.sh
@@ -20,13 +20,8 @@ toolsVersion="2.1"
 # toolsFile dertermines tools version
 toolsFile="commandlinetools-mac-6609375_latest.zip"

-# Non-latest (but still supported by the qt/qt5 branch) NDKs are installed for nightly targets in:
-# coin/platform_configs/nightly_android.yaml
-
 ndkVersionLatest="r27c"
-ndkVersionNightly1="$ndkVersionLatest"  # If same version as latest = skip NDK install for nightly
-ndkVersionNightly2="$ndkVersionLatest"
-
+ndkVersionDefault="$ndkVersionLatest"
 sdkBuildToolsVersion="35.0.1"
 # this is compile sdk version
 sdkApiLevel="android-35"
@@ -45,18 +40,8 @@ function InstallNdk() {

 }

+InstallNdk $ndkVersionDefault
 InstallNdk $ndkVersionLatest
-SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest"
-
-if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then
-    InstallNdk $ndkVersionNightly1
-    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY1" "$targetFolder/android-ndk-$ndkVersionNightly1"
-fi
-
-if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
-    InstallNdk $ndkVersionNightly2
-    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY2" "$targetFolder/android-ndk-$ndkVersionNightly2"
-fi

 echo "Unzipping Android Tools to '$sdkTargetFolder'"
 sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder"
@@ -80,6 +65,8 @@ echo "Checking the contents of Android SDK..."
 ls -l "$sdkTargetFolder"

 SetEnvVar "ANDROID_SDK_ROOT" "$sdkTargetFolder"
+SetEnvVar "ANDROID_NDK_ROOT_DEFAULT" "$targetFolder/android-ndk-$ndkVersionDefault"
+SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest"
 SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64"
 SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"

@@ -87,7 +74,5 @@ cat << EOT >>~/versions.txt
 Android SDK tools = $toolsVersion
 Android SDK Build Tools = $sdkBuildToolsVersion
 Android SDK API level = $sdkApiLevel
-Android NDK latest = $ndkVersionLatest
-Android NDK nightly1 = $ndkVersionNightly1
-Android NDK nightly2 = $ndkVersionNightly2
+Android NDK = $ndkVersionDefault
 EOT
--- a/coin/provisioning/common/macos/disable_spotlight.sh
+++ b/coin/provisioning/common/macos/disable_spotlight.sh
@@ -2,21 +2,17 @@
 # Copyright (C) 2017 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

+# Allow retry in case mdutil fails with first tries
+set +e
+
 disableSpotlight() {
    # Disable spotlight and and stop indexing
-    sudo mdutil -a -i off
-    sudo mdutil -a -i off /
+    sudo mdutil -a -i off || return 1
+    sudo mdutil -a -i off / || return 1
    # Disable spotlight indexing /Volumes
-    sudo mdutil -i off /Volumes
+    sudo mdutil -i off /Volumes || return 1
    # Erase spotlight index
-    sudo mdutil -E /
-}
-
-fixUnknownIndexingState() {
-    echo "Fix unknown indexing state by enabling indexing back one by one"
-    sudo mdutil -i on / || return 1
-    sudo mdutil -i on /System/Volumes/Preboot || return 1
-    sudo mdutil -i on /System/Volumes/Data || return 1
+    sudo mdutil -E / || return 1
 }

 # Disabling spotlight tends to be flaky, add some retry
@@ -29,8 +25,7 @@ do
        echo "Spotlight disabled"
        break
    else
-        echo "Failed to disable spotlight, $i run fix and retry..."
-        fixUnknownIndexingState
+        echo "Failed to disable spotlight, $i retry..."
        sleep 2
    fi
 done
--- a/coin/provisioning/common/macos/docker.sh
+++ b/coin/provisioning/common/macos/docker.sh
@@ -23,7 +23,7 @@ DownloadURL "$urlCache" "$urlOccifical" "$sha" "/tmp/Docker_${chip}.dmg"

 sudo hdiutil attach "/tmp/Docker_${chip}.dmg"
 sudo /Volumes/Docker/Docker.app/Contents/MacOS/install --accept-license --user qt
-sudo hdiutil detach /Volumes/Docker -force
+sudo hdiutil detach /Volumes/Docker

 # Add registry mirror for docker images
 mkdir "$HOME/.docker"
--- a/coin/provisioning/common/macos/homebrew.sh
+++ b/coin/provisioning/common/macos/homebrew.sh
@@ -12,10 +12,10 @@ INSTALLTYPE="$1"
 VERSION="$2"
 CHECKSUM="$3"

-DEFAULT_PKG_VERSION="4.6.8"
-DEFAULT_PKG_VERSION_CHECKSUM="91157b34fcc58eeaf4149f2f2b3063f2904a3d5e5cc3bf84d3c79627ba26afd9"
-DEFAULT_GIT_VERSION="bce07c53def3dbe54aa14a88adfc63eb7ba91f48"
-DEFAULT_GIT_VERSION_CHECKSUM="c95d3a95a38f9c2cb122335a2101d49af196a1c5"
+DEFAULT_PKG_VERSION="4.4.21"
+DEFAULT_PKG_VERSION_CHECKSUM="cd83c4123d5db7d07eb3042f1c785ed7f599183c5c542040bc6abfa722583861"
+DEFAULT_GIT_VERSION="deb02e27d99fd2cb27ae16760e3a5272b612fded"
+DEFAULT_GIT_VERSION_CHECKSUM="a30b9fbf0d5c2cff3eb1d0643cceee30d8ba6ea1bb7bcabf60d3188bd62e6ba6"

 source "$(dirname "$0")"/../../common/unix/DownloadURL.sh
 source "$(dirname "$0")"/../../common/unix/SetEnvVar.sh
@@ -32,6 +32,8 @@ installPkg() {
        "/tmp/Homebrew-$VERSION.pkg"

    sudo installer -pkg "/tmp/Homebrew-$VERSION.pkg" -target /
+    # Add homebrew to PATH
+    SetEnvVar "PATH" "/opt/homebrew/bin:\$PATH"

    echo "Homebrew = $VERSION" >> ~/versions.txt
 }
@@ -53,7 +55,7 @@ installGit() {
    DownloadURL "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" "/Users/qt/pw"
    { pw=$(cat "/Users/qt/pw"); } 2> /dev/null
    sudo chmod 755 /tmp/homebrew_install.sh
-    { (echo "$pw" | CI=1 /tmp/homebrew_install.sh); } 2> /dev/null
+    { (echo "$pw" | /tmp/homebrew_install.sh); } 2> /dev/null
    rm -f "/Users/qt/pw"
 }

@@ -63,20 +65,7 @@ else
    installPkg
 fi

-ARCH_TYPE=$(arch)
-# Add homebrew to PATH
-if [ "$ARCH_TYPE" == "arm64" ]; then
-    SetEnvVar "PATH" "/opt/homebrew/bin:\$PATH"
-else
-    SetEnvVar "PATH" "/usr/local/bin:\$PATH"
-fi
-
 # Disable non-ascii output for homebrew to make logs more readable
 SetEnvVar "HOMEBREW_NO_COLOR" "1"
 SetEnvVar "HOMEBREW_NO_EMOJI" "1"
 SetEnvVar "HOMEBREW_NO_ENV_HINTS" "1"
-
-# Update homebrew to make sure we are compatible with homebrew servers
-source ~/.zshrc
-brew update
-brew upgrade
--- a/coin/provisioning/common/macos/install-ffmpeg-macos.sh
+++ b/coin/provisioning/common/macos/install-ffmpeg-macos.sh
@@ -3,7 +3,6 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

 # This script builds and installs FFmpeg shared libs
-# Can take an optional final parameter to control installation directory

 set -ex

@@ -19,8 +18,7 @@ source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh"
 ffmpeg_source_dir=$(download_ffmpeg)
 ffmpeg_name=$(basename "$ffmpeg_source_dir")
 ffmpeg_config_options=$(get_ffmpeg_config_options "shared")
-default_prefix="/usr/local/$ffmpeg_name"
-prefix="${2:-$default_prefix}"
+prefix="/usr/local/$ffmpeg_name"

 build_ffmpeg() {
    local arch="$1"
--- a/coin/provisioning/common/macos/libiodbc.sh
+++ b/coin/provisioning/common/macos/libiodbc.sh
@@ -9,17 +9,7 @@ set -ex
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-# HOMEBREW_DIR depends on acrhitecture
-ARCH_TYPE=$(arch)
-if [ "$ARCH_TYPE" == "arm64" ]; then
-    HOMEBREW_DIR="/opt/homebrew/Library/Taps/local/homebrew-libiodbc/Formula"
-else
-    HOMEBREW_DIR="/usr/local/Homebrew/Library/Taps/local/homebrew-libiodbc/Formula"
-fi
-
-brew tap-new local/libiodbc
-cp "${BASH_SOURCE%/*}/libiodbc.rb" "$HOMEBREW_DIR/"
-brew install local/libiodbc/libiodbc "$@"
+brew install --formula "${BASH_SOURCE%/*}/libiodbc.rb" "$@"

 read -r -a arr <<< "$(brew list --versions libiodbc)"
 version=${arr[1]}
--- a/coin/provisioning/common/macos/python3.sh
+++ b/coin/provisioning/common/macos/python3.sh
@@ -24,7 +24,7 @@ echo "Configure pip"
 /Library/Frameworks/Python.framework/Versions/3.11/bin/pip3 config --user set global.extra-index-url https://pypi.org/simple/

 /Library/Frameworks/Python.framework/Versions/3.11/bin/pip3 install virtualenv wheel html5lib
-/Library/Frameworks/Python.framework/Versions/3.11/bin/pip3 install -r ${BASH_SOURCE%/*}/../shared/sbom_requirements.txt
+/Library/Frameworks/Python.framework/Versions/3.11/bin/pip3 install -r ${BASH_SOURCE%/*}/../shared/requirements.txt

 SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.11/bin"
 SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.11/bin"
--- a/coin/provisioning/common/shared/check_schema_requirements.txt
+++ b/coin/provisioning/common/shared/check_schema_requirements.txt
@@ -0,0 +1,5 @@
+# Dependency: check-jsonschema -> regress
+# `regress` is not yet built for Windows ARM and building from scratch
+# requires cargo which is not provisioned. Disabling this on Windows ARM for now.
+check-jsonschema ; sys_platform != 'win32' or platform_machine != 'ARM64'
+click
--- a/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh
+++ b/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh
@@ -2,39 +2,16 @@
 # 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

-set -euox pipefail
+set -x

 lib_dir="$1/lib"
 additional_suffix="${2:-}"
 set_rpath="${3:-yes}"

-# readelf and patchelf are prerequisite tools for this script. Check
-# that they are available.
 if [ "$(uname -s)" = "Darwin" ]; then
    # Under Homebrew, binutils package is not symlinked into PATH.
    # This lets us use readelf provided by Homebrew.
-    readelf_homebrew_path="$(brew --prefix binutils)/bin/readelf"
-    if [[ ! -x "$readelf_homebrew_path" ]]; then
-        echo "Found no valid readelf executable. It is possible it was not correctly installed through Homebrew."
-        exit 1
-    fi
-    readelf() { "$readelf_homebrew_path" "$@"; }
-fi
-
-if ! command -v readelf; then
-    echo "Found no valid readelf command. It is possible it was not correctly installed."
-    exit 1
-fi
-
-if ! command -v patchelf; then
-    echo "Found no valid patchelf command. It is possible it was not correctly installed."
-    exit 1
-fi
-
-# Get patchelf version
-patchelf_version=$(patchelf --version 2>/dev/null | awk '{print $2}')
-if [[ "$patchelf_version" == "0.18.0" ]]; then
-    echo "WARNING: patchelf version 0.18.0 is known to have issues with Android." >&2
+    readelf() { "$(brew --prefix binutils)/bin/readelf" "$@"; }
 fi

 ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale")
--- a/coin/provisioning/common/shared/requirements.txt
+++ b/coin/provisioning/common/shared/requirements.txt
@@ -0,0 +1,4 @@
+# Requirements for running SBOM related utilities
+-r sbom_requirements.txt
+# Requirements for running Json schema validations
+-r check_schema_requirements.txt
--- a/coin/provisioning/common/shared/sbom_requirements.txt
+++ b/coin/provisioning/common/shared/sbom_requirements.txt
@@ -1,7 +1,6 @@
 # Python packages used to validate and audit Qt SBOM informaiton
-spdx-tools>=0.8.0
-ntia-conformance-checker
-sbomaudit
-sbom2doc
-reuse
-cyclonedx-python-lib==11.0.0
+spdx-tools>=0.8.0 ; python_version >= '3.9'
+ntia-conformance-checker ; python_version >= '3.9'
+sbomaudit ; python_version >= '3.9'
+sbom2doc ; python_version >= '3.9'
+reuse ; python_version >= '3.9'
--- a/coin/provisioning/common/shared/testserver/californium/Dockerfile
+++ b/coin/provisioning/common/shared/testserver/californium/Dockerfile
@@ -4,13 +4,12 @@ RUN apt-get update && apt-get -y install $packages

 # Get californium-based CoAP test server
 WORKDIR /root/src
-ADD californium-3.8.0.tar.gz .
+ADD californium-*.tar.gz .
 RUN mv californium-* californium
 WORKDIR /root/src/californium
 ADD qt_changes.patch ./
 RUN patch -p1 < qt_changes.patch
-ADD californium-m2deps-3.8.0.tar.gz /root
-RUN mvn clean install -o -q -DskipTests
+RUN mvn clean install -q -DskipTests
 WORKDIR /

 EXPOSE 5683/udp 5684/udp
--- a/coin/provisioning/common/shared/testserver/docker_images.sh
+++ b/coin/provisioning/common/shared/testserver/docker_images.sh
@@ -60,16 +60,6 @@ DownloadURL  \
    24f8ca393f26c922739462e4586b8ced1ff75f99bfa795defa34a967b5a4a5a0  \
    californium-3.8.0.tar.gz
 mv californium-3.8.0.tar.gz "$SERVER_PATH/californium/"
-# Download cached maven dependencies for californium.
-# The dependency archive is built by
-# "mvn dependency:go-offline -DskipTests -Dos.detected.classifier=linux-x86_64"
-# and archived from /root/.m2
-DownloadURL  \
-    http://ci-files01-hki.ci.qt.io/input/docker/californium-m2deps-3.8.0.tar.gz \
-    http://ci-files01-hki.ci.qt.io/input/docker/californium-m2deps-3.8.0.tar.gz \
-    e2fade7dde3cca02bb910eed99a5d8b5cb8ff945240c65bf06ce50411d70d3f2  \
-    californium-m2deps-3.8.0.tar.gz
-mv californium-m2deps-3.8.0.tar.gz "$SERVER_PATH/californium/"


 echo 'Building the docker images...'
--- a/coin/provisioning/common/shared/vcpkg_parse_packages.cmake
+++ b/coin/provisioning/common/shared/vcpkg_parse_packages.cmake
@@ -0,0 +1,45 @@
+#!/usr/bin/cmake -P
+
+cmake_minimum_required(VERSION 3.19)
+
+message("VCPKG_EXECUTABLE: ${VCPKG_EXECUTABLE}")
+if(NOT VCPKG_EXECUTABLE OR NOT EXISTS "${VCPKG_EXECUTABLE}" OR NOT OUTPUT OR NOT VCPKG_INSTALL_ROOT)
+    message(FATAL_ERROR "Usage: \ncmake -DVCPKG_EXECUTABLE=<path/to/vcpkg/executable>"
+        " -DOUTPUT=<path/to/versions.txt> -DVCPKG_INSTALL_ROOT=<path/to/install/root>"
+        " -P vcpkg_parse_packages.cmake"
+    )
+endif()
+execute_process(COMMAND "${VCPKG_EXECUTABLE}"
+    "list"  "--x-install-root=${VCPKG_INSTALL_ROOT}" "--x-json" OUTPUT_VARIABLE result)
+
+string(JSON element_count LENGTH "${result}")
+
+file(STRINGS "${OUTPUT}" output_data)
+math(EXPR last_index "${element_count} - 1")
+foreach(i RANGE 0 ${last_index})
+    string(JSON package MEMBER "${result}" "${i}")
+
+    # Extract the package name from <package name>:<triplet> pair
+    if(NOT package MATCHES "^([^:]+):.+$")
+        continue()
+    endif()
+
+    # Skip vcpkg internal tools
+    set(package_name "${CMAKE_MATCH_1}")
+    if(package_name MATCHES "^vcpkg-.+$")
+        continue()
+    endif()
+
+    string(JSON package_info GET "${result}" "${package}")
+    string(JSON version GET "${package_info}" "version")
+
+    string(STRIP "${package}" package)
+    string(STRIP "${version}" version)
+    # Store the package information for the particular triplet
+    list(APPEND output_data "vcpkg ${package} = ${version}")
+endforeach()
+
+if(output_data)
+    list(JOIN output_data "\n" output_data)
+    file(WRITE "${OUTPUT}" "${output_data}\n")
+endif()
--- a/coin/provisioning/common/shared/vcpkg_registry_mirror.txt
+++ b/coin/provisioning/common/shared/vcpkg_registry_mirror.txt
@@ -1 +1,2 @@
+https://git.qt.io/aledelev/vcpkg.git
 https://git.qt.io/mrmsdbdl/vcpkg-mirror.git
--- a/Show More
+++ b/Show More