Update submodules on '6.12 in qt/qt5'

Change-Id: I60f6ddfec5cf90caf152e165def378126ea559c7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2026-08-24 11:25:30 +08:00 · 2026-08-18 08:17:03 +00:00 · 2026-08-13 21:00:01 +00:00 · 2026-08-12 05:29:24 +00:00 · 2026-08-07 11:51:18 +00:00 · 2026-08-07 11:51:05 +00:00
826 changed files with 1787 additions and 2490 deletions
@@ -1,46 +1,46 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = dev
+	branch = 6.12
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = dev
+	branch = 6.12
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = dev
+	branch = 6.12
 	status = essential
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = dev
+	branch = 6.12
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -48,7 +48,7 @@
 	recommends = qtmultimedia qtshadertools qttasktree qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = dev
+	branch = 6.12
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -61,7 +61,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = dev
+	branch = 6.12
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -69,82 +69,82 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = dev
+	branch = 6.12
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtconnectivity"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
+	branch = 6.12
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = dev
+	branch = 6.12
 	status = addon
 	priority = 10
 [submodule "qtwebview"]
@@ -152,160 +152,160 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = dev
+	branch = 6.12
 	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = dev
+	branch = 6.12
 	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative qtquicktimeline
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = dev
+	branch = 6.12
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = dev
+	branch = 6.12
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = dev
+	branch = 6.12
 	status = addon
 [submodule "qttasktree"]
 	depends = qtbase
 	path = qttasktree
 	url = ../qttasktree.git
-	branch = dev
+	branch = 6.12
 	status = preview
 [submodule "qtopenapi"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtopenapi
 	url = ../qtopenapi.git
-	branch = dev
+	branch = 6.12
 	status = preview
 [submodule "qtcanvaspainter"]
 	depends = qtbase qtdeclarative qtshadertools
 	path = qtcanvaspainter
 	url = ../qtcanvaspainter.git
-	branch = dev
-	status = preview
+	branch = 6.12
+	status = addon
@@ -324,7 +324,7 @@ function(qt_ir_get_already_initialized_submodules prefix
    )

    qt_ir_parse_git_config_file_contents("${prefix}"
-        READ_GIT_CONFIG
+        READ_GIT_CONFIG_LOCAL
        PARENT_REPO_BASE_GIT_PATH "${parent_repo_base_git_path}"
        WORKING_DIRECTORY "${working_directory}"
    )
@@ -142,6 +142,7 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
        qt_ir_get_top_level_submodules(include_submodules exclude_submodules)
        if(NOT include_submodules AND arg_ALREADY_INITIALIZED)
            string(REPLACE "," ";" include_submodules "${submodules}")
+            list(FILTER include_submodules EXCLUDE REGEX "^$")
        endif()

        # qtrepotools is always implicitly cloned, but it doesn't actually
@@ -60,7 +60,7 @@ endfunction()
 # Populates $out_module_list with all subdirectories that have a CMakeLists.txt file
 function(qt_internal_find_modules out_module_list)
    set(module_list "")
-    file(GLOB directories LIST_DIRECTORIES true RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *)
+    file(GLOB directories LIST_DIRECTORIES true RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" qt* tqtc-*)
    foreach(directory IN LISTS directories)
        if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${directory}"
           AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${directory}/CMakeLists.txt")
@@ -1386,7 +1386,7 @@ function(qt_internal_foreach_repo_run)

    set(color_supported FALSE)
    set(output_goes_where "")
-    if(NOT tty_exit_CODE AND tty_name)
+    if(NOT tty_exit_code AND tty_name)
        set(color_supported TRUE)
        set(output_goes_where "OUTPUT_FILE" "${tty_name}")
    endif()
@@ -16,6 +16,13 @@ instructions:
    variableName: CONFIGURE_ENV_PREFIX
    variableValue: "{{.Env.ENV_PREFIX}}"

+    # Re-fetch the qlitehtml repository in the Coin git mirror, otherwise the
+    # RunCMake.InitRepository test might fail trying to checkout a newer sha1 than what is
+    # available in the Coin git mirror.
+  - type: UpdateRepo
+    gitRemote: code.qt.io
+    repos: [playground/qlitehtml.git]
+
  - type: ExecuteCommand
    command: "{{.Env.CONFIGURE_ENV_PREFIX}} cmake {{.SourceDir}}/tests/manual/RunCMake"
    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
@@ -1,8 +1,8 @@
 Version: 2
 Configurations:
 -
-    Id: 'opensuse-15.6-host-asan'
-    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
+    Id: 'opensuse-16.0-host-asan'
+    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer']
    Configure arguments: '-nomake examples -developer-build'
@@ -3,6 +3,7 @@ Include: [
    cmake_platforms_qemu.yaml,
    cmake_platforms_qemu_qnx.yaml,
    cmake_platforms_target_android.yaml,
+    cmake_platforms_target_harmonyos.yaml,
    cmake_platforms_wasm.yaml,
    macos.yaml
    ]
@@ -58,11 +59,11 @@ Configurations:
    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
    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'
+    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -no-feature-liburing -bundled-xcb-xinput -qpa offscreen\;xcb'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
        'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DINPUT_tiff=qt -DINPUT_webp=qt',
        'VCPKG_HOST_TRIPLET=arm64-linux-qt',
        'VCPKG_TARGET_TRIPLET=arm64-linux-qt',
    ]
@@ -130,24 +131,11 @@ Configurations:
    Compiler: 'GCC'
    Features: ['Sccache', 'TestOnly']
    Platform dependency: 'ubuntu-24.04-x64'
-
-    Id: 'opensuse-15.6-developer-build'
-    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-nomake examples -developer-build'
-    Environment variables: [
-        'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'VCPKG_HOST_TRIPLET=x64-linux-qt',
-        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
-    ]
 -
    Id: 'opensuse-16.0-developer-build'
    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
    Compiler: 'GCC'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
    Configure arguments: '-nomake examples -developer-build'
    Environment variables: [
        'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
@@ -185,7 +173,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24H2-msvc2022'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'Packaging', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -227,6 +215,26 @@ Configurations:
        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
    ]
+-
+    Id: 'windows-11_24H2-msvc2026-arm64ec'
+    Template: 'qtci-windows-11_24H2-x86_64-72'
+    Compiler: 'MSVC2026'
+    Target arch: 'arm64'
+    Features: ['Sccache', 'ARM64EC', 'TargetBuildOnly', 'DoNotRunTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Platform dependency: 'windows-11_24H2-msvc2026'
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64ec-msvc -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
+        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_FEATURE_qdoc=OFF -DFEATURE_qtwebengine_build=OFF -DFEATURE_qtpdf_build=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
+        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
+    ]
+-
+    Id: 'windows-11_24H2-msvc2026-arm64ec-tests'
+    Template: 'qtci-windows-11_23H2-aarch64-54'
+    Compiler: 'MSVC2026'
+    Features: ['TestOnly', 'InsignificantTests']
+    Configure arguments: '-cross-compiled'
+    Platform dependency: 'windows-11_24H2-msvc2026-arm64ec'
 -
    Id: 'windows-11_23h2-arm64-msvc2022'
    Template: 'qtci-windows-11_23H2-aarch64-53'
@@ -245,7 +253,7 @@ Configurations:
    Id: 'windows-11_23h2-arm64-msvc2026'
    Template: 'qtci-windows-11_23H2-aarch64-54'
    Compiler: 'MSVC2026'
-    Features: ['Sccache', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Features: ['Sccache', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
@@ -257,7 +265,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24H2-msvc2022-arm64'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Target arch: 'arm64'
    Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
@@ -298,22 +306,31 @@ Configurations:
        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
    ]
 -
-    Id: 'windows-11-x86_64-arm64-tests'
+    Id: 'windows-11-x86_64-arm64-native-tests'
    Template: 'qtci-windows-11_23H2-aarch64-53'
    Compiler: 'MSVC2022'
-    Features: ['TestOnly']
+    Features: ['TestOnly', 'BuildTestsInTest', 'UseToolchainFromTargetDir']
    Configure arguments: '-cross-compiled'
    Platform dependency: 'windows-11_24H2-msvc2022-arm64'
+    Environment variables: [
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
+        'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
+        'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
+        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
+        'VCPKG_HOST_TRIPLET=arm64-windows-qt',
+        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
+    ]
 -
-    Id: 'windows-11-x86_64-msvc2026-arm64-tests'
+    Id: 'windows-11-x86_64-arm64-tests-msvc2026'
    Template: 'qtci-windows-11_23H2-aarch64-54'
    Compiler: 'MSVC2026'
-    Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Features: ['TestOnly']
    Configure arguments: '-cross-compiled'
    Platform dependency: 'windows-11_24H2-msvc2026-arm64'
 -
    Id: 'windows-11_24H2-msvc2022-developer-build'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    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'
@@ -330,10 +347,10 @@ Configurations:
    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Compiler: 'GCC'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
-    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -no-feature-liburing -bundled-xcb-xinput'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DINPUT_tiff=qt -DINPUT_webp=qt',
        'VCPKG_HOST_TRIPLET=x64-linux-qt',
        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
    ]
@@ -350,7 +367,7 @@ Configurations:
        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
    ]
 -
-    Id: 'ios-universal'
+    Id: 'ios-device'
    Template: 'qtci-macos-26-arm-105'
    Target os: 'IOS_ANY'
    Target arch: 'arm64'
@@ -359,7 +376,35 @@ Configurations:
    Platform dependency: 'macos-universal-on-arm64'
    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
+        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang -sdk iphoneos',
+        '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: 'ios-arm64-simulator'
+    Template: 'qtci-macos-26-arm-105'
+    Target os: 'IOS_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-universal-on-arm64'
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM', 'VerifySBOM']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang -sdk iphonesimulator',
+        'TARGET_CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="arm64"',
+        '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: 'ios-x86_64-simulator'
+    Template: 'qtci-macos-26-arm-105'
+    Target os: 'IOS_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-universal-on-arm64'
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM', 'VerifySBOM']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang -sdk iphonesimulator',
+        'TARGET_CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64"',
        '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',
    ]
 -
@@ -376,7 +421,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24h2-mingw13'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'Mingw'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
@@ -389,7 +434,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24H2-llvm'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'Clang'
    Features: ['Sccache', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
@@ -402,7 +447,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24H2-mingw13-developer-build'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'Mingw'
    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
    Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
@@ -419,7 +464,7 @@ Configurations:
    Compiler: 'GCC'
    Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
    Environment variables: [
-        'DEBIAN_RULES_REF=6.11_dev',
+        'DEBIAN_RULES_REF=6.12_dev',
        'COIN_TARGET_DIST=tqtc-jammy',
        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
        'COIN_SBUILD_CHROOT=jammy-arm64-sbuild',
@@ -432,7 +477,7 @@ Configurations:
    Compiler: 'GCC'
    Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
    Environment variables: [
-        'DEBIAN_RULES_REF=6.11_dev',
+        'DEBIAN_RULES_REF=6.12_dev',
        'COIN_TARGET_DIST=tqtc-jammy',
        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
        'COIN_SBUILD_CHROOT=jammy-amd64-sbuild',
@@ -445,7 +490,7 @@ Configurations:
    Compiler: 'GCC'
    Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
    Environment variables: [
-        'DEBIAN_RULES_REF=6.11_gles',
+        'DEBIAN_RULES_REF=6.12_gles',
        'COIN_TARGET_DIST=tqtc-bookworm',
        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
        'COIN_SBUILD_CHROOT=bookworm-arm64-sbuild',
@@ -12,7 +12,7 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin",
+        "QT_CMAKE_DIR=/opt/cmake-4.3.2/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
@@ -31,7 +31,7 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin",
+        "QT_CMAKE_DIR=/opt/cmake-4.3.2/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
@@ -50,7 +50,7 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin",
+        "QT_CMAKE_DIR=/opt/cmake-4.3.2/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
@@ -12,8 +12,8 @@ Configurations:
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin',
-        'QNX_TEST_ENV=TMPDIR=/data/var/tmp LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
+        'QT_CMAKE_DIR=/opt/cmake-4.3.2/bin',
+        'QNX_TEST_ENV=TMPDIR=/data/var/tmp HOME=/data/home/root FONTCONFIG_FILE=/data/var/etc/fontconfig/fonts.conf LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_SYSTEM_VERSION=710 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'QNX_QEMU={{.Env.QNX_710_QEMU}}',
        'VCPKG_HOST_TRIPLET=x64-linux-qt',
@@ -63,8 +63,8 @@ Configurations:
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_800}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin',
-        'QNX_TEST_ENV=TMPDIR=/data/var/tmp LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
+        'QT_CMAKE_DIR=/opt/cmake-4.3.2/bin',
+        'QNX_TEST_ENV=TMPDIR=/data/var/tmp HOME=/data/home/root FONTCONFIG_FILE=/data/var/etc/fontconfig/fonts.conf LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_SYSTEM_VERSION=802 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'QNX_QEMU={{.Env.QNX_800_QEMU}}',
        'VCPKG_HOST_TRIPLET=x64-linux-qt',
@@ -10,7 +10,7 @@ Configurations:
    Platform dependency: 'ubuntu-22.04'
    Features: ['VMSize8', 'UseConfigure', 'DoNotRunTests', 'DoNotUploadTests']
    Environment variables: [
-        'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_2_VSB',
+        'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_3_VSB',
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -qpa offscreen -nomake examples',
        'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target',
        'VCPKG_HOST_TRIPLET=x64-linux-qt',
@@ -26,8 +26,8 @@ Configurations:
    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',
+        'WIND_CC_SYSROOT=/opt/nxp_imx8_1_0_7_1_VSB',
+        'TARGET_CONFIGURE_ARGS=-release -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'
    ]
 -
@@ -8,10 +8,10 @@ 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',
+        'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_3_VSB',
+        'VXWORKS_TEST_LIBS_PATH=/opt/fsl_imx6_2_0_6_3_VSB/usr/lib/common;/opt/fsl_imx6_2_0_6_3_VSB/usr/root/llvm/bin;/opt/fsl_imx6_2_0_6_3_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib',
        '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',
        'VCPKG_HOST_TRIPLET=x64-linux-qt',
@@ -25,7 +25,7 @@ Configurations:
    Compiler: 'Clang'
    Target compiler: 'Clang'
    Platform dependency: 'vxworks-x86_64-buildtest'
-    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly']
+    Features: ['VMSize16', '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',
@@ -3,7 +3,7 @@ Configurations:

 -
    Id: 'windows-11_24H2-msvc2022-minimal-static-test'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'Packaging', 'UseConfigure', 'MinimalStaticTests']
    Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++20 -no-feature-sql-psql'
@@ -13,7 +13,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24H2-minimal-static'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    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'
@@ -27,7 +27,20 @@ Configurations:
    ]
 -
    Id: 'macos-minimal-static'
-    Template: 'qtci-macos-15-arm-105'
+    Template: 'qtci-macos-26-arm-105'
    Compiler: 'Clang'
    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
    Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework'
+
+-
+    Id: "ios-minimal-static"
+    Template: 'qtci-macos-26-arm-105'
+    Target os: 'IOS_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-universal-on-arm64'
+    Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'
+    ]
@@ -17,7 +17,7 @@ Configurations:
    ]
 -
    Id: 'android-armv7-on-windows'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Target os: 'Android_ANY'
    Target arch: 'armv7'
    Compiler: 'Mingw'
@@ -1,7 +1,7 @@
 Version: 2
 Configurations:
 -
-    Id: 'harmonyos-20-arm64-on-ubuntu-24.04-x64'
+    Id: 'harmonyos-23-arm64-on-linux'
    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
    Target os: 'HarmonyOS_ANY'
    Target arch: 'arm64'
@@ -11,12 +11,13 @@ Configurations:
    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'Packaging', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -nomake examples -no-dbus -no-use-gold-linker -no-pch -openssl-runtime',
-        'TARGET_CMAKE_ARGS=-DOHOS_SDK_ROOT={{.Env.HARMONYOS_SDK_ROOT}} -DOHOS_ABI=arm64-v8a -DWARNINGS_ARE_ERRORS=OFF -DQT_QMAKE_TARGET_MKSPEC=ohos-clang -DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
+        'TARGET_CMAKE_ARGS=-DOHOS_SDK_ROOT={{.Env.HARMONYOS_SDK_ROOT}} -DOHOS_ARCH=arm64-v8a -DWARNINGS_ARE_ERRORS=OFF -DQT_QMAKE_TARGET_MKSPEC=ohos-clang -DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
-        'COMMON_TARGET_TEST_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}'
+        'COMMON_TARGET_TEST_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
+        'QT_HARMONYOS_HVIGOR=/opt/harmonyos/command-line-tools/bin/hvigorw'
    ]
 -
-    Id: 'harmonyos-20-arm64-on-ubuntu-24.04-x64-developer-build'
+    Id: 'harmonyos-23-arm64-on-linux-developer-build'
    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
    Target os: 'HarmonyOS_ANY'
    Target arch: 'arm64'
@@ -25,8 +26,9 @@ Configurations:
    Platform dependency: 'ubuntu-24.04-x64-developer-build'
    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'StandaloneExamples']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-developer-build -debug -no-dbus -no-use-gold-linker -no-pch -openssl-runtime',
-        'TARGET_CMAKE_ARGS=-DOHOS_SDK_ROOT={{.Env.HARMONYOS_SDK_ROOT}} -DOHOS_ABI=arm64-v8a -DWARNINGS_ARE_ERRORS=OFF -DQT_QMAKE_TARGET_MKSPEC=ohos-clang -DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
+        'TARGET_CONFIGURE_ARGS=-developer-build -debug -make examples -no-dbus -no-use-gold-linker -no-pch -openssl-runtime',
+        'TARGET_CMAKE_ARGS=-DOHOS_SDK_ROOT={{.Env.HARMONYOS_SDK_ROOT}} -DOHOS_ARCH=arm64-v8a -DWARNINGS_ARE_ERRORS=OFF -DQT_QMAKE_TARGET_MKSPEC=ohos-clang -DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
-        'COMMON_TARGET_TEST_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}'
+        'COMMON_TARGET_TEST_CMAKE_ARGS=-DCMAKE_FIND_ROOT_PATH={{.Env.VCPKG_OHOS_INSTALLED}}',
+        'QT_HARMONYOS_HVIGOR=/opt/harmonyos/command-line-tools/bin/hvigorw'
    ]
@@ -2,19 +2,6 @@ Version: 2
 Configurations:
 -
    Id: 'webassembly-linux-thread-asyncify'
-    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Platform dependency: 'opensuse-15.6-developer-build'
-    Features: ['DoNotRunTests', 'UseConfigure']
-    Environment variables: [
-        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        "TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \
-         -feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\"",
-        'HEADLESS_CHROME_FOR_TESTING=true'
-    ]
-
-    Id: 'webassembly-linux-thread-asyncify-new'
    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
    Target os: 'WebAssembly'
    Compiler: 'GCC'
@@ -28,7 +15,7 @@ Configurations:
    ]
 -
    Id: 'webassembly-windows'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Target os: 'WebAssembly'
    Compiler: 'Mingw'
    Target compiler: 'Clang'
@@ -43,10 +30,10 @@ Configurations:
    ]
 -
    Id: 'webassembly-linux-thread'
-    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
+    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
    Target os: 'WebAssembly'
    Compiler: 'GCC'
-    Platform dependency: 'opensuse-15.6-developer-build'
+    Platform dependency: 'opensuse-16.0-developer-build'
    Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
@@ -54,34 +41,8 @@ Configurations:
        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
    ]
-
-    Id: 'webassembly-linux-thread-new'
-    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Platform dependency: 'opensuse-16.0-developer-build'
-    Features: ['DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
-    ]
 -
    Id: 'webassembly-linux-shared'
-    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Platform dependency: 'opensuse-15.6-developer-build'
-    Features: ['DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Environment variables: [
-        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -no-feature-thread -nomake tests -nomake examples -shared',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
-    ]
-
-    Id: 'webassembly-linux-shared-new'
    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
    Target os: 'WebAssembly'
    Compiler: 'GCC'
@@ -1,14 +0,0 @@
-Version: 2
-Configurations:
-
-    Id: "ios-tests-on-macos"
-    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', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'
-    ]
@@ -9,7 +9,7 @@ Configurations:

    -
        Id: 'macos-universal-on-arm64'
-        Template: 'qtci-macos-15-arm-105'
+        Template: 'qtci-macos-26-arm-105'
        Compiler: 'Clang'
        Target arch: 'x86_64-arm64'
        Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
@@ -41,9 +41,8 @@ Configurations:
        Id: 'macos-26-x86_64-tests'
        Template: 'qtci-macos-26-x86_64-103'
        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging', 'DoNotAbortTestingOnFirstFailure']
+        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-universal-on-arm64'
-        Environment variables: [ 'COIN_CTEST_IGNORE_EXIT_CODE=1' ]

    # And arm64

@@ -81,6 +80,7 @@ Configurations:
        Environment variables: [
            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
+            'QTBASE_EXAMPLES_CMAKE_ARGS=-DQT_BUILD_EXAMPLES_AS_EXTERNAL=ON',
        ]
    -
        Id: 'macos-arm64-developer-build'
@@ -126,4 +126,3 @@ Configurations:
        Compiler: 'Clang'
        Features: ['TestOnly']
        Platform dependency: 'macos-26-arm64-developer-build'
-        Environment variables: [ 'COIN_CTEST_IGNORE_EXIT_CODE=1' ]
@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
    Id: 'windows-11_24H2-msvc2022-developer-build-cxx23'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    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++23'
@@ -0,0 +1,15 @@
+Version: 2
+Module only: True
+Include: [
+  cmake_platforms.yaml: [
+    "ubuntu-24.04-x64-developer-build"
+  ],
+  cmake_platforms_target_harmonyos.yaml: [
+    "harmonyos-23-arm64-on-linux-developer-build"
+  ]
+]
+Configurations: []
+Overrides:
+-
+    Id: 'harmonyos-23-arm64-on-linux-developer-build'
+    -Features: ['DoNotRunTests']
@@ -0,0 +1,15 @@
+Version: 2
+Module only: True
+Include: [
+  cmake_platforms.yaml: [
+    "ubuntu-24.04-x64"
+  ],
+  cmake_platforms_target_harmonyos.yaml: [
+    "harmonyos-23-arm64-on-linux"
+  ]
+]
+Configurations: []
+Overrides:
+-
+    Id: 'harmonyos-23-arm64-on-linux'
+    -Features: ['DoNotRunTests']
@@ -0,0 +1,14 @@
+Version: 2
+Module only: True
+Include: [
+  cmake_platforms.yaml: [
+    'ubuntu-22.04'
+  ]
+]
+Configurations:
+-
+    Id: 'ubuntu-22.04-Axivion'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['UseConfigure', 'VMSize16', 'RunAsPlatformDependency', 'PysideAxivion']
+    Platform dependency: 'ubuntu-22.04'
@@ -7,7 +7,7 @@ Include: [
 Configurations:
 -
    Id: 'qnx-710-arm64-on-windows'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Target os: 'QNX_710'
    Target arch: 'arm64'
    Compiler: 'Mingw'
@@ -2,11 +2,14 @@ Version: 2
 Module only: True
 Include: [
  cmake_platforms.yaml: [
-    "ubuntu-22.04"
+    '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-51'
+    Compiler: 'GCC'
+    Features: ['UseConfigure', 'VMSize16', 'TestOnly']
+    Environment variables: ['AXIVION_ANALYSIS=1']
+    Platform dependency: 'ubuntu-22.04'
@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
    Id: 'windows-11_24H2-msvc2022-unity-build'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests'] # note: we cannot build debug builds due to our llvm binaries
    Configure arguments: '-force-debug-info -nomake examples -qt-zlib' # disabled example builds: qmake builds fail with C1041
@@ -7,7 +7,7 @@ Include: [
    "ubuntu-22.04-developer-build-x11-tests",
    "ubuntu-24.04-x64",
    "windows-11_24H2-msvc2022-developer-build",
-    "ios-universal",
+    "ios-device",
    "documentation-warnings",
  ],
  macos.yaml: [
@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    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_24H2-x86_64-73'
    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_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
    Configure arguments: ''
@@ -1,10 +1,8 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
-    cmake_platforms_target_harmonyos.yaml,
    cmake_platforms_static_tests.yaml,
    integrity.yaml,
-    ios-tests.yaml,
    address_sanitizer_platforms.yaml,
    linux_android_tests_multi_abi.yaml,
    wasm_qtbase_tests.yaml,
@@ -7,7 +7,7 @@ Include: [
 Configurations:
 -
    Id: 'windows-quick-bridges-csharp'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Platform dependency: 'windows-quick-bridges'
    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesCsharp']
@@ -10,7 +10,7 @@ Include: [
 Configurations:
 -
    Id: 'windows-quick-bridges-java'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Platform dependency: 'windows-quick-bridges'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesJava']
@@ -11,7 +11,7 @@ Include: [
 Configurations:
 -
    Id: 'windows-quick-bridges-python'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Platform dependency: 'windows-quick-bridges'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
@@ -9,7 +9,7 @@ Include: [
 Configurations:
 -
    Id: 'windows-quick-bridges-rust'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Platform dependency: 'windows-quick-bridges'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesRust']
@@ -9,7 +9,7 @@ Include: [
 Configurations:
 -
    Id: 'windows-quick-bridges-swift'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Platform dependency: 'windows-quick-bridges'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesSwift']
@@ -12,21 +12,21 @@ Include: [
 Configurations:
 -
    Id: 'windows-quick-bridges-rust'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Platform dependency: 'windows-quick-bridges'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesRust']

 -
    Id: 'windows-quick-bridges-python'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Platform dependency: 'windows-quick-bridges'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']

 -
    Id: 'windows-quick-bridges-java'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Platform dependency: 'windows-quick-bridges'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesJava']
@@ -2,7 +2,6 @@ Version: 2
 Include: [
    cmake_platforms.yaml,
    integrity.yaml,
-    ios-tests.yaml,
    address_sanitizer_platforms.yaml,
    wasm_qtdeclarative_tests.yaml,
    cmake_platforms_static_tests.yaml,
@@ -13,6 +13,6 @@ Configurations:
    Features: ['TestOnly']
 -
    Id: 'qtgp-on-windows-24h2'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['TestOnly']
@@ -7,7 +7,6 @@ Include: [
    "ubuntu-22.04",
    "ubuntu-22.04-developer-build",
    "ubuntu-24.04-arm64",
-    "opensuse-15.6-developer-build",
    "opensuse-16.0-developer-build",
    "sles-15_sp6-static",
    "windows-10_22h2-msvc2022",
@@ -46,7 +45,7 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-release -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd -qtlibinfix TestInfix',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin",
+        "QT_CMAKE_DIR=/opt/cmake-4.3.2/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
@@ -9,7 +9,6 @@ Include: [
    "ubuntu-22.04",
    "ubuntu-22.04-developer-build",
    "ubuntu-24.04-arm64",
-    "opensuse-15.6-developer-build",
    "opensuse-16.0-developer-build",
    "sles-15_sp6-static",
    "windows-10_22h2-msvc2022",
@@ -46,7 +46,7 @@ Configurations:
    ]
 -
    Id: 'windows-quick-bridges'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'Insignificant']
    Configure arguments: >
@@ -4,7 +4,6 @@ Include: [
     "macos-universal-on-arm64",
  ],
  cmake_platforms.yaml: [
-    "opensuse-15.6-developer-build",
    "opensuse-16.0-developer-build",
  ]
 ]
@@ -293,7 +292,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24H2-msvc2022-static-quicklite'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'UseConfigure', 'DisableTests', 'Insignificant']
    Configure arguments: >
@@ -562,141 +561,6 @@ Configurations:
    ]
 -
    Id: 'wasm-quick-minimal'
-    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Platform dependency: 'opensuse-15.6-developer-build'
-    Features: ['Sccache', 'UseConfigure', 'DisableTests', 'Insignificant']
-    Environment variables: [
-        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CMAKE_ARGS=
-          -DCMAKE_CXX_FLAGS="-flto"
-          -DCMAKE_EXE_LINKER_FLAGS="-flto"',
-        'TARGET_CONFIGURE_ARGS=
-          -release
-          -platform wasm-emscripten
-          -nomake examples
-          -nomake tests
-          -feature-thread
-          -optimize-size
-          -static
-          -ltcg
-          -feature-c++20
-          -disable-deprecated-up-to 0x070000
-          -no-feature-sql
-          -no-feature-xml
-          -no-feature-printsupport
-          -no-feature-dbus
-          -no-feature-vnc
-          -no-feature-future
-          -no-feature-concurrent
-          -no-feature-process
-          -no-feature-processenvironment
-          -no-feature-multiprocess
-          -no-feature-sharedmemory
-          -no-feature-permissions
-          -no-feature-udpsocket
-          -no-feature-localserver
-          -no-feature-picture
-          -no-feature-pdf
-          -no-feature-accessibility
-          -no-feature-clipboard
-          -no-feature-draganddrop
-          -no-feature-image_heuristic_mask
-          -no-feature-imageformat_bmp
-          -no-feature-imageformat_ppm
-          -no-feature-imageformat_xbm
-          -no-feature-cssparser
-          -no-feature-action
-          -no-feature-whatsthis
-          -no-feature-vkgen
-          -no-feature-backtrace
-          -no-feature-stack_clash_protection
-          -no-feature-mimetype
-          -no-feature-textmarkdownreader
-          -no-feature-textodfwriter
-          -no-feature-testlib
-          -no-feature-texthtmlparser
-          -no-feature-textmarkdownwriter
-          -no-feature-imageio-text-loading
-          -no-feature-image_text
-          -no-feature-proxymodel
-          -no-feature-filesystemmodel
-          -no-feature-wheelevent
-          -no-feature-tabletevent
-          -no-feature-icu
-          -no-feature-systemtrayicon
-          -no-feature-raster-64bit
-          -no-feature-raster-fp
-          -no-feature-undostack
-          -no-feature-undogroup
-          -no-feature-undocommand
-          -no-feature-sctp
-          -no-feature-dtls
-          -no-feature-networkproxy
-          -no-feature-getifaddrs
-          -no-feature-ipv6ifname
-          -no-feature-libresolv
-          -no-feature-libproxy
-          -no-feature-networkinterface
-          -no-feature-networkdiskcache
-          -no-feature-topleveldomain
-          -no-feature-gssapi
-          -no-feature-sha3-fast
-          -no-feature-systemsemaphore
-          -no-feature-gestures
-          -no-feature-jalalicalendar
-          -no-feature-hijricalendar
-          -no-feature-islamiccivilcalendar
-          -no-feature-timezone
-          -no-feature-timezone_tzdb
-          -no-feature-im
-          -no-feature-graphicsframecapture
-          -no-feature-library
-          -no-feature-filesystemwatcher
-          -no-feature-gif
-          -no-feature-ico
-          -no-feature-sessionmanager
-          -no-feature-emojisegmenter
-          -no-feature-egl
-          -no-feature-metal
-          -no-feature-vulkan
-          -no-feature-openvg
-          -no-feature-wasm-simd128
-          -no-feature-wasm-exceptions
-          -no-feature-wasm-jspi
-          -no-feature-harfbuzz',
-        'NON_QTBASE_CMAKE_ARGS=
-          -DFEATURE_qml_network=off
-          -DFEATURE_qml_ssl=off
-          -DFEATURE_qml_jit=off
-          -DFEATURE_qml_debug=off
-          -DFEATURE_qml_preview=off
-          -DFEATURE_qml_xml_http_request=off
-          -DFEATURE_qml_locale=off
-          -DFEATURE_qml_worker_script=off
-          -DFEATURE_qml_xmllistmodel=off
-          -DFEATURE_quick_canvas=off
-          -DFEATURE_quick_designer=off
-          -DFEATURE_quick_flipable=off
-          -DFEATURE_quick_gridview=off
-          -DFEATURE_quick_tableview=off
-          -DFEATURE_quick_treeview=off
-          -DFEATURE_quick_particles=off
-          -DFEATURE_quick_pathview=off
-          -DFEATURE_quick_sprite=off
-          -DFEATURE_quick_draganddrop=off
-          -DFEATURE_quick_pixmap_cache_threaded_download=off
-          -DFEATURE_qml_table_model=off
-          -DFEATURE_qml_tree_model=off
-          -DFEATURE_quicktemplates2_hover=off
-          -DFEATURE_quicktemplates2_multitouch=off
-          -DFEATURE_quicktemplates2_calendar=off
-          -DFEATURE_qdoc=off',
-        'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
-    ]
-
-    Id: 'wasm-quick-minimal-new'
    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
    Target os: 'WebAssembly'
    Compiler: 'GCC'
@@ -2,15 +2,8 @@ Version: 2
 Configurations:
 -
    Id: 'webassembly-linux-thread-asyncify-tests'
-    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly']
-    Platform dependency: 'webassembly-linux-thread-asyncify'
-
-    Id: 'webassembly-linux-thread-asyncify-tests-new'
    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
    Target os: 'WebAssembly'
    Compiler: 'GCC'
    Features: ['Sccache', 'TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
-    Platform dependency: 'webassembly-linux-thread-asyncify-new'
+    Platform dependency: 'webassembly-linux-thread-asyncify'
@@ -2,15 +2,8 @@ Version: 2
 Configurations:
 -
    Id: 'webassembly-linux-thread-asyncify-tests'
-    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly']
-    Platform dependency: 'webassembly-linux-thread-asyncify'
-
-    Id: 'webassembly-linux-thread-asyncify-tests-new'
    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
    Target os: 'WebAssembly'
    Compiler: 'GCC'
    Features: ['Sccache', 'TestOnly']
-    Platform dependency: 'webassembly-linux-thread-asyncify-new'
+    Platform dependency: 'webassembly-linux-thread-asyncify'
@@ -63,3 +63,9 @@ https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
    * Modify 'Windows Software Development Kit' from Add or remove programs
        - Add feature 'Debugging Tools for Windows'
 ############################################################
+
+Visual Studio 2026 and build tools were later updated to 17.14.33 in VS installer.
+This updated (Latest) MSVC components to:
+    - MSVC v14.44.35211.0
+    - Windows 11 SDK (10.0.26100.7705)
+.NET SDK was added
@@ -78,18 +78,25 @@ function InstallNdk() {
    ndkTargetFile="/tmp/$ndkFile"
    ndkSourceFile="$basePath/$ndkFile"

+    ndkTargetDir="$targetFolder/$ndkVersion"
+    sudo mkdir -p "$ndkTargetDir"
+
    DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
-    echo "Unzipping Android NDK to '$targetFolder'"
+    echo "Unzipping Android NDK to '$ndkTargetDir'"
    # Get the package base directory name as string
    zipBase=$(sudo zipinfo -1 "$ndkTargetFile" 2>/dev/null | awk '!seen {sub("/.*",""); print; seen=1}')
-    sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
+    sudo unzip -q "$ndkTargetFile" -d "$ndkTargetDir"
    rm "$ndkTargetFile"
-    androidNdkRoot="${targetFolder}/${zipBase}"
+    androidNdkRoot="${ndkTargetDir}/${zipBase}"
 }

 InstallNdk $ndkVersionLatest $ndkSha1Latest
 SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$androidNdkRoot"

+# To be used by vcpkg
+SetEnvVar "ANDROID_NDK_HOME" "$androidNdkRoot"
+export ANDROID_NDK_HOME="$androidNdkRoot"
+
 if [ "$ndkVersionPreview" != "$ndkVersionLatest" ]; then
    InstallNdk $ndkVersionPreview $ndkSha1Preview
    SetEnvVar "ANDROID_NDK_ROOT_PREVIEW" "$androidNdkRoot"
@@ -105,10 +112,6 @@ if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
    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"
-
 echo "Changing ownership of Android files."
 if uname -a |grep -q "el7"; then
    sudo chown -R qt:wheel "$targetFolder"
@@ -252,7 +252,7 @@
            "_active": true
        },
        "Qt-StrictIterators": {
-            "_active": true
+            "_active": false
        },
        "Qt-TemporaryIterator": {
            "_active": true
@@ -11,13 +11,26 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-majorminorversion="3.30"
-version="3.30.5"
-PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz"
-AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz"
-SHA1="61b339cac5f110d5ed2934f66a26c2e991945e01"
+majorminorversion="4.3"
+version="4.3.2"
+
+uname_m="$(uname -m)"
+case "$uname_m" in
+    x86_64|amd64)
+        SHA1="736c0722ed8393b3eb74fd573f6c9c245770206a"
+        arch="x86_64"
+        ;;
+    arm64|aarch64)
+        SHA1="a173eb910c808f561422feb45fe1fe57c3e346fa"
+        arch="aarch64"
+        ;;
+    *) fatal "Unknown architecture in uname: $uname_m" 43 ;;
+esac
+
+PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-linux-$arch.tar.gz"
+AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-$arch.tar.gz"
 targetFolder="/opt/cmake-$version"
-appPrefix="cmake-$version-linux-x86_64"
+appPrefix="cmake-$version-linux-$arch"

 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"

@@ -1,3 +1,4 @@
 diffutils
 make
+nasm
 yasm
@@ -1,4 +1,5 @@
 diffutils
 libva-devel
 make
+nasm
 yasm
@@ -1,3 +1,4 @@
 diffutils
 make
+nasm
 yasm
@@ -1,4 +1,5 @@
 diffutils
 libva-dev
 make
+nasm
 yasm
@@ -9,18 +9,105 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SourceEnvVars.sh
 source "${BASH_SOURCE%/*}/../unix/SourceEnvVars.sh"

-echo "Caching Gradle distribution and dependencies"
-gradleCacheFileName="gradle_9.3.1_linux_cache_v2.tar.gz"
-gradleCacheUrl="http://ci-files01-hki.ci.qt.io/input/gradle/$gradleCacheFileName"
-gradleCacheSha1="e88989d55f68e978442e567e4707a6093c829af6"
-gradleCacheFile="/tmp/$gradleCacheFileName"
-DownloadURL "$gradleCacheUrl" "$gradleCacheUrl" "$gradleCacheSha1" "$gradleCacheFile"
-mkdir -p "$HOME/.gradle"
-tar -xzf "$gradleCacheFile" -C "$HOME/.gradle" --strip-components=1
-rm "$gradleCacheFile"
+echo "Caching Gradle distributions and dependencies"

 gradle_project_source="${BASH_SOURCE%/*}/../shared/gradle/project"
-cp -r "$gradle_project_source" /tmp/gradle_project
-cd /tmp/gradle_project
-chmod +x gradlew
-sh gradlew build
+gradleDistributionMirror="http://ci-files01-hki.ci.qt.io/input/gradle"
+gradleInitScript="init.d/nexus-mirror.gradle"
+
+# Route every Gradle repository through the internal Nexus mirror.
+mkdir -p "$HOME/.gradle/init.d"
+cp "${BASH_SOURCE%/*}/../shared/gradle/$gradleInitScript" "$HOME/.gradle/$gradleInitScript"
+
+# Returns the hash of the Gradle binary distribution for a given Gradle version.
+# Gradle calculates the hash as base36(md5(distributionUrl)).
+gradleDistributionHash () {
+    version="$1"
+    propertiesFile="$gradle_project_source/gradle/wrapper/gradle-wrapper.properties"
+
+    # 1. Read the project's distributionUrl.
+    distributionUrl=$(grep '^distributionUrl=' "$propertiesFile")
+    distributionUrl=${distributionUrl#distributionUrl=}
+    # 2. Unescape the Java-properties (e.g. '\:').
+    distributionUrl=${distributionUrl//\\:/:}
+    # 3. Swap in the requested version while maintaining the distribution URL.
+    distributionUrl=${distributionUrl/gradle-[0-9.]*-bin.zip/gradle-$version-bin.zip}
+
+    if command -v md5sum >/dev/null 2>&1; then
+        md5Hex=$(printf '%s' "$distributionUrl" | md5sum | awk '{print $1}')
+    else
+        md5Hex=$(printf '%s' "$distributionUrl" | md5)
+    fi
+
+    # Convert the md5 to base36: read it as a number, then repeatedly take the
+    # next digit (number % 36) and divide by 36, prepending each digit's character.
+    number=$(printf 'ibase=16; %s\n' "$(printf '%s' "$md5Hex" | tr 'a-f' 'A-F')" | bc)
+    hash=""
+    alphabet="0123456789abcdefghijklmnopqrstuvwxyz"
+    while [ "$number" != "0" ]; do
+        digit=$(printf '%s %% 36\n' "$number" | bc)
+        number=$(printf '%s / 36\n' "$number" | bc)
+        hash="${alphabet:$digit:1}$hash"
+    done
+    printf '%s' "$hash"
+}
+
+# Seed a Gradle distribution binary into ~/.gradle from the internal mirror.
+seedGradleDistribution () {
+    version="$1"
+    sha="$2"
+
+    distributionDir="$HOME/.gradle/wrapper/dists/gradle-${version}-bin/$(gradleDistributionHash "$version")"
+    if [ -e "$distributionDir/gradle-${version}-bin.zip.ok" ]; then
+        return 0
+    fi
+    mkdir -p "$distributionDir"
+    zip="$distributionDir/gradle-${version}-bin.zip"
+    url="$gradleDistributionMirror/gradle-${version}-bin.zip"
+    DownloadURL "$url" "$url" "$sha" "$zip"
+    unzip -q -o "$zip" -d "$distributionDir"
+    rm -f "$zip"
+    touch "$distributionDir/gradle-${version}-bin.zip.ok"
+}
+
+# Populate ~/.gradle/caches by priming the shared project for each Gradle and AGP profile.
+cacheGradleProfile () {
+    echo "Caching Gradle profile $*"
+    tmp="$(mktemp -d)"
+    project="$tmp/project"
+    cp -r "$gradle_project_source" "$project"
+
+    props="$project/gradle/wrapper/gradle-wrapper.properties"
+    for kv in "$@"; do
+        case "$kv" in
+            gradle=*)
+                sed "s#gradle-[0-9.]*-bin.zip#gradle-${kv#*=}-bin.zip#" "$props" > "$props.tmp"
+                mv "$props.tmp" "$props"
+                ;;
+        esac
+    done
+
+    toml="$project/gradle/libs.versions.toml"
+    for kv in "$@"; do
+        case "$kv" in
+            gradle=*) ;;
+            *)
+                key="${kv%%=*}"
+                val="${kv#*=}"
+                sed "/^\[versions\]/,/^\[/ s/^$key = .*/$key = \"$val\"/" "$toml" > "$toml.tmp"
+                mv "$toml.tmp" "$toml"
+                ;;
+        esac
+    done
+
+    sh "$project/gradlew" --project-dir "$project" build
+    rm -rf "$tmp"
+}
+
+# Cache both the current and the previous versions to avoid issues during bumps.
+seedGradleDistribution 9.3.1 "b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06"
+cacheGradleProfile gradle=9.3.1 agp=9.0.0
+seedGradleDistribution 9.5.1 "bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f"
+cacheGradleProfile gradle=9.5.1 agp=9.2.1
+
+echo "Cached Gradle distributions and dependencies under $HOME/.gradle."
@@ -21,13 +21,12 @@ prefix="${2:-$default_prefix}"
 pkgconfig_path="$PKG_CONFIG_PATH"

 install_ff_nvcodec_headers() {
-    local nv_codec_version="11.1.5.3" # use 11.x.x.x to ensure compatibility with 470 nvidia drivers; might be upated to 12.0
-    local nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/archive/refs/tags/n$nv_codec_version.zip"
-    local nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-$nv_codec_version.zip"
-    local nv_codec_sha1="78715d521de102362e553dc92577bbe81905a321"
-    #nv_codec_sha1="4f30539f8dd31945da4c3da32e66022f9ca59c08" // 12.0
+    local nv_codec_version="12.0.16.1" # use 11.x.x.x to ensure compatibility with 520 nvidia drivers
+    local nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/releases/download/n12.0.16.1/nv-codec-headers-$nv_codec_version.tar.gz"
+    local nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-$nv_codec_version.tar.gz"
+    local nv_codec_sha1="df7239777af15af5d7e563d2af0deff874c3b770"
    local target_dir="$HOME"
-    local nv_codec_dir="$target_dir/nv-codec-headers-n$nv_codec_version"
+    local nv_codec_dir="$target_dir/nv-codec-headers-$nv_codec_version"

    if [ ! -d  "$nv_codec_dir" ]; then
        source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
@@ -20,9 +20,9 @@ fi
 # for the library path). Unset it before invoking vcpkg.
 unset TARGET

-"${BASH_SOURCE%/*}/../unix/install-vcpkg-ports.sh" arm64-ohos
+"${BASH_SOURCE%/*}/../unix/install-vcpkg-ports.sh" arm64-ohos-qt

-SetEnvVar "VCPKG_OHOS_INSTALLED" "$VCPKG_ROOT/installed/arm64-ohos"
-export VCPKG_OHOS_INSTALLED="$VCPKG_ROOT/installed/arm64-ohos"
+SetEnvVar "VCPKG_OHOS_INSTALLED" "$VCPKG_ROOT/installed/arm64-ohos-qt"
+export VCPKG_OHOS_INSTALLED="$VCPKG_ROOT/installed/arm64-ohos-qt"

 echo "OHOS vcpkg ports installed to $VCPKG_OHOS_INSTALLED"
@@ -43,9 +43,9 @@ if [ ! -d "$targetFolder" ]; then
 fi

 # QNX SDP
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20240417.tar.xz"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260422.tar.xz"
 targetFile="qnx710.tar.xz"
-sha1="cd2d35004fb2798089e29d9e1226691426632da0"
+sha1="98b24df7e8c53a104aee76e769011396fa4bdafd"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"

 sudo cp "$aarch64le_toolchain" "$targetPath"
@@ -1,3 +1,9 @@
+# Loopback — the QNX SDP's default /etc/hosts ships these, but this
+# file overrides that default. Tests that connect to http(s)://localhost
+# (e.g. tst_qhttpserver, tst_abstractoauth2) need them present.
+127.0.0.1   localhost
+::1         localhost
+
 # Need to add all testserver names statically
 # as current Docker uses Multicast DNS (mDNS) (avahi)
 # Which does not work with QNX qemu
@@ -13,7 +13,7 @@ PATH=__IFS_PATH__:/system/xbin:.
 var/share/zoneinfo=usr/share/zoneinfo

 [uid=0 gid=0 dperms=755 type=dir] var/share/fonts
-var/etc/fontconfig/fonts.conf=etc/fontconfig/fonts.conf
+var/etc/fontconfig/fonts.conf=etc/fonts/fonts.conf
 var/share/fonts=usr/share/fonts

 var/etc/hosts=local/misc_files/etc/hosts
@@ -0,0 +1,3 @@
+# local/snippets/ifs_files.custom
+# Placeholder for local list of files to add to ifs
+/usr/libexec/sshd-session=usr/libexec/sshd-session
@@ -18,6 +18,8 @@ rm -rf /data/var/share/fonts/NotoSansCJK*
 rm -rf /data/var/share/fonts/NotoSansMonoCJK*
 echo "---> Create fontconfig cache"
 fc-cache &
+# For fc-match in QFont tests
+ln -Ps /system/lib/libfontconfig.so.17 /system/lib/libfontconfig.so.1

 # Add default route so QNX knows where to send
 # requests for unknown network
@@ -21,7 +21,7 @@ lib/libGLESv2.so.1=usr/lib/libGLESv2.so.1
 lib/libEGL.so.1=usr/lib/libEGL.so.1
 lib/libz.so.2=usr/lib/libz.so.2
 lib/libxml2.so.2=usr/lib/libxml2.so.2
-lib/libfreetype.so.24=usr/lib/libfreetype.so.24
+lib/libfreetype.so.26=usr/lib/libfreetype.so.26
 lib/libbz2.so.1=usr/lib/libbz2.so.1
 lib/liblzma.so.5=usr/lib/liblzma.so.5
 lib/libbacktrace.so.1=usr/lib/libbacktrace.so.1
@@ -54,7 +54,7 @@ lib/libmmrndclient.so.1=usr/lib/libmmrndclient.so.1
 lib/libscreen.so.1=usr/lib/libscreen.so.1

 # for fontconfig
-lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1
+lib/libfontconfig.so.17=usr/lib/libfontconfig.so.17
 xbin/fc-cache=bin/fc-cache
 xbin/fc-match=local/misc_files/fc-match

@@ -1,3 +1,9 @@
+# Loopback — the QNX SDP's default /etc/hosts ships these, but this
+# file overrides that default. Tests that connect to http(s)://localhost
+# (e.g. tst_qhttpserver, tst_abstractoauth2) need them present.
+127.0.0.1   localhost
+::1         localhost
+
 # Need to add all testserver names statically
 # as current Docker uses Multicast DNS (mDNS) (avahi)
 # Which does not work with QNX qemu
@@ -13,7 +13,7 @@ PATH=__IFS_PATH__:/system/xbin:.
 var/share/zoneinfo=usr/share/zoneinfo

 [uid=0 gid=0 dperms=755 type=dir] var/share/fonts
-var/etc/fontconfig/fonts.conf=etc/fontconfig/fonts.conf
+var/etc/fontconfig/fonts.conf=etc/fonts/fonts.conf
 var/share/fonts=usr/share/fonts

 var/etc/hosts=local/misc_files/etc/hosts
@@ -6,13 +6,13 @@ set -ex

 source "${BASH_SOURCE%/*}/../unix/sccache.sh"

-targetVersion=v0.11.0
+targetVersion=v0.15.0
 if [[ $(uname -m) == 'aarch64' ]]; then
  targetArch=aarch64-unknown-linux-musl
-  sha1=b7606d0fb461c0aa7351f511d9223416a322d52a
+  sha256=3a6a3712b49da3d263bf2d30d702de4302793016019e800bfb81c0c69401d8f8
 else
  targetArch=x86_64-unknown-linux-musl
-  sha1=ef389a20c85b732cccd48436a5e28ed40bed2806
+  sha256=782d2b5dd7ae0a55ebe368ab258114d0928d019ac2d949ab85d5d02f3926709e
 fi

-installSccache "$targetArch" "$targetVersion" "$sha1"
+installSccache "$targetArch" "$targetVersion" "$sha256"
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# Copyright (C) 2026 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 Syft
+
+# Syft is used for generating SBOM (Software Bill of Materials) files.
+
+# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+
+version="1.45.1"
+
+uname_m="$(uname -m)"
+case "$uname_m" in
+    x86_64|amd64)
+        SHA1="06e1d56173209977df8b11ad955843cb62f874fd"
+        arch="amd64"
+        ;;
+    arm64|aarch64)
+        SHA1="c48638b3998066dbd139e94e116a81a6cc6299be"
+        arch="arm64"
+        ;;
+    *) fatal "Unknown architecture in uname: $uname_m" 43 ;;
+esac
+
+PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/syft/syft_${version}_linux_${arch}.tar.gz"
+AltUrl="https://github.com/anchore/syft/releases/download/v${version}/syft_${version}_linux_${arch}.tar.gz"
+targetFolder="/opt/syft-$version"
+appPrefix=""
+
+InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
+
+SetEnvVar "PATH" "$targetFolder:\$PATH"
+
+echo "Syft = $version" >> ~/versions.txt
@@ -13,60 +13,60 @@ 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_2603.tar.gz"
 AltUrl=""
-sha1="96db52d86c2138a1ca31212372f48838ec08013e"
+sha1="e9337894d4591e1d9e67640181c3d48fdb3d4a12"
 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="12-05-2026_2"
 ######### VXworks toolchain #########
-# Installs to /opt/fsl_imx6_2_0_6_2_VSB
+# Installs to /opt/fsl_imx6_2_0_6_3_VSB
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_vsb_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="88f0f139ac62e8c0a4c5477d880a1ff345826479"
+sha1="a1553f377ae84a722c8ad258fccb684f9198717c"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
-SetEnvVar "WIND_CC_SYSROOT" "/opt/fsl_imx6_2_0_6_2_VSB"
+SetEnvVar "WIND_CC_SYSROOT" "/opt/fsl_imx6_2_0_6_3_VSB"

 ######### VXworks VIP kernel #########
-# Installs to /opt/fsl_imx6_2_0_6_2_VIP_QEMU
+# Installs to /opt/fsl_imx6_2_0_6_3_VIP_QEMU
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_vip_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="96056c0f9b1234160db2d9038a9e6fc24a2bbbd7"
+sha1="487a056d389a764717142100fb408e65ea720f92"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""

 # IMX 8
-# Installs to /opt/nxp_imx8_1_0_6_3_VSB
+# Installs to /opt/nxp_imx8_1_0_7_1_VSB
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_imx8_vsb_${VXWORKS_BUILD_VER}.tar.gz"
 AltUrl=""
-sha1="cf6194b78bf08b894397fd5ce2a57abd25cf497b"
+sha1="b312f38a7ca670398c940c25d20ed2a26155160d"
 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="9fddd5aa0b9599113c22670fcc1221004978ee8a"
 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="cb366addbea7a1fd34aa49b739dcc0b480350fce"
 targetFolder="/opt/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""

 ######### VXworks fonts and certs #########
-# Installs to /opt/fsl_imx6_2_0_6_2_VSB
+# Installs to /opt/fsl_imx6_2_0_6_3_VSB
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_misc.tar.gz"
 AltUrl=""
 sha1="1bc529b90b35b0b249f219e47d5798225a9b68d8"
-targetFolder="/opt/fsl_imx6_2_0_6_2_VSB/"
+targetFolder="/opt/fsl_imx6_2_0_6_3_VSB/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""
 ######### VXworks fonts and certs #########
 # Installs to /opt/itl_generic_skylake_VSB
@@ -76,13 +76,6 @@ sha1="1bc529b90b35b0b249f219e47d5798225a9b68d8"
 targetFolder="/opt/itl_generic_skylake_VSB/"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" ""

-# Setup NFS exports that are needed by VxWorks qemu
-sudo bash -c "echo '/home/qt/work 172.31.1.10/24(rw,sync,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
-sudo bash -c "echo '/opt/fsl_imx6_2_0_6_2_VSB 172.31.1.10/24(rw,sync,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
-sudo bash -c "echo '/opt/itl_generic_skylake_VSB 172.31.1.10/24(rw,sync,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
-
-sudo exportfs -a
-
 # Enable ipv4 routing from vxWorks to Qt DNS
 sudo sed -i s/#net.ipv4.ip_forward=1/net.ipv4.ip_forward=1/g /etc/sysctl.conf
 sudo iptables -I FORWARD 1 -j ACCEPT
@@ -2,57 +2,109 @@
 # 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

+# Launch a single VxWorks QEMU emulator instance.
+#
+# Usage: vxworks_qemu_launcher.sh <arm|intel> [instance-id]
+#
+# Multiple instances are run in parallel to speed up the autotest run. Each
+# instance gets its own tap device, guest IP, MAC address, serial FIFO pair,
+# QEMU log and (for the TCG-based ARM emulator) a dedicated set of host CPU
+# cores. Instance 0 keeps the historical addresses so a single-instance run
+# behaves exactly as before.
+
+[ $# -ge 1 ] || echo "Supply parameter which emulator to start <arm|intel> [instance-id]"
+TYPE=$1
+INSTANCE=${2:-0}
+
+# Per-instance identifiers. Instance 0 == the original single-emulator layout.
+TAP="tap${INSTANCE}"
+GUEST_IP="172.31.1.$((10 + INSTANCE))"
+MAC=$(printf '52:54:00:12:34:%02x' "$INSTANCE")
+PIPE="/tmp/guest${INSTANCE}"
+QEMU_LOG_PATH="/home/qt/work/vxworks_qemu_log_${INSTANCE}.txt"
+
+# Per-instance SSH target: same user as VXWORKS_SSH, but the instance's IP.
+if [[ "$VXWORKS_SSH" == *"@"* ]]; then
+    SSH_TARGET="${VXWORKS_SSH%@*}@${GUEST_IP}"
+else
+    SSH_TARGET="${GUEST_IP}"
+fi
+
+# Host bridge and per-instance tap setup. Serialized across parallel launches
+# and made idempotent so concurrent instances don't race on the shared bridge.
+exec 9>"/tmp/vxworks_qemu_host_setup.lock"
+flock 9
+NFS_CONF_MARKER="# VxWorks QEMU NFS settings (added by vxworks_qemu_launcher.sh)"
+if ! grep -qF "$NFS_CONF_MARKER" /etc/nfs.conf; then
+    # Configure NFS for UDP traffic
+    sudo bash -c "echo -e '\n${NFS_CONF_MARKER}\n' >> /etc/nfs.conf"
+    sudo bash -c "echo -e '[nfsd]\n' >> /etc/nfs.conf"
+    sudo bash -c "echo -e 'udp=y\n' >> /etc/nfs.conf"
+    sudo bash -c "echo -e 'tcp=n\n' >> /etc/nfs.conf"
+    sudo bash -c "echo -e 'vers2=n\n' >> /etc/nfs.conf"
+    sudo bash -c "echo -e 'vers3=y\n' >> /etc/nfs.conf"
+    sudo bash -c "echo -e 'vers4=n\n' >> /etc/nfs.conf"
+    # Setup NFS exports that are needed by VxWorks qemu
+    sudo bash -c "echo '/home/qt/work 172.31.1.10/24(rw,sync,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
+    sudo bash -c "echo '/opt/fsl_imx6_2_0_6_3_VSB 172.31.1.10/24(rw,sync,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
+    sudo bash -c "echo '/opt/itl_generic_skylake_VSB 172.31.1.10/24(rw,sync,root_squash,no_subtree_check,anonuid=2001,anongid=100)' >> /etc/exports"
+    # Restart NFS server
+    sudo exportfs -a
+    sudo systemctl restart nfs-server
+fi
+
 # Setup bridge if not exist for VxWorks QEMU
 if ! ip link show br0 >/dev/null 2>&1; then
    sudo brctl addbr br0
    sudo brctl stp br0 off
    sudo ifconfig br0 172.31.1.1 netmask 255.255.255.0 promisc up
-    sudo tunctl -u qt -t tap0
-    sudo ifconfig tap0 promisc up
-    sudo brctl addif br0 tap0
 fi
+if ! ip link show "${TAP}" >/dev/null 2>&1; then
+    sudo tunctl -u qt -t "${TAP}"
+    sudo ifconfig "${TAP}" promisc up
+    sudo brctl addif br0 "${TAP}"
+fi
+exec 9>&-

-[ $# -eq 1 ] || echo "Supply parameter which emulator to start <arm|intel>"
-TYPE=$1
-
-QEMU_LOG_PATH="/home/qt/work/vxworks_qemu_log.txt"
 if [ "$TYPE" = "arm" ] || [ "$TYPE" = "" ]; then
    $VXWORKS_QEMU/bin/qemu-system-arm \
        -machine sabrelite \
-        -smp 4 \
-        -m 1G \
+        -smp 2 \
+        -m 2G \
        -nographic \
        -monitor none \
        -serial null \
-        -serial pipe:/tmp/guest \
-        -kernel /opt/fsl_imx6_2_0_6_2_VIP_QEMU/default/uVxWorks \
-        -dtb /opt/fsl_imx6_2_0_6_2_VIP_QEMU/default/imx6q-sabrelite.dtb \
-        -append "enet(0,0)host:vxWorks h=172.31.1.1 g=172.31.1.1 e=172.31.1.10 u=target pw=vxTarget s=/romfs/startup_script.txt" \
-        -nic "tap,ifname=tap0,script=no" >"${QEMU_LOG_PATH}" 2>&1 &
+        -serial pipe:${PIPE} \
+        -kernel /opt/fsl_imx6_2_0_6_3_VIP_QEMU/default/uVxWorks \
+        -dtb /opt/fsl_imx6_2_0_6_3_VIP_QEMU/default/imx6q-sabrelite.dtb \
+        -append "enet(0,0)host:vxWorks h=172.31.1.1 g=172.31.1.1 e=${GUEST_IP} u=target pw=vxTarget s=/romfs/startup_script.txt" \
+        -rtc base=localtime,clock=rt \
+        -icount sleep=off \
+        -nic "tap,ifname=${TAP},script=no,mac=${MAC}" >"${QEMU_LOG_PATH}" 2>&1 &
 elif [ "$TYPE" = "intel" ]; then
    $VXWORKS_QEMU/bin/qemu-system-x86_64 \
        -M q35 \
-        -smp 8 \
-        -m 16G \
+        -smp 4 \
+        -m 4G \
        -cpu "Skylake-Client" \
        -enable-kvm \
        -monitor none \
        -nographic \
        -serial null \
-        -serial pipe:/tmp/guest \
+        -serial pipe:${PIPE} \
        -kernel "/opt/itl_generic_skylake_VIP_QEMU/default/vxWorks" \
-        -append "sysbootline:gei(0,0)host:vxWorks h=172.31.1.1 g=172.31.1.1 e=172.31.1.10 u=target pw=vxTarget s=/romfs/startup_script.txt" \
-        -nic tap,ifname=tap0,script=no,downscript=no >"${QEMU_LOG_PATH}" 2>&1 &
+        -append "sysbootline:gei(0,0)host:vxWorks h=172.31.1.1 g=172.31.1.1 e=${GUEST_IP} u=target pw=vxTarget s=/romfs/startup_script.txt" \
+        -nic "tap,ifname=${TAP},script=no,downscript=no,mac=${MAC}" >"${QEMU_LOG_PATH}" 2>&1 &
 fi

 for _ in $(seq 30)
 do
-    status=$(ssh -o BatchMode=yes -o HostKeyAlgorithms=+ssh-rsa -o ConnectTimeout=1 "${VXWORKS_SSH}" echo emulator up) || true
+    status=$(ssh -o BatchMode=yes -o HostKeyAlgorithms=+ssh-rsa -o ConnectTimeout=1 "${SSH_TARGET}" echo emulator up) || true
    if [[ $status == *"emulator up"* ]] ; then
-        echo "VXWORKS QEMU SSH server up"
+        echo "VXWORKS QEMU SSH server up (instance ${INSTANCE} @ ${GUEST_IP})"
        break
    else
-        echo "Waiting VXWORKS QEMU SSH server"
+        echo "Waiting VXWORKS QEMU SSH server (instance ${INSTANCE} @ ${GUEST_IP})"
        sleep 1
    fi
 done
@@ -71,13 +71,16 @@ function InstallNdk() {
    ndkTargetFile="/tmp/$ndkFile"
    ndkSourceFile="$basePath/$ndkFile"

+    ndkTargetDir="$targetFolder/$ndkVersion"
+    sudo mkdir -p "$ndkTargetDir"
+
    DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
-    echo "Unzipping Android NDK to '$targetFolder'"
+    echo "Unzipping Android NDK to '$ndkTargetDir'"
    # Get the package base directory name as string
    zipBase=$(sudo zipinfo -1 "$ndkTargetFile" 2>/dev/null | awk '!seen {sub("/.*",""); print; seen=1}')
-    sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
+    sudo unzip -q "$ndkTargetFile" -d "$ndkTargetDir"
    rm "$ndkTargetFile"
-    androidNdkRoot="${targetFolder}/${zipBase}"
+    androidNdkRoot="${ndkTargetDir}/${zipBase}"
 }

 InstallNdk $ndkVersionLatest $ndkSha1Latest
@@ -11,11 +11,11 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-majorminorversion="3.30.5"
-version="3.30.5"
+majorminorversion="4.3"
+version="4.3.2"
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-macos-universal.tar.gz"
 AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-macos-universal.tar.gz"
-SHA1="c81c2f7482a901c4a32a81034920c23c22233a0f"
+SHA1="e3b456c03d992239f9d83d933336768c7fc1ff54"
 appPrefix="cmake-$version-macos-universal"

 InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
@@ -1,2 +1,3 @@
 diffutils
+nasm
 yasm
@@ -9,18 +9,105 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SourceEnvVars.sh
 source "${BASH_SOURCE%/*}/../unix/SourceEnvVars.sh"

-echo "Caching Gradle distribution and dependencies"
-gradleCacheFileName="gradle_9.3.1_darwin_cache_v2.tar.gz"
-gradleCacheUrl="http://ci-files01-hki.ci.qt.io/input/gradle/$gradleCacheFileName"
-gradleCacheSha1="d4f93be293224e3d55779cf64252337fbb26b53b"
-gradleCacheFile="/tmp/$gradleCacheFileName"
-DownloadURL "$gradleCacheUrl" "$gradleCacheUrl" "$gradleCacheSha1" "$gradleCacheFile"
-mkdir -p "$HOME/.gradle"
-tar -xzf "$gradleCacheFile" -C "$HOME/.gradle" --strip-components=1
-rm "$gradleCacheFile"
+echo "Caching Gradle distributions and dependencies"

 gradle_project_source="${BASH_SOURCE%/*}/../shared/gradle/project"
-cp -r "$gradle_project_source" /tmp/gradle_project
-cd /tmp/gradle_project
-chmod +x gradlew
-sh gradlew build
+gradleDistributionMirror="http://ci-files01-hki.ci.qt.io/input/gradle"
+gradleInitScript="init.d/nexus-mirror.gradle"
+
+# Route every Gradle repository through the internal Nexus mirror.
+mkdir -p "$HOME/.gradle/init.d"
+cp "${BASH_SOURCE%/*}/../shared/gradle/$gradleInitScript" "$HOME/.gradle/$gradleInitScript"
+
+# Returns the hash of the Gradle binary distribution for a given Gradle version.
+# Gradle calculates the hash as base36(md5(distributionUrl)).
+gradleDistributionHash () {
+    version="$1"
+    propertiesFile="$gradle_project_source/gradle/wrapper/gradle-wrapper.properties"
+
+    # 1. Read the project's distributionUrl.
+    distributionUrl=$(grep '^distributionUrl=' "$propertiesFile")
+    distributionUrl=${distributionUrl#distributionUrl=}
+    # 2. Unescape the Java-properties (e.g. '\:').
+    distributionUrl=${distributionUrl//\\:/:}
+    # 3. Swap in the requested version while maintaining the distribution URL.
+    distributionUrl=${distributionUrl/gradle-[0-9.]*-bin.zip/gradle-$version-bin.zip}
+
+    if command -v md5sum >/dev/null 2>&1; then
+        md5Hex=$(printf '%s' "$distributionUrl" | md5sum | awk '{print $1}')
+    else
+        md5Hex=$(printf '%s' "$distributionUrl" | md5)
+    fi
+
+    # Convert the md5 to base36: read it as a number, then repeatedly take the
+    # next digit (number % 36) and divide by 36, prepending each digit's character.
+    number=$(printf 'ibase=16; %s\n' "$(printf '%s' "$md5Hex" | tr 'a-f' 'A-F')" | bc)
+    hash=""
+    alphabet="0123456789abcdefghijklmnopqrstuvwxyz"
+    while [ "$number" != "0" ]; do
+        digit=$(printf '%s %% 36\n' "$number" | bc)
+        number=$(printf '%s / 36\n' "$number" | bc)
+        hash="${alphabet:$digit:1}$hash"
+    done
+    printf '%s' "$hash"
+}
+
+# Seed a Gradle distribution binary into ~/.gradle from the internal mirror.
+seedGradleDistribution () {
+    version="$1"
+    sha="$2"
+
+    distributionDir="$HOME/.gradle/wrapper/dists/gradle-${version}-bin/$(gradleDistributionHash "$version")"
+    if [ -e "$distributionDir/gradle-${version}-bin.zip.ok" ]; then
+        return 0
+    fi
+    mkdir -p "$distributionDir"
+    zip="$distributionDir/gradle-${version}-bin.zip"
+    url="$gradleDistributionMirror/gradle-${version}-bin.zip"
+    DownloadURL "$url" "$url" "$sha" "$zip"
+    unzip -q -o "$zip" -d "$distributionDir"
+    rm -f "$zip"
+    touch "$distributionDir/gradle-${version}-bin.zip.ok"
+}
+
+# Populate ~/.gradle/caches by priming the shared project for each Gradle and AGP profile.
+cacheGradleProfile () {
+    echo "Caching Gradle profile $*"
+    tmp="$(mktemp -d)"
+    project="$tmp/project"
+    cp -r "$gradle_project_source" "$project"
+
+    props="$project/gradle/wrapper/gradle-wrapper.properties"
+    for kv in "$@"; do
+        case "$kv" in
+            gradle=*)
+                sed "s#gradle-[0-9.]*-bin.zip#gradle-${kv#*=}-bin.zip#" "$props" > "$props.tmp"
+                mv "$props.tmp" "$props"
+                ;;
+        esac
+    done
+
+    toml="$project/gradle/libs.versions.toml"
+    for kv in "$@"; do
+        case "$kv" in
+            gradle=*) ;;
+            *)
+                key="${kv%%=*}"
+                val="${kv#*=}"
+                sed "/^\[versions\]/,/^\[/ s/^$key = .*/$key = \"$val\"/" "$toml" > "$toml.tmp"
+                mv "$toml.tmp" "$toml"
+                ;;
+        esac
+    done
+
+    sh "$project/gradlew" --project-dir "$project" build
+    rm -rf "$tmp"
+}
+
+# Cache both the current and the previous versions to avoid issues during bumps.
+seedGradleDistribution 9.3.1 "b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06"
+cacheGradleProfile gradle=9.3.1 agp=9.0.0
+seedGradleDistribution 9.5.1 "bafc141b619ad6350fd975fc903156dd5c151998cc8b058e8c1044ab5f7b031f"
+cacheGradleProfile gradle=9.5.1 agp=9.2.1
+
+echo "Cached Gradle distributions and dependencies under $HOME/.gradle."
@@ -22,6 +22,12 @@ ffmpeg_config_options=$(get_ffmpeg_config_options "shared")
 default_prefix="/usr/local/$ffmpeg_name"
 prefix="${2:-$default_prefix}"

+# Disable X11 linkage on macOS. FFmpeg auto-detect
+# mechanisms will pull it in as a dependency if found
+# on the host. If this happens, it makes the binaries
+# not loadable on macOS machines without libx11 installed.
+ffmpeg_config_options+=" --disable-libxcb --disable-xlib"
+
 build_ffmpeg() {
    local arch="$1"
    local build_dir="$ffmpeg_source_dir/build/$arch"
@@ -55,9 +55,13 @@ function InstallXCode() {
    echo "Install packages"
    sudo xcodebuild -runFirstLaunch

-    # Metal toolchain not included by default in Xcode 26
+    # Xcode 26 ships a more minimal base install
    if ((majorVersion >= 26)); then
        xcodebuild -downloadComponent MetalToolchain
+        xcodebuild -downloadPlatform iOS
+        if [[ $(uname -m) == "arm64" ]]; then
+            xcodebuild -downloadPlatform visionOS
+        fi
    fi

    echo "Enabling developer mode, so that using lldb does not require interactive password entry"
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2020 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# Install libusb
-set -ex
-
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-brew install libusb
-read -r -a arr <<< "$(brew list --versions libusb)"
-version=${arr[1]}
-echo "libusb = $version" >> ~/versions.txt
-
-mkdir /tmp/arm64/
-mkdir /tmp/amd64/
-
-case $(sw_vers -productVersion) in
-    11*) codename=big_sur;;
-    12*) codename=monterey;;
-    13*) codename=ventura;;
-    14*) codename=sonoma;;
-esac
-
-brew fetch --bottle-tag=arm64_"${codename}" libusb
-brew fetch --bottle-tag="${codename}" libusb
-tar xf "$(brew --cache --bottle-tag=arm64_"${codename}" libusb)" -C /tmp/arm64/
-tar xf "$(brew --cache --bottle-tag="${codename}" libusb)" -C /tmp/amd64
-for f in /tmp/arm64/libusb/"$version"/lib/* ; do
-    if lipo -info "$f" >/dev/null 2>&1; then
-        file="$(basename "$f")"
-        lipo -create -output "$(brew --cellar)/libusb/$version/lib/$file" \
-            "/tmp/arm64/libusb/$version/lib/$file" \
-            "/tmp/amd64/libusb/$version/lib/$file"
-    fi
-done
@@ -6,12 +6,12 @@ set -ex

 source "${BASH_SOURCE%/*}/../unix/sccache.sh"

-targetVersion=v0.11.0
+targetVersion=v0.15.0
 if [[ `arch` == arm* ]]; then
    targetArch=aarch64-apple-darwin
-    sha1=3261ab99e5bb1f9f36eafa597d11491bd85da5ec
+    sha256=430ef7b5f54256d3ed5bfe77e8b0afc51aa209aeebe4f95b69c3a52ce3acc6e9
 else
    targetArch=x86_64-apple-darwin
-    sha1=57810789bf2813dfa9bf5da26a712dc30b56ce16
+    sha256=f8da93e0689122268f720ddb48c8357f3da18be8c88aff23a8e75a7a219367db
 fi
-installSccache "$targetArch" "$targetVersion" "$sha1"
+installSccache "$targetArch" "$targetVersion" "$sha256"
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# Copyright (C) 2026 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 Syft
+
+# Syft is used for generating SBOM (Software Bill of Materials) files.
+
+# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+
+version="1.45.1"
+
+uname_m="$(uname -m)"
+case "$uname_m" in
+    x86_64|amd64)
+        SHA1="ecd1a9283e4ce025b5905a85e505fcba237edd51"
+        arch="amd64"
+        ;;
+    arm64|aarch64)
+        SHA1="996f3985f14ebbe8661c0b72d7ad520200155c46"
+        arch="arm64"
+        ;;
+    *) fatal "Unknown architecture in uname: $uname_m" 43 ;;
+esac
+
+PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/syft/syft_${version}_darwin_${arch}.tar.gz"
+AltUrl="https://github.com/anchore/syft/releases/download/v${version}/syft_${version}_darwin_${arch}.tar.gz"
+targetFolder="/opt/syft-$version"
+appPrefix=""
+
+InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
+
+SetEnvVar "PATH" "$targetFolder:\$PATH"
+
+echo "Syft = $version" >> ~/versions.txt
@@ -1 +1 @@
--disable-programs --disable-doc --disable-debug --enable-network --disable-lzma --enable-pic --disable-vulkan --disable-v4l2-m2m --disable-decoder=truemotion1
+--disable-programs --disable-doc --disable-debug --enable-network --disable-lzma --enable-pic --disable-vulkan --disable-v4l2-m2m --disable-decoder=truemotion1 --disable-avdevice --disable-avfilter
@@ -40,7 +40,7 @@ if [[ "$patchelf_version" == "0.18.0" ]]; then
    echo "WARNING: patchelf version 0.18.0 is known to have issues with Android." >&2
 fi

-ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale")
+ffmpeg_libs=("avcodec" "avformat" "avutil" "swresample" "swscale")
 stub_prefix="Qt6FFmpegStub-"

 for lib_name in "${ffmpeg_libs[@]}"; do
@@ -0,0 +1,39 @@
+// Copyright (C) 2026 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
+
+// Installed by Coin into $GRADLE_USER_HOME/init.d to route every gradle
+// invocation's repositories through the internal Nexus mirror.
+
+def mirror = 'https://ci-passth-cache.ci.qt.io/repository/gradle-all/'
+
+def addMirror = { repositories ->
+    repositories.maven { mavenRepository ->
+        mavenRepository.name = 'qt-nexus-mirror'
+        mavenRepository.url = mirror
+    }
+}
+
+def enforceMirror = { repositories ->
+    repositories.all { repository ->
+        if (repository.name != 'qt-nexus-mirror')
+            repositories.remove(repository)
+    }
+    addMirror(repositories)
+}
+
+// Modern templates: replace the settings-level repositories with the mirror.
+settingsEvaluated { settings ->
+    settings.pluginManagement.repositories.clear()
+    addMirror(settings.pluginManagement.repositories)
+    settings.dependencyResolutionManagement {
+        repositoriesMode.set(RepositoriesMode.PREFER_PROJECT)
+        repositories.clear()
+        addMirror(repositories)
+    }
+}
+
+// Legacy templates: replace the buildscript and project repositories with the mirror.
+allprojects { project ->
+    enforceMirror(project.buildscript.repositories)
+    enforceMirror(project.repositories)
+}
@@ -7,7 +7,9 @@ which use `--offline`.
 Caches dependencies for:
 - `com.android.application`: used by Qt test/example APK builds
 - `com.android.library`: used by Qt JAR builds
+- `android.dynamic.feature`: used by Feature Delivery tests
 - `org.jetbrains.kotlin.android`: used by some Qt modules
+- `org.qtproject.qt.gradleplugin`: used by Qt for Android Studio projects
 - AndroidX: used by app builds

 These files should be updated each time Qt bumps the supported Android or
@@ -10,11 +10,14 @@ android {
        applicationId 'org.qtproject.qt.gradlecache.app'
        minSdk = 28
    }
+
+    dynamicFeatures = [':feature']
 }

 dependencies {
    implementation libs.core
    implementation libs.appcompat
    implementation libs.material
+    implementation libs.play.feature.delivery
    testImplementation libs.junit
 }
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="feature_title">Feature</string>
+</resources>
@@ -1,4 +1,6 @@
 plugins {
    alias(libs.plugins.android.application) apply false
    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.android.dynamic.feature) apply false
+    alias(libs.plugins.qt.gradle.plugin) apply false
 }
@@ -0,0 +1,17 @@
+plugins {
+    alias(libs.plugins.android.dynamic.feature)
+}
+
+android {
+    namespace = 'org.qtproject.qt.gradlecache.feature'
+    compileSdk = 36
+
+    defaultConfig {
+        minSdk = 28
+    }
+}
+
+dependencies {
+    implementation project(':app')
+    implementation libs.play.feature.delivery
+}
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:dist="http://schemas.android.com/apk/distribution">
+    <dist:module
+        dist:instant="false"
+        dist:title="@string/feature_title">
+        <dist:delivery>
+            <dist:on-demand />
+        </dist:delivery>
+        <dist:fusing dist:include="true" />
+    </dist:module>
+</manifest>
@@ -0,0 +1,5 @@
+package org.qtproject.qt.gradlecache.feature
+
+object Feature {
+    fun hello(): String = "hello"
+}
@@ -1,16 +1,21 @@
 [versions]
-agp = "9.0.0"
+agp = "9.2.1"
 core = "1.17.0"
 appcompat = "1.7.1"
 material = "1.13.0"
 junit = "4.13.2"
+play-feature-delivery = "2.1.0"
+qt-gradle-plugin = "1.4"

 [libraries]
 core = { group = "androidx.core", name = "core", version.ref = "core" }
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 junit = { group = "junit", name = "junit", version.ref = "junit" }
+play-feature-delivery = { module = "com.google.android.play:feature-delivery", version.ref = "play-feature-delivery" }

 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
 android-library = { id = "com.android.library", version.ref = "agp" }
+android-dynamic-feature = { id = "com.android.dynamic-feature", version.ref = "agp" }
+qt-gradle-plugin = { id = "org.qtproject.qt.gradleplugin", version.ref = "qt-gradle-plugin" }
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -14,4 +14,4 @@ dependencyResolutionManagement {
 }

 rootProject.name = 'gradlecache'
-include ':app', ':lib'
+include ':app', ':lib', ':feature'
@@ -0,0 +1,8 @@
+set(VCPKG_ENV_PASSTHROUGH_UNTRACKED OHOS_SDK_ROOT)
+set(VCPKG_TARGET_ARCHITECTURE arm64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE dynamic)
+set(VCPKG_CMAKE_SYSTEM_NAME OHOS)
+set(VCPKG_MAKE_BUILD_TRIPLET "--host=aarch64-unknown-linux-ohos")
+set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DOHOS_ARCH=arm64-v8a -DCMAKE_PLATFORM_NO_VERSIONED_SONAME=ON)
+set(VCPKG_BUILD_TYPE release)
@@ -1,4 +1,4 @@
-vcpkg_tool_release_tag=ohos-20260505-4dc8719
-windows_x64_checksum=5e140ed8bd2bf945d2dcd6bc953735f29f3736e08e49f899e054f776c7211cc8
-windows_arm64_checksum=c793f59290213f1b4797f08208a76f7af12068e439faf82fe7a8522ba7fb7ad5
-unix_checksum=96a94016cfff8a46bb7abc98917df0b39477ec2da8468daf790699b1ad66a026
+vcpkg_tool_release_tag=2026-05-27
+windows_x64_checksum=da75e3312ff6881c89f6171363eedb92933b0f79456cd6ee636316edef860ff7
+windows_arm64_checksum=371cf5285cc94932b97c8c0774066c90efdb50dfe606113f1686e6e99f928b08
+unix_checksum=9167b2348ae58bfb707cf5e18f055f51d9cdedc2cc251a475d5c2ca3d901e8ae
@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

 download_ffmpeg() {
-    local version="${1:-"n7.1.3"}"
-    local sha1="${2:-27051817deec88bed3b9652d49f9127d22268d83}"
+    local version="${1:-"n8.1.2"}"
+    local sha1="${2:-a7f4ce77209afdadca9f371db261e8d69903dc85}"

    local ffmpeg_name="FFmpeg-$version"
    local target_dir="$HOME"
@@ -12,7 +12,7 @@ download_ffmpeg() {

    if [ ! -d "$ffmpeg_source_dir" ]; then
        local url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-        local url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
+        local url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/FFmpeg-$version.tar.gz"
        local app_prefix=""

        source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
@@ -0,0 +1,112 @@
+#!/usr/bin/env bash
+# Copyright (C) 2026 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 will build and install rust toolchain
+set -ex
+
+PROVISIONING_DIR="$(dirname "$0")/../../"
+
+# shellcheck source=./../unix/common.sourced.sh
+source "${BASH_SOURCE%/*}/../unix/common.sourced.sh"
+# shellcheck source=./../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=./../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+version="1.92.0"
+sourceName="rustc-$version-src"
+sourceFile="$sourceName.tar.xz"
+cachedUrl="http://ci-files01-hki.ci.qt.io/input/rust/$sourceFile"
+officialUrl="https://static.rust-lang.org/dist/$sourceFile"
+sourcesSHA256="ebee170bfe4c4dfc59521a101de651e5534f4dae889756a5c97ca9ea40d0c307"
+
+function BuildRust() {
+    buildFolder=$1
+    installPrefix=$2
+    target=$3
+    channel=$4
+    outputTarball=$5
+    tmpFolder=$6
+
+    targetFile=$tmpFolder/$sourceFile
+    srcFolder=$tmpFolder/$sourceName
+
+    if [ ! -d "$srcFolder" ]; then
+        DownloadURL $cachedUrl $officialUrl $sourcesSHA256 $targetFile
+        tar -C "$tmpFolder" -Jxf "$targetFile"
+    fi
+
+    mkdir -p "$buildFolder"
+    cd "$buildFolder"
+
+    $srcFolder/configure            \
+        --prefix=$installPrefix     \
+        --sysconfdir=etc            \
+        --enable-llvm-link-shared   \
+        --enable-profiler           \
+        --disable-cargo-native-static \
+        --disable-vendor            \
+        --disable-docs              \
+        --disable-lld               \
+        --target=$target            \
+        --release-description=QtCI  \
+        --release-channel=$channel
+
+    echo "Building rust"
+    python $srcFolder/x.py dist
+
+    # x.py doesnt like running as root so install under our temporary folder for now
+    export DESTDIR=$tmpFolder
+
+    echo "Installing rust"
+    python $srcFolder/x.py install
+
+    # rustc must be in path for cargo to work
+    OLDPATH=$PATH
+    export PATH=$DESTDIR$installPrefix/bin:$PATH
+
+    echo "Installing rust bindgen tool."
+    $tmpFolder$installPrefix/bin/cargo install bindgen-cli --root $DESTDIR$installPrefix
+
+    tar -czf "$outputTarball" -C "$DESTDIR$installPrefix"  .
+
+    rm -rf "$buildFolder"
+    export PATH=$OLDPATH
+    unset DESTDIR
+}
+
+function InstallRust() {
+    buildFolder=$1
+    installPrefix=$2
+    target=$3
+    channel=$4
+    prebuiltSHA256=$5
+
+    tmpFolder=$(mktemp -d)
+
+    # e.g rust-1.92.0-macos-arm64-prebuilt.tar.gz or rust-1.92.0-macos-amd64-prebuilt.tar.gz
+    prebuiltFile="rust-$version-$PROVISIONING_OS-$PROVISIONING_ARCH-prebuilt.tar.gz"
+    prebuiltRust="http://ci-files01-hki.ci.qt.io/input/rust/$prebuiltFile"
+    prebuiltTarget="$tmpFolder$prebuiltFile"
+
+    DownloadURL $prebuiltRust "" $prebuiltSHA256 $prebuiltTarget $tmpFolder || (
+        if [ $COIN_RUNS_IN_QT_COMPANY = true ]
+        then
+            echo "Fetching prebuilt rust failed."
+            exit 1
+        else
+            echo "Fetching prebuilt rust failed. Building from sources."
+            BuildRust $buildFolder $installPrefix $target $channel $prebuiltTarget
+        fi
+    )
+
+    sudo mkdir "$installPrefix"
+    sudo tar -xzf "$prebuiltTarget" -C "$installPrefix"
+    rm -rf "$prebuiltTarget"
+    rm -rf "$tmpFolder"
+
+    SetEnvVar "PATH" "$installPrefix/bin:\$PATH"
+
+    echo "Rust = $version" >> ~/versions.txt
+}
@@ -26,5 +26,7 @@ cp -R $install_root/* "$VCPKG_ROOT/installed/"
 SetEnvVar "VCPKG_INSTALLED_DIR" "$VCPKG_ROOT/installed/"

 rm -rf $install_root
+rm -rf "$VCPKG_ROOT/buildtrees/"
+rm -rf "$VCPKG_ROOT/packages/"

 popd || exit
@@ -4,7 +4,7 @@

 # This script will
 #   1) Clone the vcpkg repo   - https://github.com/microsoft/vcpkg/tags
-#   2) Install the vcpkg-tool - https://github.com/jobor/vcpkg-tool/tags
+#   2) Install the vcpkg-tool - https://github.com/microsoft/vcpkg-tool/tags

 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
@@ -58,7 +58,7 @@ fi

 nonDottedReleaseTag=${vcpkgToolReleaseTag//-/}

-vcpkgToolOfficialUrl="https://github.com/jobor/vcpkg-tool/archive/refs/tags/$vcpkgToolReleaseTag.tar.gz"
+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"
 vcpkgToolSourceFolder="$HOME/vcpkg-tool-$vcpkgToolReleaseTag"
 vcpkgToolBuildFolder="$HOME/vcpkg-tool-$vcpkgToolReleaseTag/build"
@@ -22,7 +22,7 @@ targetDir="$HOME/grpc-$version"
 targetFile="$targetDir.zip"
 DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile"
 unzip -q "$targetFile" -d "$HOME"
-sudo rm "$targetFile"
+rm "$targetFile"

 # devtoolset is needed when running configuration
 if uname -a |grep -qv "Darwin"; then
@@ -60,7 +60,7 @@ cmake "$targetDir" -G"Ninja Multi-Config" \
    -DgRPC_ZLIB_PROVIDER="package"
 ninja all

-sudo env "PATH=$PATH" ninja install
+env "PATH=$PATH" ninja install
 # Refresh shared library cache if OS isn't macOS
 if uname -a |grep -qv "Darwin"; then
    sudo ldconfig
@@ -69,5 +69,5 @@ fi
 SetEnvVar "gRPC_ROOT" "$installPrefix"
 SetEnvVar "absl_ROOT" "$installPrefix"

-sudo rm -rf "$targetDir"
-sudo rm -rf "$buildDir"
+rm -rf "$targetDir"
+rm -rf "$buildDir"
@@ -22,3 +22,13 @@ sudo mv "$targetFile" "$targetFolder"

 SetEnvVar "PATH" "$targetFolder:\$PATH"

+# Extract baseline cache
+sha1="e397b7934a8c892753166435aff8775c0b5aa5bf"
+pkgname="maven_cache-openapi-$version.tar.gz"
+internalUrl="http://ci-files01-hki.ci.qt.io/input/qtopenapi/maven/$pkgname"
+
+targetFile="$HOME/$pkgname"
+DownloadURL "$internalUrl" "$internalUrl" "$sha1" "$targetFile"
+echo "Extracting maven cache to ~/.m2"
+tar -xzf "$targetFile" -C "$HOME"
+rm "$targetFile"
@@ -36,4 +36,6 @@ function installSccache {
    # Prevents some random network I/O errors from failing compilation
    # Does not seem to affect much though
    SetEnvVar "SCCACHE_IGNORE_SERVER_IO_ERROR" "1"
+    # Enable a local preprocessor cache.
+    SetEnvVar SCCACHE_DIRECT 1
 }
@@ -52,25 +52,26 @@ $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) {
+function Install($1, $2, $3, $4, $5) {
    $cacheUrl = $1
    $zip = $2
    $checksum = $3
    $offcialUrl = $4
+    $ndkVersion = $5
    $tempExtractDir = "C:\Windows\Temp\android_extract"

    Download $offcialUrl $cacheUrl $zip
    Verify-Checksum $zip "$checksum"
    Extract-7Zip $zip $tempExtractDir
    $baseDirectory = (Get-ChildItem $tempExtractDir -Attributes D | Select-Object -First 1).Name
-    Move-Item -Path ($tempExtractDir + "\" + $baseDirectory) -Destination "C:\Utils\Android\$baseDirectory" -Force
+    Move-Item -Path ($tempExtractDir + "\" + $baseDirectory) -Destination "C:\Utils\Android\$ndkVersion\$baseDirectory" -Force
    Remove $zip

-    return "C:\Utils\Android\$baseDirectory"
+    return "C:\Utils\Android\$ndkVersion\$baseDirectory"
 }

 Write-Host "Installing Android NDK $nkdVersionLatest"
-$ndkFolderLatest = Install $ndkCachedUrlLatest $ndkZip $ndkChecksumLatest $ndkOfficialUrlLatest
+$ndkFolderLatest = Install $ndkCachedUrlLatest $ndkZip $ndkChecksumLatest $ndkOfficialUrlLatest $nkdVersionLatest
 Set-EnvironmentVariable "ANDROID_NDK_ROOT_LATEST" $ndkFolderLatest
 # To be used by vcpkg
 Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolderLatest
@@ -84,14 +85,14 @@ if ($ndkVersionPreview -ne $ndkVersionLatest) {

 if ($ndkVersionNightly1 -ne $ndkVersionLatest) {
    Write-Host "Installing Android NDK $ndkVersionNightly1"
-    $ndkFolderNightly = Install $ndkCachedUrlNightly1 $ndkZip $ndkChecksumNightly1 $ndkOfficialUrlNightly1
+    $ndkFolderNightly = Install $ndkCachedUrlNightly1 $ndkZip $ndkChecksumNightly1 $ndkOfficialUrlNightly1 $ndkVersionNightly1
    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
+    $ndkFolderNightly = Install $ndkCachedUrlNightly2 $ndkZip $ndkChecksumNightly2 $ndkOfficialUrlNightly2 $ndkVersionNightly2
    Set-EnvironmentVariable "ANDROID_NDK_ROOT_NIGHTLY2" $ndkFolderNightly
    Write-Output "Android NDK = $ndkVersionNightly2" >> ~/versions.txt
 }
@@ -3,22 +3,22 @@

 . "$PSScriptRoot\helpers.ps1"

-$majorminorversion = "3.30"
-$version = "3.30.5"
+$majorminorversion = "4.3"
+$version = "4.3.2"

 $cpu_arch = Get-CpuArchitecture
 Write-Host "Installing CMake for architecture $cpu_arch"
 switch ($cpu_arch) {
    arm64 {
        $arch = "arm64"
-        $sha1 = "408977a174476407bd660604f110a26ba41a6efd"
-        $majorminorversion = "3.30"
-        $version = "3.30.5"
+        $sha1 = "71949e4637accf5a92f35d357dc861e6a8d645cf"
+        $majorminorversion = "4.3"
+        $version = "4.3.2"
        Break
    }
    x64 {
        $arch = "i386"
-        $sha1 = "d0636735c2d13a4443662605cd80c708f265eacc"
+        $sha1 = "abc3ae51ec5a11fb367a39ddfb7db0c9ea697a7b"
    }
    default {
        throw "Unknown architecture $cpu_arch"
--- a/Show More
+++ b/Show More