Update submodules on '6.9.2 in qt/qt5'

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

.gitmodules

@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.10
+	branch = 6.9.2
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.10
+	branch = 6.9.2
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.10
+	branch = 6.9.2
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.10
+	branch = 6.9.2
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.10
+	branch = 6.9.2
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,7 +68,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = 6.10
+	branch = 6.9.2
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.10
+	branch = 6.9.2
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.10
+	branch = 6.9.2
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.10
-	status = deprecated
+	branch = 6.9.2
+	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.10
-	status = deprecated
+	branch = 6.9.2
+	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,88 +252,88 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.10
+	branch = 6.9.2
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.10
+	branch = 6.9.2
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.10
+	branch = 6.9.2
 	status = addon

coin/instructions/cmake_run_ctest.yaml

@@ -1,29 +0,0 @@
-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.
-

coin/instructions/coin_run_top_level_cmake_tests.yaml

@@ -1,27 +0,0 @@
-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"

coin/module_config.yaml

@@ -6,26 +6,7 @@ accept_configuration:
 
 instructions:
   Build:
-    - 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"
+    - !include "{{qt/qt5}}/coin_qt_build_template.yaml"
 
   Test:
-    - type: Group
-      instructions:
-        - !include "{{qt/qt5}}/coin_bic_tests.yaml"
-      enable_if:
-        condition: property
-        property: features
-        not_contains_value: "TopLevelRunCMakeTests"
+    - !include "{{qt/qt5}}/coin_bic_tests.yaml"

coin/platform_configs/cmake_platforms.yaml

@@ -7,7 +7,14 @@ Include: [
     macos.yaml
     ]
 Configurations:
-# Build on Ubuntu 22.04
+# Build on Ubuntu 22.04 and test on both X11 and Wayland later
+-
+    Id: 'ubuntu-22.04-developer-build'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples']
+    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace'
+    Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE']
 -
     Id: 'ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
@@ -21,7 +28,7 @@ Configurations:
 # Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later
 -
     Id: 'ubuntu-24.04-arm64-developer-build'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples']
     Configure arguments: '-make examples -developer-build -c++std c++20 -linker lld -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb'
@@ -31,7 +38,7 @@ Configurations:
     ]
 -
     Id: 'ubuntu-24.04-arm64'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'Packaging', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -qpa offscreen\;xcb'
@@ -40,23 +47,10 @@ Configurations:
         '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'
     ]
-# Test on Ubuntu 24.04 ARM64 Wayland
--
-    Id: 'ubuntu-24.04-arm64-developer-build-wayland-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'InsignificantTests', 'VerboseCTestOutput']
-    Platform dependency: 'ubuntu-24.04-arm64-developer-build'
--
-    Id: 'ubuntu-24.04-arm64-wayland-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'InsignificantTests', 'VerboseCTestOutput']
-    Platform dependency: 'ubuntu-24.04-arm64'
 # Test on Ubuntu 24.04 ARM64 offscreen
 -
     Id: 'ubuntu-24.04-arm64-offscreen-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: [
@@ -80,7 +74,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',
@@ -132,13 +126,12 @@ Configurations:
         '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}}',
-        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_x64}}',
     ]
 -
-    Id: 'windows-11_24H2-msvc2022'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Id: 'windows-11_23H2-msvc2022'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     Compiler: 'MSVC2022'
-    Features: ['Sccache', 'Packaging', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM']
     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}}\..',
@@ -158,11 +151,22 @@ Configurations:
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
 -
-    Id: 'windows-11_24H2-msvc2022-arm64'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Id: 'windows-11_23h2-arm64-msvc2022'
+    Template: 'qtci-windows-11_23H2-aarch64-53'
+    Compiler: 'MSVC2022'
+    Features: ['DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-opengl -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'
     Compiler: 'MSVC2022'
     Target arch: 'arm64'
-    Features: ['Sccache', 'Packaging', '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}}',
@@ -180,10 +184,10 @@ Configurations:
     Compiler: 'MSVC2022'
     Features: ['TestOnly']
     Configure arguments: '-no-opengl -cross-compiled'
-    Platform dependency: 'windows-11_24H2-msvc2022-arm64'
+    Platform dependency: 'windows-11_23H2-msvc2022-arm64'
 -
-    Id: 'windows-11_24H2-msvc2022-developer-build'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Id: 'windows-11_23H2-msvc2022-developer-build'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     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'
@@ -207,7 +211,7 @@ Configurations:
     Id: 'rhel-9.4'
     Template: 'qtci-linux-RHEL-9.4-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Packaging','Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['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',
@@ -220,24 +224,12 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-arm64'
+    Platform dependency: 'macos-universal-on-x86_64'
     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'
@@ -252,10 +244,10 @@ Configurations:
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
     ]
 -
-    Id: 'windows-11_24H2-llvm'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Id: 'windows-11_23H2-llvm'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     Compiler: 'Clang'
-    Features: ['Sccache', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
     Environment variables: [
         'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
@@ -265,8 +257,8 @@ Configurations:
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
     ]
 -
-    Id: 'windows-11_24H2-mingw13-developer-build'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Id: 'windows-11_23H2-mingw13-developer-build'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     Compiler: 'Mingw'
     Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
     Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
@@ -283,7 +275,7 @@ Configurations:
     Compiler: 'GCC'
     Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
     Environment variables: [
-        'DEBIAN_RULES_REF=6.10_dev',
+        'DEBIAN_RULES_REF=6.9_dev',
         'COIN_TARGET_DIST=tqtc-jammy',
         'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
         'COIN_SBUILD_CHROOT=jammy-arm64-sbuild',
@@ -296,7 +288,7 @@ Configurations:
     Compiler: 'GCC'
     Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
     Environment variables: [
-        'DEBIAN_RULES_REF=6.10_dev',
+        'DEBIAN_RULES_REF=6.9_dev',
         'COIN_TARGET_DIST=tqtc-jammy',
         'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
         'COIN_SBUILD_CHROOT=jammy-amd64-sbuild',
@@ -309,10 +301,10 @@ Configurations:
     Compiler: 'GCC'
     Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
     Environment variables: [
-        'DEBIAN_RULES_REF=6.10_gles',
+        'DEBIAN_RULES_REF=6.9_gles',
         'COIN_TARGET_DIST=tqtc-bookworm',
         'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
-        'COIN_SBUILD_CHROOT=stable-arm64-sbuild',
+        'COIN_SBUILD_CHROOT=bookworm-arm64-sbuild',
         'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main',
         'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
     ]

coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest_static.yaml

@@ -14,20 +14,6 @@ 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_7_0_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'

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']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
     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']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
     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',

coin/platform_configs/cmake_platforms_static_release.yaml

@@ -2,10 +2,10 @@ Version: 2
 Configurations:
 
 -
-    Id: 'windows-11_24H2-msvc2022-minimal-static-test'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Id: 'windows-11_23H2-msvc2022-minimal-static-test'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     Compiler: 'MSVC2022'
-    Features: ['Sccache', 'Packaging', 'UseConfigure', 'MinimalStaticTests']
+    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'
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
@@ -36,7 +36,7 @@ Configurations:
     ]
 -
     Id: 'ubuntu-24.04-arm64'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
     Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
     Configure arguments: '-static -nomake examples -release -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput -no-icu -qt-doubleconversion'

coin/platform_configs/cmake_platforms_static_tests.yaml

@@ -10,8 +10,8 @@ Configurations:
         'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
     ]
 -
-    Id: 'windows-11_24H2-minimal-static'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Id: 'windows-11_23H2-minimal-static'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     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'

coin/platform_configs/cmake_platforms_target_android.yaml

@@ -2,18 +2,18 @@ Version: 2
 Configurations:
 -
     Id: 'android-arm64-on-macos'
-    Template: 'qtci-macos-14-arm-106'
+    Template: 'qtci-macos-13-x86_64-103'
     Target os: 'Android_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-arm64'
+    Platform dependency: 'macos-universal-on-x86_64'
     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'
     ]
 -
@@ -73,9 +73,9 @@ Configurations:
     Platform dependency: 'rhel-8.10'
     Features: ['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'
     ]

coin/platform_configs/ios-tests.yaml

@@ -7,7 +7,7 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-arm64'
+    Platform dependency: 'macos-universal-on-x86_64'
     Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'

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']

coin/platform_configs/macos.yaml

@@ -8,17 +8,29 @@ Configurations:
     # Build on recent macOS version with latest Xcode
 
     -
-        Id: 'macos-universal-on-arm64'
-        Template: 'qtci-macos-15-arm-104'
+        Id: 'macos-universal-on-x86_64'
+        Template: 'qtci-macos-15-x86_64-103'
         Compiler: 'Clang'
         Target arch: 'x86_64-arm64'
-        Features: ['Packaging', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+        Features: ['Packaging', 'Sccache', '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
@@ -28,19 +40,19 @@ Configurations:
         Template: 'qtci-macos-13-x86_64-103'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-arm64'
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-14-x86_64-tests'
         Template: 'qtci-macos-14-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-arm64'
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-15-x86_64-tests'
         Template: 'qtci-macos-15-x86_64-103'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-arm64'
+        Platform dependency: 'macos-universal-on-x86_64'
 
     # And arm64
 
@@ -49,18 +61,45 @@ Configurations:
         Template: 'qtci-macos-13-arm-107'
         Compiler: 'Clang'
         Features: ['TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-arm64'
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-14-arm64-tests'
         Template: 'qtci-macos-14-arm-106'
         Compiler: 'Clang'
         Features: ['TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-arm64'
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         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'
 
     # =========================================================================
@@ -107,5 +146,5 @@ Configurations:
         Id: 'macos-15-arm64-developer-build-tests'
         Template: 'qtci-macos-15-arm-104'
         Compiler: 'Clang'
-        Features: ['TestOnly']
+        Features: ['TestOnly', 'InsignificantTests']
         Platform dependency: 'macos-arm64-developer-build'

coin/platform_configs/meta-boot2qt-qcom-hwe.yaml

@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [yocto.yaml]
-Configurations: []

coin/platform_configs/nightly_android.yaml

@@ -1,137 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        'rhel-8.10',
-        'windows-10_22h2-mingw13'
-    ]
-]
-# Android nightly to check for older (but still supported for the branch) NDKs
-Configurations:
--
-    Id: 'android-15-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.10'
-    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'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
-    Target os: 'Android_ANY'
-    Target arch: 'x86'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.10'
-    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'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
-    Target os: 'Android_ANY'
-    Target arch: 'armv7'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'windows-10_22h2-mingw13'
-    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'
-    Template: 'qtci-macos-14-arm-106'
-    Target os: 'Android_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-arm64'
-    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}}'
-    ]
-
-# ANDROID_NDK_ROOT_NIGHTLY2
--
-    Id: 'android-15-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.10'
-    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'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
-    Target os: 'Android_ANY'
-    Target arch: 'x86'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.10'
-    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'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
-    Target os: 'Android_ANY'
-    Target arch: 'armv7'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'windows-10_22h2-mingw13'
-    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'
-    Template: 'qtci-macos-14-arm-106'
-    Target os: 'Android_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-arm64'
-    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}}'
-    ]

coin/platform_configs/nightly_examples_and_tests.yaml

@@ -1,14 +0,0 @@
-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'
-    ]

coin/platform_configs/nightly_qt5_axivion.yaml

@@ -1,12 +1,13 @@
 Version: 2
 Module only: True
-Include: [
-  cmake_platforms.yaml: [
-    "ubuntu-22.04"
-  ]
-]
-Configurations: []
-Overrides:
+Configurations:
 -
-    Id: 'ubuntu-22.04'
-    Features: ['Axivion', 'DisableTests', 'UseConfigure', 'VMSize16']
+    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'
+    ]

coin/platform_configs/nightly_top_level_run_cmake_tests.yaml

@@ -1,9 +0,0 @@
-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: []

coin/platform_configs/nightly_unity_builds.yaml

@@ -1,8 +1,8 @@
 Version: 2
 Configurations:
 -
-    Id: 'windows-11_24H2-msvc2022-unity-build'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Id: 'windows-11_23H2-msvc2022-unity-build'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests']
     Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib'
@@ -24,7 +24,7 @@ Configurations:
     ]
 -
     Id: 'ubuntu-24.04-arm64-unity-build'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
     Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -qpa offscreen\;xcb'

coin/platform_configs/nightly_windows.yaml

@@ -1,21 +0,0 @@
-Version: 2
-Configurations: []
-Include: [
-    cmake_platforms.yaml: [
-        'windows-11_24H2-msvc2022-developer-build',
-        'windows-11_24H2-mingw13-developer-build',
-        'windows-11_24H2-llvm'
-    ]
-]
-# Windows nightly to check for -qtnamespace errors/issues
-Overrides:
--
-    Id: 'windows-11_24H2-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_24H2-mingw13-developer-build'
-    Configure arguments: '-qtnamespace TestNamespace -developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
--
-    Id: 'windows-11_24H2-llvm'
-    Features: ['Sccache', 'UseConfigure']
-    Configure arguments: '-qtnamespace TestNamespace -release -force-debug-info -separate-debug-info -nomake examples'

coin/platform_configs/precheck.yaml

@@ -3,9 +3,9 @@ Module only: True
 Include: [
   cmake_platforms.yaml: [
     "ubuntu-22.04",
-    "ubuntu-24.04-x64-developer-build",
+    "ubuntu-22.04-developer-build",
     "ubuntu-24.04-x64-developer-build-x11-tests",
-    "windows-11_24H2-msvc2022-developer-build",
+    "windows-11_23H2-msvc2022-developer-build",
     "ios-universal"
   ],
   macos.yaml: [

coin/platform_configs/qt-creator.yaml

@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'DebugAndRelease']
     Configure arguments: ''
@@ -15,7 +15,7 @@ Configurations:
     Configure arguments: ''
     Environment variables: []
 -
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'DebugAndRelease']
     Configure arguments: ''
@@ -28,7 +28,7 @@ Configurations:
     Environment variables: []
 # without tests
 -
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'DebugAndRelease', 'DisableTests']
     Configure arguments: ''
@@ -36,7 +36,7 @@ Configurations:
     Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 # oldest Qt version
 -
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_23H2-x86_64-54'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
     Configure arguments: ''

coin/platform_configs/qtbase-new-compiler-testing.yaml

@@ -15,7 +15,7 @@ Configurations:
 # Test gcc-14 on Ubuntu 24.04 ARM64 Wayland
 -
     Id: 'ubuntu-24.04-arm64-gcc14'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
     Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput'

coin/platform_configs/qtcharts.yaml

@@ -14,7 +14,3 @@ Overrides:
 -
     Id: 'vxworks-x86_64-tests'
     Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
-# Remove imx8 tests.
--
-    Id: 'vxworks-imx8-buildtest'
-    Features: ['VMSize8', 'UseConfigure', 'DisableTests']

coin/platform_configs/qtgamepad.yaml

@@ -1,6 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml,
-    address_sanitizer_platforms.yaml
-    ]
-Configurations: []

coin/platform_configs/qtgradleplugin.yaml

@@ -1,18 +0,0 @@
-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-24h2'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
-    Compiler: 'MSVC2022'
-    Features: ['TestOnly']

coin/platform_configs/qtlite.yaml

@@ -195,8 +195,6 @@ 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

coin/platform_configs/qtmultimedia.yaml

@@ -6,8 +6,3 @@ Include: [
     address_sanitizer_platforms.yaml
     ]
 Configurations: []
-Overrides:
-# Remove imx8 tests.
--
-    Id: 'vxworks-imx8-buildtest'
-    Features: ['VMSize8', 'UseConfigure', 'DisableTests']

coin/platform_configs/qtquick3d.yaml

@@ -4,8 +4,7 @@ Include: [
     integrity.yaml,
     cmake_platforms_qemu_vxworks_buildtest_static.yaml,
     cmake_platforms_qemu_vxworks_tests_static.yaml,
-    address_sanitizer_platforms.yaml,
-    qtlite.yaml
+    address_sanitizer_platforms.yaml
 ]
 Configurations: []
 Overrides:

coin/platform_configs/qtsaferenderer-runtime.yaml

@@ -1,21 +1,20 @@
 Version: 2
 Include: [
   macos.yaml: [
-     "macos-universal-on-arm64",
-     "macos-13-x86_64-tests"
+     "macos-universal-on-x86_64",
+     "macos-13-x86_64-tests",
+     "macos-13-arm-on-arm64-tests"
   ],
   cmake_platforms.yaml: [
     "ubuntu-22.04",
-    "ubuntu-24.04-x64-developer-build",
-    "ubuntu-24.04-arm64",
+    "ubuntu-22.04-developer-build",
     "opensuse-15.6-developer-build",
     "sles-15_sp6-static",
     "windows-10_22h2-msvc2022",
     "rhel-8.10",
     "windows-10_22h2-mingw13",
-    "windows-11_24H2-mingw13-developer-build",
-    "windows-11_24H2-llvm",
-    "windows-11_24H2-msvc2022",
+    "windows-11_23H2-mingw13-developer-build",
+    "windows-11_23H2-llvm",
     "windows-11_22h2-arm64-msvc2022"
   ],
   cmake_platforms_qemu_qnx710.yaml: [
@@ -30,16 +29,9 @@ 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'

coin/platform_configs/qtsaferenderer.yaml

@@ -1,36 +1,33 @@
 Version: 2
 Include: [
   macos.yaml: [
-     "macos-universal-on-arm64",
-     "macos-14-x86_64-tests",
-     "macos-14-arm64-tests"
+     "macos-universal-on-x86_64",
+     "macos-13-x86_64-tests",
+     "macos-13-arm-on-arm64-tests"
   ],
   cmake_platforms.yaml: [
     "ubuntu-22.04",
-    "ubuntu-24.04-x64-developer-build",
-    "ubuntu-24.04-arm64",
+    "ubuntu-22.04-developer-build",
     "opensuse-15.6-developer-build",
     "sles-15_sp6-static",
     "windows-10_22h2-msvc2022",
     "rhel-8.10",
     "windows-10_22h2-mingw13",
-    "windows-11_24H2-mingw13-developer-build",
-    "windows-11_24H2-llvm",
-    "windows-11_24H2-msvc2022",
+    "windows-11_23H2-mingw13-developer-build",
+    "windows-11_23H2-llvm",
     "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-14-latest-xcode-universal_Static'
-    Template: 'qtci-macos-14-arm-106'
+    Id: 'macos-latest-xcode-universal-static-build'
+    Template: 'qtci-macos-13-arm-107'
     Compiler: 'Clang'
     Target arch: 'x86_64-arm64'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
@@ -48,28 +45,6 @@ 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-52'
-    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'

coin/platform_configs/qtvirtualkeyboard.yaml

@@ -14,7 +14,3 @@ Overrides:
 -
     Id: 'vxworks-x86_64-tests'
     Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
-# Remove imx8 tests.
--
-    Id: 'vxworks-imx8-buildtest'
-    Features: ['VMSize8', 'UseConfigure', 'DisableTests']

coin/platform_configs/tqtc-android-automotive.yaml

@@ -6,7 +6,7 @@ Include: [
         'windows-10_22h2-mingw13',
     ],
     macos.yaml: [
-        'macos-universal-on-arm64'
+        'macos-universal-on-x86_64'
     ],
     cmake_platforms_target_android.yaml: [
         'android-arm64-on-macos',
@@ -27,8 +27,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 +43,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'

coin/platform_configs/tqtc-qtpip.yaml

@@ -6,7 +6,7 @@ Include: [
     "rhel-8.10"
   ],
   macos.yaml: [
-    "macos-universal-on-arm64"
+    "macos-universal-on-x86_64"
   ]
 ]
 Configurations: []

coin/pre-provisioning/qtci-linux-CentOS-8.3-x86_64/README_MANUAL_INSTALLATIONS

@@ -42,8 +42,6 @@ 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'

coin/pre-provisioning/qtci-linux-RHEL-8.10-x86_64/README_MANUAL_INSTALLATIONS

@@ -46,8 +46,6 @@ 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

coin/pre-provisioning/qtci-linux-RHEL-8.2-x86_64/README_MANUAL_INSTALLATIONS

@@ -41,8 +41,6 @@ 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'

coin/pre-provisioning/qtci-linux-RHEL-8.4-x86_64/README_MANUAL_INSTALLATIONS

@@ -52,8 +52,6 @@ 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

coin/pre-provisioning/qtci-linux-RHEL-8.6-x86_64/README_MANUAL_INSTALLATIONS

@@ -46,15 +46,13 @@ 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

coin/pre-provisioning/qtci-linux-RHEL-8.8-x86_64/README_MANUAL_INSTALLATIONS

@@ -46,8 +46,6 @@ 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

coin/pre-provisioning/qtci-linux-RHEL-9.0-x86_64/README_MANUAL_INSTALLATIONS

@@ -42,8 +42,6 @@ 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

coin/pre-provisioning/qtci-linux-RHEL-9.2-x86_64/README_MANUAL_INSTALLATIONS

@@ -42,8 +42,6 @@ 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

coin/pre-provisioning/qtci-linux-RHEL-9.4-x86_64/README_MANUAL_INSTALLATIONS

@@ -38,9 +38,6 @@ 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

coin/pre-provisioning/qtci-linux-SLES-15_SP3-x86_64/README_MANUAL_INSTALLATIONS

@@ -37,8 +37,6 @@ 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

coin/pre-provisioning/qtci-linux-SLES-15_SP4-x86_64/README_MANUAL_INSTALLATIONS

@@ -31,8 +31,6 @@ 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

coin/pre-provisioning/qtci-linux-SLES-15_SP5-x86_64/README_MANUAL_INSTALLATIONS

@@ -35,8 +35,6 @@ 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

coin/pre-provisioning/qtci-linux-SLES-15_SP6-x86_64/README_MANUAL_INSTALLATIONS

@@ -35,8 +35,6 @@ 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

coin/pre-provisioning/qtci-linux-Ubuntu-20.04-x86_64/README_MANUAL_INSTALLATIONS

@@ -51,8 +51,6 @@ 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'

coin/pre-provisioning/qtci-linux-Ubuntu-24.04-aarch64/README_MANUAL_INSTALLATIONS

@@ -36,8 +36,6 @@ Connect Your Online Accounts: Skip
  Software & Updates:
     * Updates:
        * Subscribed to: Security updates only
-         * With 24.04.2:
-            Security and recommended updates --> to pass provisioning
        * Automatically check for updates: Never
        * Notify me of a new Ubuntu version: Never
 
@@ -53,8 +51,6 @@ 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

coin/pre-provisioning/qtci-linux-Ubuntu-24.04-x86_64/README_MANUAL_INSTALLATIONS

@@ -51,8 +51,6 @@ 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

coin/pre-provisioning/qtci-linux-openSUSE-15.4-x86_64/README_MANUAL_INSTALLATIONS

@@ -40,5 +40,3 @@ 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

coin/pre-provisioning/qtci-linux-openSUSE-15.5-x86_64/README_MANUAL_INSTALLATIONS

@@ -32,6 +32,4 @@ Power Management: Screen Energy Saving - unselect
                   Suspend Session - unselect
 YaST - Hardware - Sound - Add Dummy soundcard
 
-sudo zypper -nq install qemu-guest-agent
-
 Reboot

coin/pre-provisioning/qtci-linux-openSUSE-15.6-x86_64/README_MANUAL_INSTALLATIONS

@@ -36,6 +36,4 @@ Power Management: Screen Energy Saving - unselect
                   Suspend Session - unselect
 YaST - Hardware - Sound - Add Dummy soundcard
 
-sudo zypper -nq install qemu-guest-agent
-
 Reboot

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
-    - 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
+    - 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
   - 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 --insecure "<macos-version>" "tart-registry.ci.qt.io:5000/<macos-version>:latest" "tart-registry.ci.qt.io:5000/<macos-version>: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"
 
-* Add Tier1 image to Opennebula by logging into Opennebula container
+* Add Tier1 image to Opennebula by logging getting into Opennebula container
   - Create a dummy file to correct datastore in NFS
   - Register virtual machine to Opennebula by running register_images.sh
 

coin/pre-provisioning/qtci-windows-10_22H2-x86_64/README_MANUAL_INSTALLATIONS

@@ -9,9 +9,6 @@ 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

coin/pre-provisioning/qtci-windows-11_23H2-aarch64/README_MANUAL_INSTALLATIONS

@@ -0,0 +1,90 @@
+# 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

coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-clean-manager.ps1

@@ -0,0 +1,8 @@
+# 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"

coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-defragment.ps1

@@ -0,0 +1,42 @@
+# 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"
+}

coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-ntp.ps1

@@ -0,0 +1,4 @@
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
+
+# Disable the NTP from syncing
+Run-Executable "w32tm.exe" "/config /syncfromflags:NO"

coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-schedule-tasks.ps1

@@ -1,4 +1,4 @@
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
 
 # This script will remove unneeded Tasks from Task Scheduler
 

coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windefender.ps1

@@ -1,4 +1,4 @@
-# Copyright (C) 2020 The Qt Company Ltd.
+# 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
 
 # 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\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\windows\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"

coin/pre-provisioning/qtci-windows-11_23H2-aarch64/msvc2022.txt

@@ -0,0 +1,81 @@
+### 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'
+############################################################

coin/pre-provisioning/qtci-windows-11_23H2-x86_64/README_MANUAL_INSTALLATIONS

@@ -23,8 +23,6 @@ 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
@@ -140,5 +138,3 @@ 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)

coin/pre-provisioning/qtci-windows-11_24H2-x86_64/01-enable-dotnet-framework.ps1

@@ -1,22 +0,0 @@
-# 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
-}

coin/pre-provisioning/qtci-windows-11_24H2-x86_64/README_MANUAL_INSTALLATIONS

@@ -1,242 +0,0 @@
-# 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.

coin/pre-provisioning/qtci-windows-11_24H2-x86_64/disable-ntp.ps1

@@ -1,2 +0,0 @@
-# Disable the NTP from syncing
-w32tm.exe /config /syncfromflags:NO

coin/pre-provisioning/qtci-windows-11_24H2-x86_64/msvc2022.txt

@@ -1,65 +0,0 @@
-### 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'
-############################################################

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

coin/provisioning/common/linux/cmake_toolchain_files/integrity_toolchain.cmake

@@ -107,11 +107,10 @@ set(IntegrityPlatformGraphics_LIBRARIES_PACK
     "${EGL_LIBRARY_CHK_PATH}/libivfs.a"
 )
 
-set(IntegrityPlatformGraphics_REQUIRED_LIBRARIES
+list(APPEND _qt_igy_gui_libs
     "${GLESv2_LIBRARY}"
     "${IntegrityPlatformGraphics_LIBRARY}"
-    "${IntegrityPlatformGraphics_LIBRARIES_PACK}"
-)
+    "${IntegrityPlatformGraphics_LIBRARIES_PACK}")
 
 set(OPENGL_INCLUDE_DIR ${GL_INC_DIR})
 set(OPENGL_opengl_LIBRARY ${EGL_LIBRARY})

coin/provisioning/common/linux/install-network-test.sh

@@ -1,38 +0,0 @@
-#!/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;

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}/"
+SetEnvVar "Oracle_ROOT" "${installFolder}/${distdir}/sdk/"
 
 echo "Oracle Instant Client = $version" >> ~/versions.txt

coin/provisioning/common/linux/install-vcpkg-ports-android.sh

@@ -14,17 +14,9 @@ mkdir -p "$VCPKG_ROOT/installed"
 cp -R x86-android-qt-tmp/* "$VCPKG_ROOT/installed/"
 cp -R x86_64-android-qt-tmp/* "$VCPKG_ROOT/installed/"
 
-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"
+versions=$(jq -r '.overrides[] | "vcpkg \(.name) for android = \(.version)"' vcpkg.json)
+versions="${versions//vcpkg/\\nvcpkg}"
+echo "$versions" >> ~/versions.txt
 
 rm -rf x86-android-qt-tmp
 rm -rf x86_64-android-qt-tmp

coin/provisioning/common/linux/install-vcpkg-ports.sh

@@ -7,19 +7,15 @@ echo "Installing vcpkg ports"
 pushd "${BASH_SOURCE%/*}/vcpkg" || exit
 cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" .
 
-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"
+"$VCPKG_ROOT/vcpkg" install --triplet x64-linux-qt --x-install-root x64-linux-qt-tmp --debug
 
 mkdir -p "$VCPKG_ROOT/installed"
-cp -R $install_root/* "$VCPKG_ROOT/installed/"
+cp -R x64-linux-qt-tmp/* "$VCPKG_ROOT/installed/"
 
-rm -rf $install_root
+versions=$(jq -r '.overrides[] | "vcpkg \(.name) = \(.version)"' vcpkg.json)
+versions="${versions//vcpkg/\\nvcpkg}"
+echo "$versions" >> ~/versions.txt
+
+rm -rf x64-linux-qt-tmp
 
 popd || exit

coin/provisioning/common/linux/install-vcpkg.sh

@@ -18,43 +18,12 @@ echo "Cloning the vcpkg repo"
 git clone "$vcpkgRepo" "$vcpkgRoot"
 git -C "$vcpkgRoot" checkout "tags/$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//-/}
+vcpkgToolReleaseTag=$(grep 'vcpkg_tool_release_tag=' "${BASH_SOURCE%/*}/../shared/vcpkg_tool_release_tag.txt" | cut -d '=' -f 2)
+nonDottedReleaseTag=${vcpkgVersion//-/}
 
 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"
 

coin/provisioning/common/linux/vx_works.sh

@@ -13,21 +13,20 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 ######### VXworks libs #########
 # Installs to /opt/vxworks
-PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_libs_2503.tar.gz"
+PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_libs_2403.tar.gz"
 AltUrl=""
-sha1="96db52d86c2138a1ca31212372f48838ec08013e"
+sha1="8152c527ca489b1e51f2954e6e88c6daa22d88f6"
 targetFolder="/opt"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
 SetEnvVar "VXWORKS_HOME" "/opt/vxworks"
 SetEnvVar "VXWORKS_SSH" "WindRiver@172.31.1.10"
 
-# IMX 6
-VXWORKS_BUILD_VER="16-04-2025"
+VXWORKS_BUILD_VER="18-12-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="88f0f139ac62e8c0a4c5477d880a1ff345826479"
+sha1="6b5a264d08a9d34b03ff13cb28e690c5c5178569"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
 SetEnvVar "WIND_CC_SYSROOT" "/opt/fsl_imx6_2_0_6_2_VSB"
@@ -36,28 +35,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="96056c0f9b1234160db2d9038a9e6fc24a2bbbd7"
-targetFolder="/opt/"
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
-
-# IMX 8
-# 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="cf6194b78bf08b894397fd5ce2a57abd25cf497b"
+sha1="117af91a6c93ac89727f8d8bfe4cf840ce4485c9"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
 
 # 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=""
-sha1="4c75222364d3907db9fb1605cabe0c92616d9ec9"
+sha1="c1b2f2e2903540e8005237ce3641fc043ced0ddf"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
 # Installs to /opt/itl_generic_skylake_VIP_QEMU
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_intel_vip_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="c3af7da92832ea71201dcf1022d7404966291f5c"
+sha1="2fa12dac1f1460019a418da49b095c743a9fe282"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
 

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 16G \
+        -m 8G \
         -cpu "Skylake-Client" \
-        -enable-kvm \
         -monitor none \
         -nographic \
         -serial null \

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

coin/provisioning/common/macos/disable_spotlight.sh

@@ -2,17 +2,14 @@
 # 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 || return 1
-    sudo mdutil -a -i off / || return 1
+    sudo mdutil -a -i off
+    sudo mdutil -a -i off /
     # Disable spotlight indexing /Volumes
-    sudo mdutil -i off /Volumes || return 1
+    sudo mdutil -i off /Volumes
     # Erase spotlight index
-    sudo mdutil -E / || return 1
+    sudo mdutil -E /
 }
 
 # Disabling spotlight tends to be flaky, add some retry

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/requirements.txt
+/Library/Frameworks/Python.framework/Versions/3.11/bin/pip3 install -r ${BASH_SOURCE%/*}/../shared/sbom_requirements.txt
 
 SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.11/bin"
 SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.11/bin"

coin/provisioning/common/shared/check_schema_requirements.txt

@@ -1,5 +0,0 @@
-# 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

coin/provisioning/common/shared/requirements.txt

@@ -1,4 +0,0 @@
-# Requirements for running SBOM related utilities
--r sbom_requirements.txt
-# Requirements for running Json schema validations
--r check_schema_requirements.txt

coin/provisioning/common/shared/sbom_requirements.txt

@@ -1,6 +1,6 @@
 # Python packages used to validate and audit Qt SBOM informaiton
-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'
+spdx-tools>=0.8.0
+ntia-conformance-checker
+sbomaudit
+sbom2doc
+reuse

coin/provisioning/common/shared/vcpkg_parse_packages.cmake

@@ -1,45 +0,0 @@
-#!/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()

coin/provisioning/common/shared/vcpkg_registry_mirror.txt

@@ -1,2 +1 @@
-https://git.qt.io/aledelev/vcpkg.git
 https://git.qt.io/mrmsdbdl/vcpkg-mirror.git

coin/provisioning/common/shared/vcpkg_tool_release_tag.txt

@@ -1,4 +1 @@
-vcpkg_tool_release_tag=2024-09-18
-windows_x64_sha1=484373186A905E9F39FE385F4FB59F263B9FFE95
-windows_arm64_sha1=E0C4CBCD64B867CE386886806D8CA9C84610545F
-linux_sha1=99a31b0bed2845f5c915735121d34c453126ec76
+vcpkg_tool_release_tag=2023-11-16

coin/provisioning/common/shared/vcpkg_version.txt

@@ -1 +1 @@
-vcpkg_version=2024.08.23
+vcpkg_version=2023.10.19

coin/provisioning/common/unix/emsdk.sh

@@ -8,15 +8,15 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
 
-version="4.0.7"
-versionNode="v20.18.0"
+version="3.1.70"
+versionNode="v16.20.0"
 tarBallVersion="${version//./_}"
 if uname -a | grep -q Darwin; then
     tarBallPackage="emsdk_macos_${tarBallVersion}.tar.gz"
-    sha="c3d2df45685b68e5d69e09017084d26783eda2dd"
+    sha="eafd7b96ab12d84183d2eaa62e8d39bb12c252bf"
 else
     tarBallPackage="emsdk_linux_${tarBallVersion}.tar.gz"
-    sha="20f7782ca4a9088fe91405b16c6fed630e91dcd6"
+    sha="047a3da9048edc71fb56af544c4bb2448d6c0644"
 fi
 cacheUrl="https://ci-files01-hki.ci.qt.io/input/emsdk/${tarBallPackage}"
 target="/tmp/${tarBallPackage}"
@@ -53,6 +53,5 @@ SetEnvVar "PATH" "\"\$PATH:${emscriptenPath}\""
 SetEnvVar "EMSCRIPTEN" "${emscriptenPath}"
 SetEnvVar "EMSDK" "${emsdkPath}"
 SetEnvVar "EMSDK_NODE" "${emsdkPath}${pathNodeExecutable}"
-SetEnvVar "EMSDK_PYTHON" "$PYTHON3_EXECUTABLE"
 
 echo "Emsdk = $version" >> ~/versions.txt

coin/provisioning/common/unix/install-ffmpeg-android.sh

@@ -21,16 +21,16 @@ assert_envvar_is_populated_dir() {
         exit 1
     fi
 }
+assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_DEFAULT"
+assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_DEFAULT"
 
 build_ffmpeg_android() {
     local target_arch=$1
     local target_dir=$2
-    local ndk_root=$3
-    local openssl_android_path=$4
 
     sudo mkdir -p "$target_dir"
 
-    local openssl_include="$openssl_android_path/include"
+    local openssl_include="$OPENSSL_ANDROID_HOME_DEFAULT/include"
     local openssl_libs
     local libs_prefix
     local target_cpu
@@ -40,19 +40,19 @@ build_ffmpeg_android() {
         target_toolchain_arch="x86_64-linux-android"
         target_arch=x86_64
         target_cpu=x86-64
-        openssl_libs="$openssl_android_path/x86_64"
+        openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/x86_64"
         libs_prefix="_x86_64"
     elif [ "$target_arch" == "x86" ]; then
         target_toolchain_arch="i686-linux-android"
         target_arch=x86
         target_cpu=i686
-        openssl_libs="$openssl_android_path/x86"
+        openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/x86"
         libs_prefix="_x86"
     elif [ "$target_arch" == "arm64" ]; then
         target_toolchain_arch="aarch64-linux-android"
         target_arch=aarch64
         target_cpu=armv8-a
-        openssl_libs="$openssl_android_path/arm64-v8a"
+        openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/arm64-v8a"
         libs_prefix="_arm64-v8a"
     fi
 
@@ -61,6 +61,7 @@ build_ffmpeg_android() {
 
     local api_version=24
 
+    local ndk_root=$ANDROID_NDK_ROOT_DEFAULT
     local ndk_host
     if uname -a |grep -q "Darwin"; then
         ndk_host=darwin-x86_64
@@ -107,21 +108,15 @@ build_ffmpeg_android() {
 if  [ "$os" == "android-x86" ]; then
     target_arch=x86
     target_dir="/usr/local/android/ffmpeg-x86"
-    envvar_latest="FFMPEG_DIR_ANDROID_X86_NDK_LATEST"
-    envvar_nightly1="FFMPEG_DIR_ANDROID_X86_NDK_NIGHTLY1"
-    envvar_nightly2="FFMPEG_DIR_ANDROID_X86_NDK_NIGHTLY2"
+    envvar="FFMPEG_DIR_ANDROID_X86"
 elif  [ "$os" == "android-x86_64" ]; then
     target_arch=x86_64
     target_dir="/usr/local/android/ffmpeg-x86_64"
-    envvar_latest="FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST"
-    envvar_nightly1="FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY1"
-    envvar_nightly2="FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY2"
+    envvar="FFMPEG_DIR_ANDROID_X86_64"
 elif  [ "$os" == "android-arm64" ]; then
     target_arch=arm64
     target_dir="/usr/local/android/ffmpeg-arm64"
-    envvar_latest="FFMPEG_DIR_ANDROID_ARM64_NDK_LATEST"
-    envvar_nightly1="FFMPEG_DIR_ANDROID_ARM64_NDK_NIGHTLY1"
-    envvar_nightly2="FFMPEG_DIR_ANDROID_ARM64_NDK_NIGHTLY2"
+    envvar="FFMPEG_DIR_ANDROID_ARM64"
 else
     >&2 echo "Unhandled android os param: $os"
     exit 1
@@ -129,24 +124,8 @@ fi
 
 # If parameter is set, use it as the target output directory.
 if [ ! -z $target_install_dir_param ]; then
-    target_dir=$target_install_dir_param
+  target_dir=$target_install_dir_param
 fi
 
-assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_LATEST"
-assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_LATEST"
-build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_LATEST" "$OPENSSL_ANDROID_HOME_LATEST"
-set_ffmpeg_dir_env_var "$envvar_latest" "$target_dir"
-
-if [ "${ANDROID_NDK_ROOT_NIGHTLY1}" ]; then
-    assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_NIGHTLY1"
-    assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_NIGHTLY1"
-    build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_NIGHTLY1" "$OPENSSL_ANDROID_HOME_NIGHTLY1"
-    set_ffmpeg_dir_env_var "$envvar_nightly1" "$target_dir/nightly1"
-fi
-
-if [ "${ANDROID_NDK_ROOT_NIGHTLY2}" ]; then
-    assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_NIGHTLY2"
-    assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_NIGHTLY2"
-    build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_NIGHTLY2" "$OPENSSL_ANDROID_HOME_NIGHTLY2"
-    set_ffmpeg_dir_env_var "$envvar_nightly2" "$target_dir/nightly2"
-fi
+build_ffmpeg_android "$target_arch" "$target_dir"
+set_ffmpeg_dir_env_var "$envvar" "$target_dir"

coin/provisioning/common/unix/install-ffmpeg-ios.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 will build and install FFmpeg static libs
-# Can take an optional final parameter to control installation directory
 set -ex
 
 # Must match or be lower than the minimum iOS version supported by the version of Qt that is
@@ -14,8 +13,7 @@ source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh"
 
 ffmpeg_source_dir=$(download_ffmpeg)
 ffmpeg_config_options=$(get_ffmpeg_config_options "shared")
-default_prefix="/usr/local/ios/ffmpeg"
-prefix="${1:-$default_prefix}"
+prefix="/usr/local/ios/ffmpeg"
 dylib_regex="^@rpath/.*\.dylib$"
 
 build_ffmpeg_ios() {
@@ -107,7 +105,6 @@ build_info_plist() {
     echo $info_plist | sudo tee ${file_path} 1>/dev/null
 }
 
-
 create_framework() {
     # Create a 'traditional' framework from the corresponding dylib.
     local framework_name="$1"

coin/provisioning/common/unix/install-mosquitto-mqtt.sh

@@ -1,148 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2024 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-set -e
-set -o pipefail
-
-export PROVISIONING_DIR="${BASH_SOURCE%/*}/../../"
-source "$PROVISIONING_DIR"/common/unix/common.sourced.sh
-
-#
-# The certificates are generated with
-#  openssl req -x509 -sha256 -nodes -newkey rsa:2048 -days 36500 -keyout localhost.key -out localhost.crt
-#
-# The same certificate need to be used for the tests
-#
-export cert_key='
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCc1pqVlPX/22kY
-vxYZ9+tluPPB8wtvzFHW02RiEFKrdU8Ey8mDBKpK+ljMvzXWC/F+aF1tLs/C7bWx
-affMCU5DYq2ATMaMMcFlnj56mytIimmUwbwc1IdL1r5rRcx1FhPdytTbSsi++mY/
-xGb9CNAqZFjKG6cxFv86rj4/N1sZItMadq6/xx8p6hb/ChTKCaUdQOrlrZctdldW
-kMl2SMjKCFD4Az5rB7TWSgQnM+yLAGB4437xCCfq+JTjrIE143HTFPtIR38jQstf
-+sZgcJ3IUqg2X9208hUbuhivs8xSgUsreDAe80Nj9vamMKDSTm7iZD0X6okCSUS5
-MMrufUwdAgMBAAECggEAKs2u9q/my2M4NZbBE2lEB0kIzZ/lOSfMFhMvTEwkI8Mq
-Q6bSYj19tGTKo2Zz7OzphZQ6GzgxX4O8mKTRChBoGZ/uths9/Lj/jRo49wEuOOf9
-lKmjC0M9gYckBObRvArAdUGMAiVQ0D5KdZDGgrxLA6bLTK1rXcxm777qIhqbdCpN
-i9RwW9wp9rMV53J8mmWWUDVpfbIKHAmp50JknXj07onPEqN6IKdZY7sYACfYiz/8
-l31rKfR/P5j/aRBOFwBnq7Z3JGfOEQPmE8bxQ2Vt3ZXPK2ekreDx4j2Tz+gSZmF3
-Ee8DonQtA1DTOlhMyb6FhJrEFmDr38jGQqDK4qV8iQKBgQDLoOSYzX0xcyK2dPMD
-woPGcKymI+XYx0Q6cVZo1GttNarhBN0w0ms9a4SYoTMhAI9tzjJw/sU5t9kLan6n
-m11PqQVK+Vbh1v2YICJW89LcOFYwyO6IAiMN1LUdy8las4GwcXRwBWWnXAnE+YJK
-AiXcmB1ZX3j8pgStCF9VApC50wKBgQDFLP87pGtWW3nvkxoDpgVb1CwpO1T1EsFF
-Yzv7eIkFQGUkqF7OlslhMCOERE8pj4dr4CoTIvVsYW+lYfBnFPpQ0pQ+BZ2meZ0u
-GfWBDYpNGTGrxEDBc923glb2oegQQirHpiWtlinp5nciOn/rqpUwJR3b46drFlNy
-26CTKA+8TwKBgQDKv8qdMo2i/QblMRD+/2CB55KgYkHrVI1ku5DUFB1awgMAxf0P
-LZRFtZZy+p6UD6DALn0e8S2jSKE9sq2laRbByINSoW2WtKAQJn7KoT+kshtvu8F1
-fts0XERyBITaYL2S14SePWF4ADZiACVwVy8ns/YVFPC8bvlc6Gczl7hOrQKBgQCP
-BUmJSIT3GdlDlq7q8JS4fBkgO0IvldAM9aL/j/nLjl8PDPXf4e3mihVpDmdhXRO8
-gtfiE5xzZeWmz3iiPMworeYLauVkaJhDZV73ogusStcFoY/bAqFTR76unNgIWwZO
-1MxFskNqvtmxQT+igJRAXNvgsKuyeHpFONurggaP7wKBgCj25sAxVcOuOcANQGcO
-wCNvt1pHDJengrzaKooCJqm5YxNhrcKlJsdQcQ1Mu+KyhcMY/WF/0UaJZytlHMWf
-aDlF7zKqhQFqFY7nk/C7+fED7Kg3XJR54qtweVNzD6k4yTeSsvBeTd2aaepzZvJI
-IOQ3RPVQNsdgjn3VTGs/rmrR
------END PRIVATE KEY-----
-'
-
-export cert_crt='
------BEGIN CERTIFICATE-----
-MIID6zCCAtOgAwIBAgIUbbY+pKEPOOytRZ3RujmmdriEAKcwDQYJKoZIhvcNAQEL
-BQAwgYMxCzAJBgNVBAYTAk5PMQ0wCwYDVQQIDARPc2xvMQ0wCwYDVQQHDARPc2xv
-MQswCQYDVQQKDAJRdDELMAkGA1UECwwCUXQxEjAQBgNVBAMMCWxvY2FsaG9zdDEo
-MCYGCSqGSIb3DQEJARYZZXZlbi5vc2Nhci5hbmRlcnNlbkBxdC5pbzAgFw0yNDEw
-MzExMTMyNDdaGA8yMTI0MTAwNzExMzI0N1owgYMxCzAJBgNVBAYTAk5PMQ0wCwYD
-VQQIDARPc2xvMQ0wCwYDVQQHDARPc2xvMQswCQYDVQQKDAJRdDELMAkGA1UECwwC
-UXQxEjAQBgNVBAMMCWxvY2FsaG9zdDEoMCYGCSqGSIb3DQEJARYZZXZlbi5vc2Nh
-ci5hbmRlcnNlbkBxdC5pbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AJzWmpWU9f/baRi/Fhn362W488HzC2/MUdbTZGIQUqt1TwTLyYMEqkr6WMy/NdYL
-8X5oXW0uz8LttbFp98wJTkNirYBMxowxwWWePnqbK0iKaZTBvBzUh0vWvmtFzHUW
-E93K1NtKyL76Zj/EZv0I0CpkWMobpzEW/zquPj83Wxki0xp2rr/HHynqFv8KFMoJ
-pR1A6uWtly12V1aQyXZIyMoIUPgDPmsHtNZKBCcz7IsAYHjjfvEIJ+r4lOOsgTXj
-cdMU+0hHfyNCy1/6xmBwnchSqDZf3bTyFRu6GK+zzFKBSyt4MB7zQ2P29qYwoNJO
-buJkPRfqiQJJRLkwyu59TB0CAwEAAaNTMFEwHQYDVR0OBBYEFGGxHowwihBbJlM5
-2wzicQa2sCfwMB8GA1UdIwQYMBaAFGGxHowwihBbJlM52wzicQa2sCfwMA8GA1Ud
-EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBACf4lUaBpw65tOZk32EpMD0D
-M0ilx1AwfUqliKdhVvkFJ6jN5h17YhVjFoGtSzE7ry5Rg5J07tUK5Xkjcfk39UWV
-RofVnRhrtiticXs0eXQkDXqao0aMjUjsWiokr4/cTNT5R3h9jmjzyjA6pWf2oSjT
-GTzZAHdcuBTUfvPy/Ff4M5AVNsI6geUqrUd6XzFwQsDWTT86sdWQIC8j+FMghhss
-9XRNOmhWtWGSRbP0HqlWOz5hFRPP/faI/FGTknzkkVYoWaB1CR+ThFK9jYi0FnFL
-2fIcJPt+6g6d01Ws5cb9HpL9joUloCjsZ+w6PXYNVyHTaG3Lg5o4nT1Oizvrq1k=
------END CERTIFICATE-----
-'
-
-export mosquitto_conf='
-listener 2883
-protocol mqtt
-allow_anonymous true
-max_connections -1
-
-listener 3883
-protocol mqtt
-allow_anonymous true
-max_connections -1
-
-listener 9883
-protocol mqtt
-allow_anonymous true
-max_connections -1
-keyfile  /etc/mosquitto/certs/localhost.key
-certfile /etc/mosquitto/certs/localhost.crt
-#tls_version tlsv1
-
-listener 10883
-protocol mqtt
-allow_anonymous true
-max_connections -1
-keyfile  /etc/mosquitto/certs/localhost.key
-certfile /etc/mosquitto/certs/localhost.crt
-#tls_version tlsv1
-
-listener 9080
-protocol websockets
-allow_anonymous true
-max_connections -1
-
-listener 10080
-protocol websockets
-allow_anonymous true
-max_connections -1
-
-listener 9081
-protocol websockets
-allow_anonymous true
-max_connections -1
-keyfile  /etc/mosquitto/certs/localhost.key
-certfile /etc/mosquitto/certs/localhost.crt
-tls_version tlsv1
-
-listener 10081
-protocol websockets
-allow_anonymous true
-max_connections -1
-keyfile  /etc/mosquitto/certs/localhost.key
-certfile /etc/mosquitto/certs/localhost.crt
-tls_version tlsv1
-'
-
-export setVariable=`grep MQTT_TEST_ALL_BROKERS_RUNNING /etc/profile`
-if [ -z "${setVariable}" ]; then
-  sudo sh -c "echo \"export MQTT_TEST_ALL_BROKERS_RUNNING=1\" >> /etc/profile"
-fi
-
-${CMD_PKG_INSTALL} mosquitto
-sudo sh -c "echo \"$cert_key\" > /etc/mosquitto/certs/localhost.key"
-sudo sh -c "echo \"$cert_crt\" > /etc/mosquitto/certs/localhost.crt"
-sudo sh -c "echo \"$mosquitto_conf\" > /etc/mosquitto/conf.d/mqtt.conf"
-
-sudo chmod 0755 /etc/mosquitto
-sudo chmod 0600 /etc/mosquitto/certs/localhost.key
-sudo chmod 0600 /etc/mosquitto/certs/localhost.crt
-sudo chmod 0644 /etc/mosquitto/conf.d/mqtt.conf
-
-sudo chown mosquitto /etc/mosquitto/certs/localhost.key
-sudo chown mosquitto /etc/mosquitto/certs/localhost.crt
-sudo chown mosquitto /etc/mosquitto/conf.d/mqtt.conf
-
-sudo systemctl restart mosquitto
-sudo systemctl enable mosquitto

coin/provisioning/common/unix/openssl_3_for_android.sh

@@ -0,0 +1,76 @@
+#!/usr/bin/env bash
+# Copyright (C) 2023 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+# This script install prebuilt OpenSSL which was built against Android NDK 25.
+# OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories
+
+set -ex
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+version="3.0.7"
+ndkVersionLatest="r27c"
+ndkVersionDefault=$ndkVersionLatest
+prebuiltOpensslNdkShaLatest="733cff853b6ee7738e78b90f46b5f028c8490e1e"
+prebuiltOpensslNdkShaDefault=$prebuiltOpensslNdkShaLatest
+
+: <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK r27c
+# Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd"
+exports_file="/tmp/export.sh"
+# source previously made environmental variables.
+if uname -a |grep -q "Ubuntu"; then
+    # shellcheck disable=SC1090
+    grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file
+    rm -rf "$exports_file"
+else
+    # shellcheck disable=SC1090
+    grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file
+    rm -rf "$exports_file"
+fi
+
+# ANDROID_NDK_ROOT is required during Configure
+export ANDROID_NDK_ROOT=/opt/android/android-ndk-r27c
+
+officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
+cachedUrl="http://ci-files01-hki.ci.qt.io/input/openssl/openssl-$version.tar.gz"
+targetFile="/tmp/openssl-$version.tar.gz"
+sha="f20736d6aae36bcbfa9aba0d358c71601833bf27"
+opensslHome="${HOME}/openssl/android/openssl-${version}"
+DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
+mkdir -p "${HOME}/openssl/android/"
+tar -xzf "$targetFile" -C "${HOME}/openssl/android/"
+if uname -a |grep -q "Darwin"; then
+    TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64/bin
+else
+    TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin
+fi
+cd "$opensslHome"
+PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
+PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
+EOB
+
+function InstallPrebuiltOpenssl() {
+
+    ndkVersion=$1
+    sha=$2
+
+    opensslHome="${HOME}/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}"
+    if [[ ! -d ${opensslHome} ]]; then
+        prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}.zip"
+        targetFile="/tmp/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}.zip"
+
+        DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
+        unzip -o "$targetFile" -d "${HOME}"
+        sudo rm -f "$targetFile"
+    fi
+}
+
+InstallPrebuiltOpenssl $ndkVersionDefault $prebuiltOpensslNdkShaDefault
+SetEnvVar "OPENSSL_ANDROID_HOME_DEFAULT" "$opensslHome"
+InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslNdkShaLatest
+SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
+
+echo "OpenSSL for Android = $version" >> ~/versions.txt

coin/provisioning/common/unix/openssl_for_android.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2025 The Qt Company Ltd.
+# Copyright (C) 2023 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 # This script install prebuilt OpenSSL which was built against Android NDK 25.
@@ -11,17 +11,11 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-sslVersionForLatest="3.0.7"
+version="3.0.7"
 ndkVersionLatest="r27c"
-prebuiltOpensslShaLatest="733cff853b6ee7738e78b90f46b5f028c8490e1e"
-
-ndkVersionNightly1=$ndkVersionLatest
-sslVersionForNightly1=$sslVersionForLatest
-prebuiltOpensslShaNightly1=$prebuiltOpensslShaLatest
-
-ndkVersionNightly2=$ndkVersionLatest
-sslVersionForNightly2=$sslVersionForLatest
-prebuiltOpensslShaNightly2=$prebuiltOpensslShaLatest
+ndkVersionDefault=$ndkVersionLatest
+prebuiltOpensslNdkShaLatest="733cff853b6ee7738e78b90f46b5f028c8490e1e"
+prebuiltOpensslNdkShaDefault=$prebuiltOpensslNdkShaLatest
 
 : <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK r27c
 # Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd"
@@ -37,11 +31,11 @@ else
     rm -rf "$exports_file"
 fi
 
-officialUrl="https://www.openssl.org/source/openssl-$sslVersionForLatest.tar.gz"
-cachedUrl="http://ci-files01-hki.ci.qt.io/input/openssl/openssl-$sslVersionForLatest.tar.gz"
-targetFile="/tmp/openssl-$sslVersionForLatest.tar.gz"
+officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
+cachedUrl="http://ci-files01-hki.ci.qt.io/input/openssl/openssl-$version.tar.gz"
+targetFile="/tmp/openssl-$version.tar.gz"
 sha="f20736d6aae36bcbfa9aba0d358c71601833bf27"
-opensslHome="${HOME}/openssl/android/openssl-${sslVersionForLatest}"
+opensslHome="${HOME}/openssl/android/openssl-${version}"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 mkdir -p "${HOME}/openssl/android/"
 tar -xzf "$targetFile" -C "${HOME}/openssl/android/"
@@ -59,12 +53,11 @@ function InstallPrebuiltOpenssl() {
 
     ndkVersion=$1
     sha=$2
-    sslVersion=$3
 
-    opensslHome="${HOME}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}"
+    opensslHome="${HOME}/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}"
     if [[ ! -d ${opensslHome} ]]; then
-        prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}.zip"
-        targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}.zip"
+        prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}.zip"
+        targetFile="/tmp/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}.zip"
 
         DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
         unzip -o "$targetFile" -d "${HOME}"
@@ -72,18 +65,9 @@ function InstallPrebuiltOpenssl() {
     fi
 }
 
-if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then
-    InstallPrebuiltOpenssl $ndkVersionNightly1 $prebuiltOpensslShaNightly1 $sslVersionForNightly1
-    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$opensslHome"
-    echo "OpenSSL for Android $ndkVersionNightly1 = $sslVersionForNightly1" >> ~/versions.txt
-fi
-
-if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
-    InstallPrebuiltOpenssl $ndkVersionNightly2 $prebuiltOpensslShaNightly2 $sslVersionForNightly2
-    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY2" "$opensslHome"
-    echo "OpenSSL for Android $ndkVersionNightly2 = $sslVersionForNightly2" >> ~/versions.txt
-fi
-
-InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslShaLatest $sslVersionForLatest
+InstallPrebuiltOpenssl $ndkVersionDefault $prebuiltOpensslNdkShaDefault
+SetEnvVar "OPENSSL_ANDROID_HOME_DEFAULT" "$opensslHome"
+InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslNdkShaLatest
 SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
-echo "OpenSSL for Android $ndkVersionLatest = $sslVersionForLatest" >> ~/versions.txt
+
+echo "OpenSSL for Android = $version" >> ~/versions.txt

coin/provisioning/common/windows/android-openssl.ps1

@@ -1,4 +1,4 @@
-# Copyright (C) 2025 The Qt Company Ltd.
+# Copyright (C) 2023 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 # Requires: 7z, perl and msys
@@ -15,38 +15,26 @@ if (Is64BitWinHost) {
 # Msys need to be installed to target machine
 # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
 
-$openssl_version_latest = "3.0.7"
+$openssl_version = "3.0.7"
 $ndk_version_latest = "r27c"
-$prebuilt_ssl_sha1_latest = "733cff853b6ee7738e78b90f46b5f028c8490e1e"
-$openssl_sha1_latest = "f20736d6aae36bcbfa9aba0d358c71601833bf27"
+$ndk_version_default = "$ndk_version_latest"
+$openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}.tar.gz")
+$openssl_sha1 = "f20736d6aae36bcbfa9aba0d358c71601833bf27"
+$prebuilt_sha1_ndk_latest = "733cff853b6ee7738e78b90f46b5f028c8490e1e"
+$prebuilt_sha1_ndk_default = "$prebuilt_sha1_ndk_latest"
+$destination_prefix = "C:\Utils\prebuilt-openssl-${openssl_version}-for-android-ndk"
 
-$openssl_version_nightly1 = $openssl_version_latest
-$ndk_version_nightly1 = $ndk_version_latest
-$prebuilt_ssl_sha1_nightly1 = $prebuilt_ssl_sha1_latest
-$openssl_sha1_nightly1 = $openssl_sha1_latest
+function Install($1, $2) {
+        $ndk_version = $1
+        $prebuilt_sha1 = $2
 
-$openssl_version_nightly2 = $openssl_version_latest
-$ndk_version_nightly2 = $ndk_version_latest
-$prebuilt_ssl_sha1_nightly2 = $prebuilt_ssl_sha1_latest
-$openssl_sha1_nightly2 = $openssl_sha1_latest
+        # msys unix style paths
+        $openssl_path = "/c/Utils/openssl-android-master"
+        $ndk_path = "/c/Utils/Android/android-ndk-${ndk_version}"
+        $cc_path = "$ndk_path/toolchains/llvm/prebuilt/windows-x86_64/bin"
 
-function Install($1, $2, $3, $4) {
-
-    $openssl_version = $1
-    $ndk_version = $2
-    $prebuilt_sha1 = $3
-    $openssl_sha1 = $4
-
-    Write-Host "Installing OpenSSL ${openssl_version} for Android NDK ${ndk_version}"
-
-    $openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}.tar.gz")
-    # msys unix style paths
-    $openssl_path = "/c/Utils/openssl-android-master"
-    $ndk_path = "/c/Utils/Android/android-ndk-${ndk_version}"
-    $cc_path = "$ndk_path/toolchains/llvm/prebuilt/windows-x86_64/bin"
-
-    $prebuilt_url_openssl = "\\ci-files01-hki.ci.qt.io\provisioning\openssl\prebuilt-openssl-${openssl_version}-for-android-ndk-${ndk_version}.zip"
-    $prebuilt_zip_openssl = Get-DownloadLocation ("prebuilt-openssl-${openssl_version}-for-android-ndk-${ndk_version}.zip")
+        $prebuilt_url_openssl = "\\ci-files01-hki.ci.qt.io\provisioning\openssl\prebuilt-openssl-${openssl_version}-for-android-ndk-${ndk_version}.zip"
+        $prebuilt_zip_openssl = Get-DownloadLocation ("prebuilt-openssl-${openssl_version}-for-android-ndk-${ndk_version}.zip")
 
     if ((Test-Path $prebuilt_url_openssl)) {
         Write-Host "Install prebuilt OpenSSL for Android"
@@ -81,36 +69,34 @@ function Install($1, $2, $3, $4) {
             }
         }
 
-    $make_install = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"yes | pacman -S make`"")
-    CheckExitCode $make_install
+        # ANDROID_NDK_ROOT needs to be in environment variables before running this script
+        # Set-EnvironmentVariable "ANDROID_NDK_ROOT" "C:\Utils\Android\android-ndk-r27c"
 
-    $configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndk_path PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
-    CheckExitCode $configure
+        $make_install = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"yes | pacman -S make`"")
+        CheckExitCode $make_install
 
-    $make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndk_path PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"")
-    CheckExitCode $make
+        $configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndk_path PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
+        CheckExitCode $configure
 
-    Pop-Location
-    Remove-item C:\Utils\tmp -Recurse -Confirm:$false
+        $make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndk_path PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"")
+        CheckExitCode $make
+
+        Pop-Location
+        Remove-item C:\Utils\tmp -Recurse -Confirm:$false
     }
 
-    return "C:\Utils\prebuilt-openssl-${openssl_version}-for-android-ndk-${ndk_version}"
-
 }
 
 # Install NDK Default version
-$ndk_ssl_path = Install $openssl_version_latest $ndk_version_latest $prebuilt_ssl_sha1_latest $openssl_sha1_latest
-Set-EnvironmentVariable "OPENSSL_ANDROID_HOME_LATEST" "$ndk_ssl_path"
-Write-Output "Android OpenSSL $openssl_version_latest for NDK $ndk_version_latest" >> ~/versions.txt
+Install $ndk_version_default $prebuilt_sha1_ndk_default
 
-if ($ndk_version_nightly1 -ne $ndk_version_latest) {
-    $ndk_ssl_path = Install $openssl_version_nightly1 $ndk_version_nightly1 $prebuilt_ssl_sha1_nightly1 $openssl_sha1_nightly1
-    Set-EnvironmentVariable "OPENSSL_ANDROID_HOME_NIGHTLY1" "$ndk_ssl_path"
-    Write-Output "Android OpenSSL $openssl_version_nightly1 for NDK $ndk_version_nightly1" >> ~/versions.txt
+if (Test-Path -Path ${destination_prefix}-${ndk_version_latest}) {
+    Write-Host "OpenSSL for Android Latest version is the same than Default. Installation done."
+} else {
+    # Install NDK Latest version
+    Install $ndk_version_latest $prebuilt_sha1_ndk_latest
 }
 
-if ($ndk_version_nightly2 -ne $ndk_version_latest) {
-    $ndk_ssl_path = Install $openssl_version_nightly2 $ndk_version_nightly2 $prebuilt_ssl_sha1_nightly2 $openssl_sha1_nightly2
-    Set-EnvironmentVariable "OPENSSL_ANDROID_HOME_NIGHTLY2" "$ndk_ssl_path"
-    Write-Output "Android OpenSSL $openssl_version_nightly2 for NDK $ndk_version_nightly2" >> ~/versions.txt
-}
+Set-EnvironmentVariable "OPENSSL_ANDROID_HOME_DEFAULT" "${destination_prefix}-${ndk_version_default}"
+Set-EnvironmentVariable "OPENSSL_ANDROID_HOME_LATEST" "${destination_prefix}-${ndk_version_latest}"
+Write-Output "Android OpenSSL = $openssl_version" >> ~/versions.txt

coin/provisioning/common/windows/android.ps1

@@ -1,4 +1,4 @@
-# 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
 
 . "$PSScriptRoot\helpers.ps1"
@@ -10,25 +10,15 @@
 # That's why we need to use Andoid-21 API version in Qt 5.9.
 
 # NDK
-$ndkZip = "C:\Windows\Temp\android_ndk.zip"
-
 $ndkVersionLatest = "r27c"
+$ndkVersionDefault = $ndkVersionLatest
 $ndkChecksumLatest = "ac5f7762764b1f15341094e148ad4f847d050c38"
+$ndkChecksumDefault = $ndkChecksumLatest
 $ndkCachedUrlLatest = "\\ci-files01-hki.ci.qt.io\provisioning\android\android-ndk-$ndkVersionLatest-windows.zip"
 $ndkOfficialUrlLatest = "https://dl.google.com/android/repository/android-ndk-$ndkVersionLatest-windows.zip"
-
-# 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
-$ndkChecksumNightly1 = $ndkChecksumLatest
-$ndkCachedUrlNightly1 = "\\ci-files01-hki.ci.qt.io\provisioning\android\android-ndk-$ndkVersionNightly1-windows.zip"
-$ndkOfficialUrlNightly1 = "https://dl.google.com/android/repository/android-ndk-$ndkVersionNightly1-windows.zip"
-
-$ndkVersionNightly2 = $ndkVersionLatest
-$ndkChecksumNightly2 = $ndkChecksumLatest
-$ndkCachedUrlNightly2 = "\\ci-files01-hki.ci.qt.io\provisioning\android\android-ndk-$ndkVersionNightly2-windows.zip"
-$ndkOfficialUrlNightly2 = "https://dl.google.com/android/repository/android-ndk-$ndkVersionNightly2-windows.zip"
+$ndkCachedUrlDefault = "\\ci-files01-hki.ci.qt.io\provisioning\android\android-ndk-$ndkVersionDefault-windows.zip"
+$ndkOfficialUrlDefault = "https://dl.google.com/android/repository/android-ndk-$ndkVersionDefault-windows.zip"
+$ndkZip = "C:\Windows\Temp\android_ndk.zip"
 
 # SDK
 $toolsVersion = "2.1"
@@ -42,8 +32,6 @@ $toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
 $cmdFolder = "c:\Utils\Android\cmdline-tools"
 
 $sdkZip = "c:\Windows\Temp\$toolsFile"
-New-Item -ItemType Directory -Path C:\Utils\Android\
-New-Item -ItemType Directory -Path C:\Windows\Temp\android_extract
 
 function Install($1, $2, $3, $4) {
     $cacheUrl = $1
@@ -62,24 +50,21 @@ function Install($1, $2, $3, $4) {
     return "C:\Utils\Android\$baseDirectory"
 }
 
-Write-Host "Installing Android NDK $nkdVersionLatest"
-$ndkFolderLatest = Install $ndkCachedUrlLatest $ndkZip $ndkChecksumLatest $ndkOfficialUrlLatest
-Set-EnvironmentVariable "ANDROID_NDK_ROOT_LATEST" $ndkFolderLatest
+New-Item -ItemType Directory -Path C:\Utils\Android\
+New-Item -ItemType Directory -Path C:\Windows\Temp\android_extract
+Write-Host "Installing Android NDK $ndkVersionDefault"
+$ndkFolderDefault = Install $ndkCachedUrlDefault $ndkZip $ndkChecksumDefault $ndkOfficialUrlDefault
+Set-EnvironmentVariable "ANDROID_NDK_ROOT_DEFAULT" $ndkFolderDefault
 # To be used by vcpkg
-Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolderLatest
+Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolderDefault
+$env:ANDROID_NDK_HOME = "$ndkFolderDefault"
 
-if ($ndkVersionNightly1 -ne $ndkVersionLatest) {
-    Write-Host "Installing Android NDK $ndkVersionNightly1"
-    $ndkFolderNightly = Install $ndkCachedUrlNightly1 $ndkZip $ndkChecksumNightly1 $ndkOfficialUrlNightly1
-    Set-EnvironmentVariable "ANDROID_NDK_ROOT_NIGHTLY1" $ndkFolderNightly
-    Write-Output "Android NDK = $ndkVersionNightly1" >> ~/versions.txt
-}
-
-if ($ndkVersionNightly2 -ne $ndkVersionLatest) {
-    Write-Host "Installing Android NDK $ndkVersionNightly2"
-    $ndkFolderNightly = Install $ndkCachedUrlNightly2 $ndkZip $ndkChecksumNightly2 $ndkOfficialUrlNightly2
-    Set-EnvironmentVariable "ANDROID_NDK_ROOT_NIGHTLY2" $ndkFolderNightly
-    Write-Output "Android NDK = $ndkVersionNightly2" >> ~/versions.txt
+if ($ndkVersionDefault -eq $ndkVersionLatest) {
+    Write-Host "Android Latest version is the same than Default. NDK installation done."
+} else {
+    Write-Host "Installing Android NDK $nkdVersionLatest"
+    $ndkFolderLatest = Install $ndkCachedUrlLatest $ndkZip $ndkChecksumLatest $ndkOfficialUrlLatest
+    Set-EnvironmentVariable "ANDROID_NDK_ROOT_LATEST" $ndkFolderLatest
 }
 
 $toolsFolder = Install $toolsCachedUrl $sdkZip $toolsChecksum $toolsOfficialUrl
@@ -118,4 +103,4 @@ cmd /c "dir C:\Utils\android"
 Write-Output "Android SDK tools= $toolsVersion" >> ~/versions.txt
 Write-Output "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
 Write-Output "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt
-Write-Output "Android NDK = $ndkVersionLatest" >> ~/versions.txt
+Write-Output "Android NDK = $ndkVersionDefault" >> ~/versions.txt

coin/provisioning/common/windows/emsdk.ps1

@@ -5,11 +5,11 @@
 
 # This script will install emscripten needed by WebAssembly
 
-$version = "4.0.7"
+$version = "3.1.70"
 $zipVersion = $version -replace '\.', "_"
 $temp = "$env:tmp"
 $cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_${zipVersion}.zip"
-$sha = "d433b8353df4a75ba035fc618f520790b4fb7ee2"
+$sha = "4d05e378575cb3d74e2740b121730ba1f5822f27"
 
 # Python used for '.\emsdk install'
 $pythonPath = [System.Environment]::GetEnvironmentVariable("PYTHON3_PATH", "Machine")