Update submodules on '6.11.0 in qt/qt5'

Change-Id: I49d99db463d140e58a9cd1629f1913ce1cc9597d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2026-09-19 15:19:58 +08:00 · 2026-03-17 20:24:37 +00:00 · 2026-03-10 15:02:19 +00:00 · 2026-03-10 00:36:16 +00:00 · 2026-03-08 15:08:00 +00:00 · 2026-03-05 23:02:53 +00:00
642 changed files with 807 additions and 1958 deletions
@@ -5,8 +5,8 @@ Makefile
 CMakeLists.txt.user*
 CMakeUserPresets.json
 .vscode
-build/
-build-*/
+build
+build-*
 .DS_Store
 init-repository.opt
 init-repository.opt.in
@@ -1,46 +1,53 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = essential
+[submodule "qtxmlpatterns"]
+	depends = qtbase
+	recommends = qtdeclarative
+	path = qtxmlpatterns
+	url = ../qtxmlpatterns.git
+	branch = dev
+	status = ignore
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -48,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qttasktree qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -61,7 +68,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -69,243 +76,283 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
+[submodule "qtsystems"]
+	depends = qtbase
+	recommends = qtdeclarative
+	path = qtsystems
+	url = ../qtsystems.git
+	branch = dev
+	status = ignore
+[submodule "qtfeedback"]
+	depends = qtdeclarative
+	recommends = qtmultimedia
+	path = qtfeedback
+	url = ../qtfeedback.git
+	branch = master
+	status = ignore
+[submodule "qtpim"]
+	depends = qtdeclarative
+	path = qtpim
+	url = ../qtpim.git
+	branch = dev
+	status = ignore
 [submodule "qtconnectivity"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 	priority = 10
+[submodule "qtcanvas3d"]
+	depends = qtdeclarative
+	path = qtcanvas3d
+	url = ../qtcanvas3d.git
+	branch = dev
+	status = ignore
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
+[submodule "qtgamepad"]
+	depends = qtbase
+	recommends = qtdeclarative
+	path = qtgamepad
+	url = ../qtgamepad.git
+	branch = dev
+	status = ignore
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
+[submodule "qtwebglplugin"]
+	depends = qtbase qtwebsockets
+	recommends = qtdeclarative
+	path = qtwebglplugin
+	url = ../qtwebglplugin.git
+	branch = dev
+	status = ignore
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = addon
 [submodule "qttasktree"]
 	depends = qtbase
 	path = qttasktree
 	url = ../qttasktree.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = preview
 [submodule "qtopenapi"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtopenapi
 	url = ../qtopenapi.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = preview
 [submodule "qtcanvaspainter"]
 	depends = qtbase qtdeclarative qtshadertools
 	path = qtcanvaspainter
 	url = ../qtcanvaspainter.git
-	branch = 6.11.3
+	branch = 6.11.0
 	status = preview
@@ -315,7 +315,7 @@ function(qt_ir_get_already_initialized_submodules prefix
    )

    qt_ir_parse_git_config_file_contents("${prefix}"
-        READ_GIT_CONFIG_LOCAL
+        READ_GIT_CONFIG
        PARENT_REPO_BASE_GIT_PATH "${parent_repo_base_git_path}"
        WORKING_DIRECTORY "${working_directory}"
    )
@@ -130,11 +130,6 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
    set(extra_configure_args "")
    set(extra_cmake_args "")

-    # Collect modules to skip. These may come from:
-    # 1. The -skip option (consumed by init-repository's option parser)
-    # 2. Exclusion entries in -submodules/--module-subset (e.g. -qtfoo)
-    qt_ir_get_option_value(skip skip_modules)
-
    # If the -submodules or --module-subset options were specified, transform
    # the values into something configure understands and pass them to configure.
    qt_ir_get_option_value(module-subset submodules)
@@ -142,7 +137,6 @@ 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
@@ -159,10 +153,25 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
        endif()

        list(JOIN include_submodules "," include_submodules)
+        list(JOIN exclude_submodules "," exclude_submodules)

-        # Merge exclusions from module-subset into the skip list.
-        if(exclude_submodules)
-            list(APPEND skip_modules ${exclude_submodules})
+        # Handle case when the -skip argument is already passed.
+        # In that case read the passed values, merge with new ones,
+        # remove both the -skip and its values, and re-add it later.
+        list(FIND filtered_args "-skip" skip_index)
+        if(exclude_submodules AND skip_index GREATER -1)
+            list(LENGTH filtered_args filtered_args_length)
+            math(EXPR skip_args_index "${skip_index} + 1")
+
+            if(skip_args_index LESS filtered_args_length)
+                list(GET filtered_args "${skip_args_index}" skip_args)
+                string(REPLACE "," ";" skip_args "${skip_args}")
+                list(APPEND skip_args ${exclude_submodules})
+                list(REMOVE_DUPLICATES skip_args)
+                list(JOIN skip_args "," exclude_submodules)
+                list(REMOVE_AT filtered_args "${skip_args_index}")
+                list(REMOVE_AT filtered_args "${skip_index}")
+            endif()
        endif()

        # Handle case when only '-submodules existing' is passed and the
@@ -170,13 +179,9 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
        if(include_submodules)
            list(APPEND extra_configure_args "-submodules" "${include_submodules}")
        endif()
-    endif()
-
-    # Forward all collected skip modules to configure.
-    if(skip_modules)
-        list(REMOVE_DUPLICATES skip_modules)
-        list(JOIN skip_modules "," skip_csv)
-        list(APPEND extra_configure_args "-skip" "${skip_csv}")
+        if(exclude_submodules)
+            list(APPEND extra_configure_args "-skip" "${exclude_submodules}")
+        endif()
    endif()

    # Insert the extra arguments into the proper positions before and after '--'.
@@ -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,13 +16,6 @@ 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
@@ -62,7 +62,7 @@ Configurations:
    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 -DINPUT_tiff=qt -DINPUT_webp=qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
        'VCPKG_HOST_TRIPLET=arm64-linux-qt',
        'VCPKG_TARGET_TRIPLET=arm64-linux-qt',
    ]
@@ -155,7 +155,6 @@ Configurations:
        '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',
-        'SCCACHE_C_CUSTOM_CACHE_BUSTER=v1'
    ]
 -
    Id: 'sles-15_sp6-static'
@@ -186,12 +185,12 @@ Configurations:
    ]
 -
    Id: 'windows-11_24H2-msvc2022'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'Packaging', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
+        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
        'VCPKG_HOST_TRIPLET=x64-windows-qt',
@@ -215,7 +214,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24H2-msvc2022-arm64'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'MSVC2022'
    Target arch: 'arm64'
    Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
@@ -225,9 +224,9 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-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_ROOT_DIR_x64_arm64}} -DQT_FORCE_BUILD_TOOLS=ON',
        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'OPENSSL_INCLUDE={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
-        'OPENSSL_LIB={{.Env.OPENSSL_LIB_x64_arm64}}',
-        'OPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
+        'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
+        'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
+        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}',
        'VCPKG_HOST_TRIPLET=x64-windows-qt',
        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
@@ -243,7 +242,7 @@ Configurations:
    Platform dependency: 'windows-11_24H2-msvc2022-arm64'
 -
    Id: 'windows-11_24H2-msvc2022-developer-build'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    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'
@@ -263,7 +262,7 @@ Configurations:
    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DINPUT_tiff=qt -DINPUT_webp=qt',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
        'VCPKG_HOST_TRIPLET=x64-linux-qt',
        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
    ]
@@ -294,7 +293,7 @@ Configurations:
    ]
 -
    Id: 'visionos-developer-build'
-    Template: 'qtci-macos-15-arm-105'
+    Template: 'qtci-macos-15-arm-104'
    Target os: 'IOS_ANY'
    Target arch: 'arm64'
    Compiler: 'Clang'
@@ -306,7 +305,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24h2-mingw13'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'Mingw'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
@@ -319,7 +318,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24H2-llvm'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'Clang'
    Features: ['Sccache', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
@@ -332,7 +331,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24H2-mingw13-developer-build'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'Mingw'
    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
    Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
@@ -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-4.3.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.30.5/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-4.3.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.30.5/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-4.3.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.30.5/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-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',
+        'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin',
+        'QNX_TEST_ENV=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-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',
+        'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin',
+        'QNX_TEST_ENV=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',
@@ -3,7 +3,7 @@ Configurations:

 -
    Id: 'windows-11_24H2-msvc2022-minimal-static-test'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    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'
@@ -67,13 +67,13 @@ Configurations:

 -
    Id: 'macos-14-minimal-static-tests-x86_64'
-    Template: 'qtci-macos-14-x86_64-106'
+    Template: 'qtci-macos-14-x86_64-105'
    Compiler: 'Clang'
    Features: ['TestOnly', 'Packaging']
    Platform dependency: 'macos-universal-on-x86_64-minimal-static-test'
 -
    Id: 'macos-14-minimal-static-tests-arm64'
-    Template: 'qtci-macos-14-arm-108'
+    Template: 'qtci-macos-14-arm-106'
    Compiler: 'Clang'
    Features: ['TestOnly', 'Packaging']
    Platform dependency: 'macos-universal-on-x86_64-minimal-static-test'
@@ -13,7 +13,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24H2-minimal-static'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    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'
@@ -10,14 +10,14 @@ Configurations:
    Platform dependency: 'macos-universal-on-arm64'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -qpa android;offscreen -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
    ]
 -
    Id: 'android-armv7-on-windows'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Target os: 'Android_ANY'
    Target arch: 'armv7'
    Compiler: 'Mingw'
@@ -26,7 +26,7 @@ Configurations:
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -qpa android;offscreen -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
        'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include',
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
@@ -41,7 +41,7 @@ Configurations:
    Platform dependency: 'rhel-9.6'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -qpa android;offscreen -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        # We check QT_USE_TARGET_ANDROID_BUILD_DIR only in one configuration, to ensure builds
@@ -60,7 +60,7 @@ Configurations:
    Platform dependency: 'rhel-9.6'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -qpa android;offscreen -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
        # We check QT_USE_TARGET_ANDROID_BUILD_DIR and QT_USE_ANDROID_MODERN_BUNDLE only in one
@@ -69,22 +69,3 @@ Configurations:
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
        'ANDROID_EMULATOR=emulator_x86_64_api_36'
    ]
-
-    Id: 'android-17-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.6'
-    Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -qpa android;offscreen -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        # We check QT_USE_TARGET_ANDROID_BUILD_DIR and QT_USE_ANDROID_MODERN_BUNDLE only in one
-        # configuration, to ensure builds without this option work too.
-        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_USE_TARGET_ANDROID_BUILD_DIR=ON -DQT_USE_ANDROID_MODERN_BUNDLE=ON',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_37'
-    ]
@@ -28,7 +28,7 @@ Configurations:
    ]
 -
    Id: 'webassembly-windows'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Target os: 'WebAssembly'
    Compiler: 'Mingw'
    Target compiler: 'Clang'
@@ -9,7 +9,7 @@ Configurations:

    -
        Id: 'macos-universal-on-arm64'
-        Template: 'qtci-macos-15-arm-105'
+        Template: 'qtci-macos-15-arm-104'
        Compiler: 'Clang'
        Target arch: 'x86_64-arm64'
        Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
@@ -31,7 +31,7 @@ Configurations:
        Platform dependency: 'macos-universal-on-arm64'
    -
        Id: 'macos-14-x86_64-tests'
-        Template: 'qtci-macos-14-x86_64-106'
+        Template: 'qtci-macos-14-x86_64-105'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-universal-on-arm64'
@@ -46,25 +46,25 @@ Configurations:

    -
        Id: 'macos-13-arm64-tests'
-        Template: 'qtci-macos-13-arm-108'
+        Template: 'qtci-macos-13-arm-107'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-universal-on-arm64'
    -
        Id: 'macos-14-arm64-tests'
-        Template: 'qtci-macos-14-arm-108'
+        Template: 'qtci-macos-14-arm-106'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-universal-on-arm64'
    -
        Id: 'macos-15-arm64-tests'
-        Template: 'qtci-macos-15-arm-105'
+        Template: 'qtci-macos-15-arm-104'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-universal-on-arm64'
    -
        Id: 'macos-26-arm64-tests'
-        Template: 'qtci-macos-26-arm-105'
+        Template: 'qtci-macos-26-arm-104'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-universal-on-arm64'
@@ -87,7 +87,7 @@ Configurations:
        ]
    -
        Id: 'macos-arm64-developer-build'
-        Template: 'qtci-macos-15-arm-105'
+        Template: 'qtci-macos-15-arm-104'
        Compiler: 'Clang'
        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
        Configure arguments: '-developer-build -nomake examples -debug -framework'
@@ -97,7 +97,7 @@ Configurations:
        ]
    -
        Id: 'macos-26-arm64-developer-build'
-        Template: 'qtci-macos-26-arm-105'
+        Template: 'qtci-macos-26-arm-104'
        Compiler: 'Clang'
        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'Insignificant']
        Configure arguments: '-developer-build -nomake examples -debug -framework'
@@ -109,25 +109,25 @@ Configurations:
    # Test on all supported macOS versions (deployment targets)
    -
        Id: 'macos-13-arm64-developer-build-tests'
-        Template: 'qtci-macos-13-arm-108'
+        Template: 'qtci-macos-13-arm-107'
        Compiler: 'Clang'
        Features: ['TestOnly']
        Platform dependency: 'macos-arm64-developer-build'
    -
        Id: 'macos-14-arm64-developer-build-tests'
-        Template: 'qtci-macos-14-arm-108'
+        Template: 'qtci-macos-14-arm-106'
        Compiler: 'Clang'
        Features: ['TestOnly']
        Platform dependency: 'macos-arm64-developer-build'
    -
        Id: 'macos-15-arm64-developer-build-tests'
-        Template: 'qtci-macos-15-arm-105'
+        Template: 'qtci-macos-15-arm-104'
        Compiler: 'Clang'
        Features: ['TestOnly']
        Platform dependency: 'macos-arm64-developer-build'
    -
        Id: 'macos-26-arm64-developer-build-tests'
-        Template: 'qtci-macos-26-arm-105'
+        Template: 'qtci-macos-26-arm-104'
        Compiler: 'Clang'
        Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
        Platform dependency: 'macos-26-arm64-developer-build'
@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
    Id: 'windows-11_24H2-msvc2022-developer-build-cxx23'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    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'
@@ -1,14 +0,0 @@
-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-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Target os: 'QNX_710'
    Target arch: 'arm64'
    Compiler: 'Mingw'
@@ -2,14 +2,11 @@ Version: 2
 Module only: True
 Include: [
  cmake_platforms.yaml: [
-    'ubuntu-22.04'
+    "ubuntu-22.04"
  ]
 ]
-Configurations:
+Configurations: []
+Overrides:
 -
-    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'
+    Id: 'ubuntu-22.04'
+    Features: ['Axivion', 'DisableTests', 'UseConfigure', 'VMSize16']
@@ -1,28 +0,0 @@
-Version: 2
-Module only: True
-Include: [
-  cmake_platforms.yaml: [
-    'ubuntu-24.04-x64'
-  ]
-]
-Configurations:
-
-    Id: 'imx8-arm64-developer-build-2404'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
-    Target os: 'IMX8'
-    Target arch: 'arm64'
-    Compiler: 'GCC'
-    Platform dependency: 'ubuntu-24.04-x64'
-    Features: ['Elinux', 'Sccache', 'UseConfigure', 'DoNotAbortTestingOnFirstFailure']
-    Environment variables: [
-      '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=/opt/b2qt/imx8qm/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux-" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
-      'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE="/opt/b2qt/imx8qm/sysroots/x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake" -DQT_FORCE_BUILD_TOOLS=ON -DQT_NO_PACKAGE_VERSION_INCOMPATIBLE_WARNING=TRUE',
-      'QT_YOCTO_ENVSETUP=/opt/b2qt/imx8qm/environment-setup-cortexa72-cortexa53-crypto-poky-linux',
-      'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin',
-      'QT_SYSROOT_FOR_RUNNING_TESTS=/opt/b2qt/imx8qm/sysroots/cortexa72-cortexa53-crypto-poky-linux',
-      'GST_PLUGIN_SCANNER=/opt/b2qt/imx8qm/sysroots/cortexa72-cortexa53-crypto-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
-      'QT_QUICK_BACKEND=software',
-      'VCPKG_HOST_TRIPLET=x64-linux-qt',
-      'VCPKG_TARGET_TRIPLET=arm64-linux-qt'
-    ]
-
@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
    Id: 'windows-11_24H2-msvc2022-unity-build'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests']
    Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib'
@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease']
    Configure arguments: ''
@@ -21,14 +21,14 @@ Configurations:
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-macos-15-arm-105'
+    Template: 'qtci-macos-15-arm-104'
    Compiler: 'Clang'
    Features: ['Sccache', 'DebugAndRelease']
    Configure arguments: ''
    Environment variables: []
 # without tests
 -
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    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-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
    Configure arguments: ''
@@ -55,7 +55,7 @@ Configurations:
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-macos-15-arm-105'
+    Template: 'qtci-macos-15-arm-104'
    Compiler: 'Clang'
    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
    Configure arguments: ''
@@ -13,6 +13,6 @@ Configurations:
    Features: ['TestOnly']
 -
    Id: 'qtgp-on-windows-24h2'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'MSVC2022'
    Features: ['TestOnly']
@@ -53,7 +53,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-4.3.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.30.5/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',
@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
    Id: 'macos-quick-bridges'
-    Template: 'qtci-macos-15-arm-105'
+    Template: 'qtci-macos-15-arm-104'
    Compiler: 'Clang'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'Insignificant']
    Configure arguments: >
@@ -46,7 +46,7 @@ Configurations:
    Environment variables: []
 -
    Id: 'windows-quick-bridges'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'MSVC2022'
    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'Insignificant']
    Configure arguments: >
@@ -12,7 +12,7 @@ Include: [
 Configurations:
 -
    Id: 'macos-quick-minimal'
-    Template: 'qtci-macos-15-arm-105'
+    Template: 'qtci-macos-15-arm-104'
    Compiler: 'Clang'
    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'MinimalStaticTests', 'Insignificant']
    Configure arguments: >
@@ -145,7 +145,7 @@ Configurations:
    ]
 -
    Id: 'macos-quick-minimal-tests'
-    Template: 'qtci-macos-15-arm-105'
+    Template: 'qtci-macos-15-arm-104'
    Compiler: 'Clang'
    Features: ['Sccache', 'TestOnly', 'InsignificantTests', 'Insignificant']
    Platform dependency: 'macos-quick-minimal'
@@ -293,7 +293,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24H2-msvc2022-static-quicklite'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'UseConfigure', 'DisableTests', 'Insignificant']
    Configure arguments: >
@@ -34,7 +34,7 @@ Configurations:
        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_34'
    ]
 -
-    Id: "automotive-android-12-x86_64-on-linux-rhel_9_6"
+    Id: "automotive-android-10-x86_64-on-linux-rhel_9_6"
    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Target os: 'Android_ANY'
    Target arch: 'x86_64'
@@ -47,5 +47,5 @@ Configurations:
        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_31'
+        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_29'
    ]
@@ -12,28 +12,28 @@ Include: [
 Configurations:
 -
    Id: 'windows-quick-bridges-dotnet'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'MSVC2022'
    Platform dependency: 'windows-quick-bridges'
    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesDotnet']

 -
    Id: 'windows-quick-bridges-rust'
-    Template: 'qtci-windows-11_24H2-x86_64-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    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-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    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-73'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'MSVC2022'
    Platform dependency: 'windows-quick-bridges'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesJava']
@@ -61,21 +61,21 @@ Configurations:

 -
    Id: 'macos-quick-bridges-java'
-    Template: 'qtci-macos-15-arm-105'
+    Template: 'qtci-macos-15-arm-104'
    Compiler: 'Clang'
    Platform dependency: 'macos-quick-bridges'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesJava']

 -
    Id: 'macos-quick-bridges-python'
-    Template: 'qtci-macos-15-arm-105'
+    Template: 'qtci-macos-15-arm-104'
    Compiler: 'Clang'
    Platform dependency: 'macos-quick-bridges'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']

 -
    Id: 'macos-quick-bridges-swift'
-    Template: 'qtci-macos-15-arm-105'
+    Template: 'qtci-macos-15-arm-104'
    Compiler: 'Clang'
    Platform dependency: 'macos-quick-bridges'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesSwift']
@@ -12,5 +12,5 @@ Configurations:
    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
    Target os: 'WebAssembly'
    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Features: ['Sccache', 'TestOnly']
    Platform dependency: 'webassembly-linux-thread-asyncify-new'
@@ -63,9 +63,3 @@ 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
@@ -15,11 +15,6 @@ that might need updates in the future:
    layout and logic of the app, this shouldn't need to be touched.
 - AndroidManifest.xml / app/build.gradle: Sets project settings like target version.
 - gradle/libs.versions.toml: This sets the version numbers of various dependencies.
- feature/: an on-demand dynamic feature module, it caches the
-    com.android.dynamic-feature plugin and the Play feature delivery library
-    used by the Feature Delivery tests.
- build.gradle: also declares org.qtproject.qt.gradleplugin to cache the Qt
-    Gradle Plugin used by Qt for Android Studio projects.

 Other files required for the project build are gradle wrapper and scripts which
 are fetched by android_linux.sh from qtbase.
@@ -18,13 +18,10 @@ android {
        sourceCompatibility JavaVersion.VERSION_17
        targetCompatibility JavaVersion.VERSION_17
    }
-
-    dynamicFeatures = [':feature']
 }

 dependencies {
    implementation libs.core
    implementation libs.appcompat
    implementation libs.material
-    implementation libs.play.feature.delivery
 }
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="feature_title">Feature</string>
-</resources>
@@ -1,6 +1,4 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
 alias(libs.plugins.androidApplication) apply false
-alias(libs.plugins.androidDynamicFeature) apply false
-alias(libs.plugins.qtGradlePlugin) apply false
 }
@@ -1,17 +0,0 @@
-plugins {
-    alias(libs.plugins.androidDynamicFeature)
-}
-
-android {
-    namespace 'com.example.gradle_project.feature'
-    compileSdk 36
-
-    defaultConfig {
-        minSdk 28
-    }
-}
-
-dependencies {
-    implementation project(':app')
-    implementation libs.play.feature.delivery
-}
@@ -1,12 +0,0 @@
-<?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>
@@ -1,7 +0,0 @@
-package com.example.gradle_project.feature;
-
-public class Feature {
-    public static String hello() {
-        return "hello";
-    }
-}
@@ -4,19 +4,14 @@ core = "1.17.0"
 appcompat = "1.7.1"
 material = "1.13.0"
 constraintlayout = "2.2.1"
-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" }
 constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
-play-feature-delivery = { module = "com.google.android.play:feature-delivery", version.ref = "play-feature-delivery" }

 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
-androidDynamicFeature = { id = "com.android.dynamic-feature", version.ref = "agp" }
-qtGradlePlugin = { id = "org.qtproject.qt.gradleplugin", version.ref = "qt-gradle-plugin" }

 [bundles]
@@ -14,4 +14,4 @@ dependencyResolutionManagement {
 }

 rootProject.name = "gradle_project"
-include ':app', ':feature'
+include ':app'
@@ -50,9 +50,9 @@ sdkApiLevelAutomotiveMax="android-34"
 androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
 androidAutomotiveMaxSha="2cc5dae4fd0bdefb188a3b84019d0d1e65501519"
 # Android Automotive min SDK level image
-sdkApiLevelAutomotiveMin="android-31"
+sdkApiLevelAutomotiveMin="android-29"
 androidAutomotiveMinUrl="$basePath/${sdkApiLevelAutomotiveMin}_automotive.tar.gz"
-androidAutomotiveMinSha="0b6498e0c0022c40b8bb2b275f704e6a298c04a3"
+androidAutomotiveMinSha="e6092585c00f87eb3b20a2eb7fdf6add42342d2f"

 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
@@ -78,25 +78,18 @@ 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 '$ndkTargetDir'"
+    echo "Unzipping Android NDK to '$targetFolder'"
    # 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 "$ndkTargetDir"
+    sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
    rm "$ndkTargetFile"
-    androidNdkRoot="${ndkTargetDir}/${zipBase}"
+    androidNdkRoot="${targetFolder}/${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"
@@ -112,6 +105,10 @@ 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"
@@ -202,23 +199,6 @@ echo "Unzipping the Android 16 to $maxVersionDestination"
 sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination"
 rm "$maxVersionFilePath"

-echo "Download and unzip Android 17 Beta 3 16KB System Image"
-insignificantMaxVersionFileName="x86_64-ps16k-37.0_r03.zip"
-insignificantMaxVersionDestination="$sdkTargetFolder/system-images/android-37/google_apis_ps16k/"
-insignificantMaxVersionFilePath="$insignificantMaxVersionDestination/$insignificantMaxVersionFileName"
-insignificantMaxVersionCiUrl="$basePath/system_images/google_apis/$insignificantMaxVersionFileName"
-insignificantMaxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$insignificantMaxVersionFileName"
-insignificantMaxVersionSha1="b89a6686f9a9e9942d596bed45d422cbccb70c98"
-
-mkdir -p "$insignificantMaxVersionDestination"
-DownloadURL "$insignificantMaxVersionCiUrl" "$insignificantMaxVersionUrl" "$insignificantMaxVersionSha1" "$insignificantMaxVersionFilePath"
-
-echo "Unzipping the Android 17 Beta3 16KB to $insignificantMaxVersionDestination"
-sudo unzip -o -q "$insignificantMaxVersionFilePath" -d "$insignificantMaxVersionDestination"
-# Hack to avoid SDK version bug in source.properties file, the usage of ".0" messes things for avdmanager. TODO: undo when official comes
-sudo sed -i 's/AndroidVersion.ApiLevel=37.0/AndroidVersion.ApiLevel=37/g' "$insignificantMaxVersionDestination/x86_64/source.properties"
-rm "$insignificantMaxVersionFilePath"
-
 echo "Checking the contents of Android SDK again..."
 ls -l "$sdkTargetFolder"

@@ -228,9 +208,6 @@ echo "no" | ./avdmanager create avd -n emulator_x86_api_28 -c 2048M -f \
 echo "no" | ./avdmanager create avd -n emulator_x86_64_api_36 -c 2048M -f \
    -k "system-images;android-36;google_apis;x86_64"

-echo "no" | ./avdmanager create avd -n emulator_x86_64_api_37 -c 2048M -f \
-    -k "system-images;android-37;google_apis,page_size_16kb,ai_glasses_compatible;x86_64"
-
 echo "Install maximum supported SDK level image for Android Automotive $sdkApiLevelAutomotiveMax"
 DownloadURL "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxSha" \
    "/tmp/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
@@ -242,7 +219,7 @@ echo "Install minimum supported SDK level image for Android Automotive $sdkApiLe
 DownloadURL "$androidAutomotiveMinUrl" "$androidAutomotiveMinUrl" "$androidAutomotiveMinSha" \
    "/tmp/${sdkApiLevelAutomotiveMin}_automotive.tar.gz"
 sudo tar -xzf "/tmp/${sdkApiLevelAutomotiveMin}_automotive.tar.gz" -C $sdkTargetFolder/system-images
-echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_31 -c 2048M -f \
+echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_29 -c 2048M -f \
    -k "system-images;${sdkApiLevelAutomotiveMin};android-automotive;x86_64"

 # Purely informative, show the list of avd devices
@@ -22,9 +22,6 @@
            "_active": true,
            "excludes": [
                "$(splitpath:EXCLUDE_FILES)"
-            ],
-            "includes": [
-                "$(splitpath:INCLUDE_FILES)"
            ]
        },
        "Frameworks-QtSupport": {
@@ -275,17 +272,14 @@
        "Stylechecks": {
            "excludes": [
                "$(splitpath:EXCLUDE_FILES)"
-            ],
-            "includes": [
-                "$(splitpath:INCLUDE_FILES)"
            ]
        }
    },
    "_Format": "1.0",
    "_VersionNum": [
        7,
-        11,
-        5,
-        19102
+        10,
+        4,
+        17655
    ]
 }
@@ -10,22 +10,4 @@ export EXCLUDE_FILES="build/*:src/3rdparty/*"
 export MODULE=$TESTED_MODULE_COIN
 export PACKAGE="Add-ons"
 export IRNAME=build/$TESTED_MODULE_COIN.ir
-
-ROOT_DIR=src
-MAGIC="Qt-Security score:critical"
-
-INCLUDE_FILES=""
-
-while IFS= read -r file; do
-    if [ -z "$INCLUDE_FILES" ]; then
-        INCLUDE_FILES="$file"
-    else
-        INCLUDE_FILES="$INCLUDE_FILES:$file"
-    fi
-done <<EOF
-$(grep -rl "$MAGIC" "$ROOT_DIR")
-EOF
-
-export INCLUDE_FILES
-
 axivion_ci "$@"
@@ -11,26 +11,13 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-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"
+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"
 targetFolder="/opt/cmake-$version"
-appPrefix="cmake-$version-linux-$arch"
+appPrefix="cmake-$version-linux-x86_64"

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

@@ -1,66 +0,0 @@
-#!/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
-
-set -e
-
-OS_STATE_DIR="/var/lib/qtciid"
-OS_STATE_FILE="$OS_STATE_DIR/os-version"
-
-get_os_id() {
-    if [[ -r /etc/os-release ]]; then
-        # shellcheck disable=SC1091
-        . /etc/os-release
-        # os-release contains ID of the distro (e.g. 'ubuntu')
-        # VERSION e.g. '24.04.1 LTS (Noble Numbat)'
-        if [[ -n "${ID:-}" && -n "${VERSION:-}" ]]; then
-            echo "${ID}:${VERSION}"
-            return 0
-        fi
-    fi
-
-    echo "unknown:unknown"
-    return 1
-}
-
-record_os_version() {
-    local os_id
-
-    os_id="$(get_os_id)"
-
-    if [[ "$os_id" == "unknown:unknown" ]]; then
-        echo "ERROR: Unable to determine OS version"
-        exit 1
-    fi
-
-    sudo mkdir -p "$OS_STATE_DIR"
-    echo "$os_id" | sudo tee "$OS_STATE_FILE" > /dev/null
-
-    echo "OS version: $os_id"
-}
-
-verify_os_version_unchanged() {
-    if [[ ! -f "$OS_STATE_FILE" ]]; then
-        echo "ERROR: OS version state file missing: $OS_STATE_FILE"
-        exit 1
-    fi
-
-    local start_version current_version
-
-    start_version="$(cat "$OS_STATE_FILE")"
-    current_version="$(get_os_id)"
-
-    if [[ "$current_version" == "unknown:unknown" ]]; then
-        echo "ERROR: Unable to determine current OS version"
-        exit 1
-    fi
-
-    if [[ "$start_version" != "$current_version" ]]; then
-        echo "ERROR: OS version changed during provisioning!"
-        echo "  Start version : $start_version"
-        echo "  End version   : $current_version"
-        exit 1
-    fi
-
-    echo "OS version unchanged ($current_version)"
-}
@@ -1,3 +0,0 @@
-diffutils
-make
-yasm
@@ -1,4 +0,0 @@
-diffutils
-libva-devel
-make
-yasm
@@ -1,3 +0,0 @@
-diffutils
-make
-yasm
@@ -1,4 +0,0 @@
-diffutils
-libva-dev
-make
-yasm
@@ -21,13 +21,13 @@ 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"
+    local nv_codec_version="11.1" # use 11.1 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/heads/sdk/$nv_codec_version.zip"
+    local nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-sdk-$nv_codec_version.zip"
+    local nv_codec_sha1="ceb4966ab01b2e41f02074675a8ac5b331bf603e"
    #nv_codec_sha1="4f30539f8dd31945da4c3da32e66022f9ca59c08" // 12.0
    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-sdk-$nv_codec_version"

    if [ ! -d  "$nv_codec_dir" ]; then
        source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
@@ -17,8 +17,8 @@ APPNAME="CiNetworkTest"
 EXECPATH="${ROOT}/${APPNAME}/bin"
 EXEC="${EXECPATH}/${APPNAME}"
 URL="https://ci-files01-hki.ci.qt.io/input/networktestapp"
-TARBALL="CiNetworkTest-rhel-linux-x86_64-v1.2.tgz"
-sha256="2be05baebf48ff29ebcd06a0761b2a3d92ae5a66f78d0cd953513d8271eb7f83"
+TARBALL="CiNetworkTest-rhel-linux-x86_64-v1.1.tgz"
+sha256="3a23593f163ca2452546d20d56cabc81fed03c930d6d96334a22827da5a6840a"
 SOURCE="$URL/$TARBALL"
 InstallFromCompressedFileFromURL "$SOURCE" "" "$sha256" "$ROOT" "$PREFIX"

@@ -4,7 +4,9 @@

 echo "Installing vcpkg android ports"

-pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit
+pushd "${BASH_SOURCE%/*}/vcpkg" || exit
+cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" .
+
 "$VCPKG_ROOT/vcpkg" install --triplet x86-android-qt --x-install-root x86-android-qt-tmp --debug
 "$VCPKG_ROOT/vcpkg" install --triplet x86_64-android-qt --x-install-root x86_64-android-qt-tmp --debug

@@ -7,11 +7,12 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

 echo "Installing vcpkg ports"

-pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit
+pushd "${BASH_SOURCE%/*}/vcpkg" || exit
+cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" .

-install_root=$1-tmp
+install_root=x64-linux-qt-tmp

-"$VCPKG_ROOT/vcpkg" install --triplet $1 --x-install-root $install_root --debug
+"$VCPKG_ROOT/vcpkg" install --triplet x64-linux-qt --x-install-root $install_root --debug

 cmake "-DVCPKG_EXECUTABLE=$VCPKG_ROOT/vcpkg"\
    "-DVCPKG_INSTALL_ROOT=$PWD/$install_root"\
@@ -25,7 +26,5 @@ 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
@@ -34,7 +34,7 @@ do
        "vcpkg_tool_release_tag")
            vcpkgToolReleaseTag=${keyValue[1]}
            ;;
-        "unix_checksum")
+        "linux_checksum")
            vcpkgToolChecksum=${keyValue[1]}
            ;;
    esac
@@ -86,7 +86,7 @@ SetEnvVar "VCPKG_ROOT" "$vcpkgRoot"
 export VCPKG_ROOT="$vcpkgRoot"

 # Set a source for vcpkg Binary and Asset Cache
-# The `coin/provisioning/common/<platform>/mount-vcpkg-cache-drive.sh` script is
+# The `coin/provisioning/common/linux/mount-vcpkg-cache-drive.sh` script is
 # mounting the SMB share located in `vcpkg-server.ci.qt.io/vcpkg` to
 # $HOME/vcpkg-cache/
 export VCPKG_BINARY_SOURCES="files,$HOME/vcpkg-cache/binaries,readwrite"
@@ -13,7 +13,7 @@ QEMU_VER="8.2.3"
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/qemu/qemu-$QEMU_VER.tar.xz"
 AltUrl="https://download.qemu.org/qemu-$QEMU_VER.tar.xz"
 SHA1="1b29c8105cf8d15b9e7fb6f8e85170b6c54a1788"
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "/tmp" ""
+InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "/tmp" "$appPrefix"

 targetFolder=/tmp/qemu-${QEMU_VER}
 mkdir -p "$targetFolder/build"
@@ -43,9 +43,9 @@ if [ ! -d "$targetFolder" ]; then
 fi

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

 sudo cp "$aarch64le_toolchain" "$targetPath"
@@ -43,17 +43,9 @@ if [ ! -d "$targetFolder" ]; then
 fi

 # QNX SDP
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20260410.tar.xz"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20250612.tar.xz"
 targetFile="qnx800.tar.xz"
-sha1="a3fdcd98e12bc5054d00f18e4088af26288fd020"
-DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
-
-# IANA timezone database overlay. Packaged separately from the SDP so it can be
-# bumped without rebuilding the SDP tarball. Archive root is qnx800/target/qnx/
-# so it overlays onto $targetFolder (/opt/) directly.
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/zoneinfo-2026a.tar.xz"
-targetFile="zoneinfo.tar.xz"
-sha1="8c1678ff673bb588f63fc9277497cd38e0ea2253"
+sha1="d7ca20be6867b569067a17e8b3fa633c7eadad89"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"

 sudo cp "$aarch64le_toolchain" "$targetPath"
@@ -1,9 +1,3 @@
-# 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/fonts/fonts.conf
+var/etc/fontconfig/fonts.conf=etc/fontconfig/fonts.conf
 var/share/fonts=usr/share/fonts

 var/etc/hosts=local/misc_files/etc/hosts
@@ -1,3 +0,0 @@
-# local/snippets/ifs_files.custom
-# Placeholder for local list of files to add to ifs
-/usr/libexec/sshd-session=usr/libexec/sshd-session
@@ -18,8 +18,6 @@ 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.26=usr/lib/libfreetype.so.26
+lib/libfreetype.so.24=usr/lib/libfreetype.so.24
 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.17=usr/lib/libfontconfig.so.17
+lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1
 xbin/fc-cache=bin/fc-cache
 xbin/fc-match=local/misc_files/fc-match

@@ -1,9 +1,3 @@
-# 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/fonts/fonts.conf
+var/etc/fontconfig/fonts.conf=etc/fontconfig/fonts.conf
 var/share/fonts=usr/share/fonts

 var/etc/hosts=local/misc_files/etc/hosts
@@ -22,7 +22,7 @@ lib/libEGL.so.1=usr/lib/libEGL.so.1
 lib/libz.so.2=usr/lib/libz.so.2
 lib/libzstd.so.1=usr/lib/libzstd.so.1
 lib/libxml2.so.2=usr/lib/libxml2.so.2
-lib/libfreetype.so.26=usr/lib/libfreetype.so.26
+lib/libfreetype.so.24=usr/lib/libfreetype.so.24
 lib/libbz2.so.1=usr/lib/libbz2.so.1
 lib/liblzma.so.5=usr/lib/liblzma.so.5
 lib/libdbus-1.so=usr/lib//libdbus-1.so
@@ -53,13 +53,8 @@ xbin/fsevmgr=sbin/fsevmgr
 ##############################################
 lib/libscreen.so.1=usr/lib/libscreen.so.1

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

@@ -6,13 +6,13 @@ set -ex

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

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

-installSccache "$targetArch" "$targetVersion" "$sha256"
+installSccache "$targetArch" "$targetVersion" "$sha1"
@@ -1,39 +0,0 @@
-#!/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
@@ -1,20 +0,0 @@
-#!/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 verifies that all installed packages originate from the current release version and not from newer releases.
-# The caller provides a regex that matches the allowed release version and excludes packages from newer releases.
-
-set -ex
-
-verify_release_packages() {
-    local regex_verify="$1"
-
-    if rpm -qa --queryformat="%{NAME} %{RELEASE}\n" | grep -E " .*$regex_verify" >/dev/null; then
-        echo "Found packages that belong to other RHEL release, aborting"
-        exit 1
-    else
-        echo "All package versions checked OK"
-    fi
-}
-
@@ -69,16 +69,13 @@ 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 '$ndkTargetDir'"
+    echo "Unzipping Android NDK to '$targetFolder'"
    # 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 "$ndkTargetDir"
+    sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
    rm "$ndkTargetFile"
-    androidNdkRoot="${ndkTargetDir}/${zipBase}"
+    androidNdkRoot="${targetFolder}/${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="4.3"
-version="4.3.2"
+majorminorversion="3.30.5"
+version="3.30.5"
 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="e3b456c03d992239f9d83d933336768c7fc1ff54"
+SHA1="c81c2f7482a901c4a32a81034920c23c22233a0f"
 appPrefix="cmake-$version-macos-universal"

 InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
@@ -1,2 +0,0 @@
-diffutils
-yasm
@@ -26,14 +26,9 @@ readonly MINIMUM_IOS_VERSION="16.0"

 source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh"

+ffmpeg_version=$(ffmpeg_version_default)
 ffmpeg_source_dir=$(download_ffmpeg)
-ffmpeg_version="n$(<"${ffmpeg_source_dir}/RELEASE")"
-if [ ! -n "$ffmpeg_version" ]; then
-    echo "Error. Unable to determine FFmpeg version."
-    exit 1
-fi
-ffmpeg_build_type="shared"
-ffmpeg_config_options=$(get_ffmpeg_config_options "$ffmpeg_build_type")
+ffmpeg_config_options=$(get_ffmpeg_config_options "shared")
 default_prefix="/usr/local/ios/ffmpeg"
 prefix="${1:-$default_prefix}"

@@ -101,6 +96,8 @@ build_ffmpeg_ios() {
        --extra-cxxflags="${common_arch_flags}"
        --extra-ldflags="${common_arch_flags}"
        --target-os=darwin
+        --enable-shared
+        --disable-static
        --install-name-dir="@rpath"
        --disable-audiotoolbox

@@ -41,11 +41,7 @@ build_ffmpeg() {
    popd
 }

-# Install required packages through Brew
-required_ffmpeg_packages=()
-while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../macos/ffmpeg_required_brew_packages.txt"
-brew install "${required_ffmpeg_packages[@]}"
-
+brew install yasm
 export MACOSX_DEPLOYMENT_TARGET=12
 fix_relative_dependencies="${BASH_SOURCE%/*}/../macos/fix_relative_dependencies.sh"

@@ -19,7 +19,7 @@ class Libiodbc < Formula

  def install
    if build.with? "universal"
-      ENV['CFLAGS'] = '-O -arch arm64 -arch x86_64 -mmacosx-version-min=10.9 -std=gnu89'
+      ENV['CFLAGS'] = '-O -arch arm64 -arch x86_64 -mmacosx-version-min=10.9'
    end
    system "./autogen.sh"
    system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
@@ -0,0 +1,35 @@
+#!/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.15.0
+targetVersion=v0.11.0
 if [[ `arch` == arm* ]]; then
    targetArch=aarch64-apple-darwin
-    sha256=430ef7b5f54256d3ed5bfe77e8b0afc51aa209aeebe4f95b69c3a52ce3acc6e9
+    sha1=3261ab99e5bb1f9f36eafa597d11491bd85da5ec
 else
    targetArch=x86_64-apple-darwin
-    sha256=f8da93e0689122268f720ddb48c8357f3da18be8c88aff23a8e75a7a219367db
+    sha1=57810789bf2813dfa9bf5da26a712dc30b56ce16
 fi
-installSccache "$targetArch" "$targetVersion" "$sha256"
+installSccache "$targetArch" "$targetVersion" "$sha1"
@@ -1,39 +0,0 @@
-#!/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-avdevice --disable-avfilter
+--disable-programs --disable-doc --disable-debug --enable-network --disable-lzma --enable-pic --disable-vulkan --disable-v4l2-m2m --disable-decoder=truemotion1
@@ -8,27 +8,25 @@ lib_dir="$1/lib"
 additional_suffix="${2:-}"
 set_rpath="${3:-yes}"
 page_size="${4:-}"
-custom_readelf="${5:-""}"

-# If custom_readelf is not provided, we fallback to host readelf.
-if [ -n "$custom_readelf" ]; then
-    if ! command -v "$custom_readelf"; then
-        echo "Error. Provided readelf executable '${custom_readelf}' is not a valid executable"
+# readelf and patchelf are prerequisite tools for this script. Check
+# that they are available.
+if [ "$(uname -s)" = "Darwin" ]; then
+    # Under Homebrew, binutils package is not symlinked into PATH.
+    # This lets us use readelf provided by Homebrew.
+    readelf_homebrew_path="$(brew --prefix binutils)/bin/readelf"
+    if [[ ! -x "$readelf_homebrew_path" ]]; then
+        echo "Found no valid readelf executable. It is possible it was not correctly installed through Homebrew."
        exit 1
    fi
-elif ! command -v readelf; then
+    readelf() { "$readelf_homebrew_path" "$@"; }
+fi
+
+if ! command -v readelf; then
    echo "Found no valid readelf command. It is possible it was not correctly installed."
    exit 1
 fi

-readelf_wrapper() {
-    if [ -n "$custom_readelf" ]; then
-        "$custom_readelf" "$@"
-    else
-        readelf "$@"
-    fi
-}
-
 if ! command -v patchelf; then
    echo "Found no valid patchelf command. It is possible it was not correctly installed."
    exit 1
@@ -40,7 +38,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" "avformat" "avutil" "swresample" "swscale")
+ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale")
 stub_prefix="Qt6FFmpegStub-"

 for lib_name in "${ffmpeg_libs[@]}"; do
@@ -59,7 +57,7 @@ for lib_name in "${ffmpeg_libs[@]}"; do
    fi

    read_needed_deps() {
-        readelf_wrapper -d "$lib_path" | grep '(NEEDED)'
+        readelf -d "$lib_path" | grep '(NEEDED)'
    }

    while read -r line; do
@@ -2,8 +2,8 @@
  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json",
  "default-registry": {
    "kind": "git",
-    "repository": "https://git.qt.io/qtbuildsystem/vcpkg",
+    "repository": "https://git.qt.io/aledelev/vcpkg",
    "baseline": "9c5c2a0ab75aff5bcd08142525f6ff7f6f7ddeee"
  },
-  "overlay-triplets": [ "./../triplets" ]
+  "overlay-triplets": [ "./../../shared/triplets" ]
 }
@@ -1 +1,2 @@
-https://git.qt.io/qtbuildsystem/vcpkg.git
+https://git.qt.io/aledelev/vcpkg.git
+https://git.qt.io/mrmsdbdl/vcpkg-mirror.git
@@ -1,4 +1,4 @@
 vcpkg_tool_release_tag=2025-09-03
 windows_x64_checksum=4523B5B2CE77BD0F6DCA55140D831EA6EB03046D5F4496C85DF94AC1A7EFAB01
 windows_arm64_checksum=1E8653243C0E7D73FF1F0F3F25A55C8154888F331510F9545AD200EDD3CCB962
-unix_checksum=f0c4b30afc2f7baa9cc4372ac325042418251343e0192dbfac94c4f602e9d3ed
+linux_checksum=f0c4b30afc2f7baa9cc4372ac325042418251343e0192dbfac94c4f602e9d3ed
@@ -2,9 +2,13 @@
 # Copyright (C) 2024 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

+ffmpeg_version_default() {
+    echo "n7.1.3"
+}
+
 download_ffmpeg() {
-    local version="${1:-"n7.1.5"}"
-    local sha1="${2:-2322a4cef2d607c7f0048953662ec5e27c587ae8}"
+    local version="${1:-$(ffmpeg_version_default)}"
+    local sha1="${2:-27051817deec88bed3b9652d49f9127d22268d83}"

    local ffmpeg_name="FFmpeg-$version"
    local target_dir="$HOME"
@@ -124,14 +124,8 @@ build_ffmpeg_android() {
        if [ $page_size == "use_16kb_page_size" ]; then
            page_size_arg="16384"
        fi
-        local set_rpath_arg="no"
-        local readelf_path_arg="${toolchain_bin}/llvm-readelf"
-        sudo "$fix_dependencies" \
-            "$target_dir" \
-            "$libs_prefix" \
-            "$set_rpath_arg" \
-            "$page_size_arg" \
-            "$readelf_path_arg"
+
+        sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no" "$page_size_arg"
    fi
 }

@@ -9,19 +9,19 @@ source "${BASH_SOURCE%/*}/DownloadURL.sh"
 # shellcheck source=./SetEnvVar.sh
 source "${BASH_SOURCE%/*}/SetEnvVar.sh"

-# This script will install go 1.26.2
-version="1.26.2"
+# This script will install go 1.25.2
+version="1.25.2"

 if [[ "$os" == "linux" ]]; then
    uname_m="$(uname -m)"
    case "$uname_m" in
        x86_64|amd64)
-            sha256="990e6b4bbba816dc3ee129eaeaf4b42f17c2800b88a2166c265ac1a200262282"
+            sha256="a08c8c36946c86890ca46185765da34442ce64aa"
            pkgname="go$version.linux-amd64.tar.gz"
            dirname="go$version.linux-amd64"
            ;;
        arm64|aarch64)
-            sha256="c958a1fe1b361391db163a485e21f5f228142d6f8b584f6bef89b26f66dc5b23"
+            sha256="13690a4ecac03e6cca6988a6d2ce80bfa938eb7b"
            pkgname="go$version.linux-arm64.tar.gz"
            dirname="go$version.linux-arm64"
            ;;
@@ -31,12 +31,12 @@ elif [ "$os" == "macos" ]; then
    uname_m="$(uname -m)"
    case "$uname_m" in
        x86_64|amd64)
-            sha256="bc3f1500d9968c36d705442d90ba91addf9271665033748b82532682e90a7966"
+            sha256="eda89df8fd85a49e4046f85340236248a5d2a7cd"
            pkgname="go$version.darwin-amd64.tar.gz"
            dirname="go$version.darwin-amd64"
            ;;
        arm64|aarch64)
-            sha256="32af1522bf3e3ff3975864780a429cc0b41d190ec7bf90faa661d6d64566e7af"
+            sha256="1745a71d18f9946f7aac9f9528e3227c8132cc08"
            pkgname="go$version.darwin-arm64.tar.gz"
            dirname="go$version.darwin-arm64"
            ;;
@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
-# Copyright (C) 2025 The Qt Company Ltd.
+# Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

 # This script install OpenSSL from sources.
 # Requires GCC and Perl to be in PATH.
 set -ex
 os="$1"
-version=${2:-"3.5.4"}
-sha=${3:-"b75daac8e10f189abe28a076ba5905d363e4801f"}
+version=${2:-"3.0.7"}
+sha=${3:-"f20736d6aae36bcbfa9aba0d358c71601833bf27"}

 SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 # shellcheck source=../unix/DownloadURL.sh
@@ -104,18 +104,6 @@ elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then
    SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\""
    SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\""

-    # Set runtime loader (dyld) and OpenSSL providers for SSL tests (QTBUG-142392)
-    SetEnvVar "DYLD_LIBRARY_PATH" "\"$opensslTargetLocation/lib:\$DYLD_LIBRARY_PATH\""
-    SetEnvVar "OPENSSL_MODULES" "\"$opensslTargetLocation/lib/ossl-modules\""
-    # Check that the versioned dylibs exists and ML-DSA is available
-    test -f "$opensslTargetLocation/lib/libcrypto.3.dylib"
-    test -f "$opensslTargetLocation/lib/libssl.3.dylib"
-    test -d "$opensslTargetLocation/lib/ossl-modules"
-
-    OPENSSL_MODULES="$opensslTargetLocation/lib/ossl-modules" \
-    "$opensslTargetLocation/bin/openssl" list -signature-algorithms | \
-    grep -q -i 'ML-DSA' || { echo "ML-DSA not available"; exit 1; }
-
    security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a "$opensslTargetLocation/ssl/cert.pem" > /dev/null
    security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a "$opensslTargetLocation/ssl/cert.pem" > /dev/null
 fi
@@ -1,112 +0,0 @@
-#!/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
-}
@@ -22,13 +22,3 @@ 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"
@@ -5,23 +5,21 @@
 # This script install prebuilt OpenSSL which was built against Android NDK 25.
 # OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories

-set -eux
+set -ex
 # shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-outputPathBase="${HOME}"
-
-sslVersionForLatest="3.5.4"
+sslVersionForLatest="3.0.7"
 ndkVersionLatest="r27c"
-featureSuffixLatest="_16kb_fixed_symversions"
-prebuiltOpensslShaLatest="b9dc30ed77bfd26e526e81d558d6964585b27283"
+featureSuffixLatest="_16kb"
+prebuiltOpensslShaLatest="2cc15dd990460c2c7157ab257a47071fbd9e0ac8"

-sslVersionForPreview="3.5.4"
+sslVersionForPreview="3.0.7"
 ndkVersionPreview="r29-beta2"
-featureSuffixPreview="_16kb_fixed_symversions"
-prebuiltOpensslShaPreview="89b6692e983c7e9678dcd9fc03da623fb75593d3"
+featureSuffixPreview="_16kb"
+prebuiltOpensslShaPreview="76c9788216440111be97ea1a63c4d8cd807baacd"

 ndkVersionNightly1=$ndkVersionLatest
 sslVersionForNightly1=$sslVersionForLatest
@@ -33,126 +31,87 @@ sslVersionForNightly2=$sslVersionForLatest
 featureSuffixNightly2=""
 prebuiltOpensslShaNightly2=$prebuiltOpensslShaLatest

-: <<'EOB' SOURCE BUILD INSTRUCTIONS
-Openssl 3.5.4 prebuilt was made using Android NDK r27c Revision 27.2.12479018
-and r29-beta2 Revision 29.0.13599879
+: <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK r29-beta2
+# Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd"
+exports_file="/tmp/export.sh"
+# source previously made environmental variables.
+if uname -a |grep -q "Ubuntu"; then
+    # shellcheck disable=SC1090
+    grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file
+    rm -rf "$exports_file"
+else
+    # shellcheck disable=SC1090
+    grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file
+    rm -rf "$exports_file"
+fi

-By using a helpful (build_ssl.sh) script from:
-Android OpenSSL support for Qt
-https://github.com/KDAB/android_openssl/commit/b71f1470962019bd89534a2919f5925f93bc5779
-
-Download the same NDK version that the Qt branch supports
-https://developer.android.com/ndk/downloads
-
-Modify the script to your liking: set a path to NDK root, set OpenSSL version
-(script will download needed OpenSSL packages)
-Set ANDROID_API to the lowest version of Android which will be used.
+officialUrl="https://www.openssl.org/source/openssl-$sslVersionForLatest.tar.gz"
+cachedUrl="http://ci-files01-hki.ci.qt.io/input/openssl/openssl-$sslVersionForLatest.tar.gz"
+targetFile="/tmp/openssl-$sslVersionForLatest.tar.gz"
+sha="f20736d6aae36bcbfa9aba0d358c71601833bf27"
+opensslHome="${HOME}/openssl/android/openssl-${sslVersionForLatest}"
+DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
+mkdir -p "${HOME}/openssl/android/"
+tar -xzf "$targetFile" -C "${HOME}/openssl/android/"
+if uname -a |grep -q "Darwin"; then
+    TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64/bin
+else
+    TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin
+fi
+cd "$opensslHome"
+PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
+PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
 EOB

-function BuildOutputPath() {
-    local ndkVersion="$1"
-    local suffix="$2"
-    local sslVersion="$3"
-
-    echo "${outputPathBase}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}"
-}
-
 function InstallPrebuiltOpenssl() {
-    local ndkVersion="$1"
-    local suffix="$2"
-    local sha="$3"
-    local sslVersion="$4"
-    local output_dir="$5"

-    local prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
-    local targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
+    ndkVersion=$1
+    suffix=$2
+    sha=$3
+    sslVersion=$4
+
+    renamed_root="${HOME}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}"
+
+    prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
+    targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"

    DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"

-    local tmp_extract
    tmp_extract="$(mktemp -d "${TMPDIR:-/tmp}/openssl-extract.XXXXXX")"
    unzip -q -o "$targetFile" -d "$tmp_extract"
-    rm -f "$targetFile"
+    sudo rm -f "$targetFile"

    # We assume there is only one top-level directory in the openssl zip
-    local temp_openssl_root
    temp_openssl_root="$(find "$tmp_extract" -mindepth 1 -maxdepth 1 -type d | head -n 1)"
    if [[ -z "$temp_openssl_root" ]]; then
        echo "ERROR: Expected a single top-level directory in the archive, but none was found." >&2
-        exit 1
+        return 1
    fi

-    mv "$temp_openssl_root" "$output_dir"
+    mv "$temp_openssl_root" "$renamed_root"
    rm -rf "$tmp_extract"

-    # There have been cases where necessary symlinks are lost when unarchiving.
-    # Force-create them now.
-    local abi_list="arm64-v8a armeabi-v7a x86 x86_64"
-    for abi in $abi_list; do
-        ln -fs "${output_dir}/include" "${output_dir}/${abi}/include"
-        ln -fs "${output_dir}/${abi}/libcrypto_3.so" "${output_dir}/${abi}/libcrypto.so"
-        ln -fs "${output_dir}/${abi}/libssl_3.so" "${output_dir}/${abi}/libssl.so"
-    done
+    opensslHome="${renamed_root}"
 }

 if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then
-    outputDirNightly1=$(BuildOutputPath \
-        "$ndkVersionNightly1" \
-        "$featureSuffixNightly1" \
-        "$sslVersionForNightly1")
-
-    InstallPrebuiltOpenssl \
-        "$ndkVersionNightly1" \
-        "$featureSuffixNightly1" \
-        "$prebuiltOpensslShaNightly1" \
-        "$sslVersionForNightly1" \
-        "$outputDirNightly1"
-    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$outputDirNightly1"
-    echo "OpenSSL for Android ${ndkVersionNightly1} = ${sslVersionForNightly1}" >> ~/versions.txt
+    InstallPrebuiltOpenssl "$ndkVersionNightly1" "$featureSuffixNightly1" "$prebuiltOpensslShaNightly1" "$sslVersionForNightly1"
+    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$opensslHome"
+    echo "OpenSSL for Android $ndkVersionNightly1 = $sslVersionForNightly1" >> ~/versions.txt
 fi

 if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
-    outputDirNightly2=$(BuildOutputPath \
-        "$ndkVersionNightly2" \
-        "$featureSuffixNightly2" \
-        "$sslVersionForNightly2")
-
-    InstallPrebuiltOpenssl \
-        "$ndkVersionNightly2" \
-        "$featureSuffixNightly2" \
-        "$prebuiltOpensslShaNightly2" \
-        "$sslVersionForNightly2" \
-        "$outputDirNightly2"
-    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$outputDirNightly2"
-    echo "OpenSSL for Android ${ndkVersionNightly2} = ${sslVersionForNightly2}" >> ~/versions.txt
+    InstallPrebuiltOpenssl "$ndkVersionNightly2" "$featureSuffixNightly2" "$prebuiltOpensslShaNightly2" "$sslVersionForNightly2"
+    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY2" "$opensslHome"
+    echo "OpenSSL for Android $ndkVersionNightly2 = $sslVersionForNightly2" >> ~/versions.txt
 fi

 if [ "$ndkVersionPreview" != "$ndkVersionLatest" ]; then
-    outputDirPreview="$(BuildOutputPath \
-        "$ndkVersionPreview" \
-        "$featureSuffixPreview" \
-        "$sslVersionForPreview")"
-
-    InstallPrebuiltOpenssl \
-        "$ndkVersionPreview" \
-        "$featureSuffixPreview" \
-        "$prebuiltOpensslShaPreview" \
-        "$sslVersionForPreview" \
-        "$outputDirPreview"
-    SetEnvVar "OPENSSL_ANDROID_HOME_PREVIEW" "$outputDirPreview"
-    echo "OpenSSL for Android ${ndkVersionPreview} = ${sslVersionForPreview}" >> ~/versions.txt
+    InstallPrebuiltOpenssl "$ndkVersionPreview" "$featureSuffixPreview" "$prebuiltOpensslShaPreview" "$sslVersionForPreview"
+    SetEnvVar "OPENSSL_ANDROID_HOME_PREVIEW" "$opensslHome"
+    echo "OpenSSL for Android $ndkVersionPreview = $sslVersionForPreview" >> ~/versions.txt
 fi

-outputDirLatest="$(BuildOutputPath \
-    "$ndkVersionLatest" \
-    "$featureSuffixLatest" \
-    "$sslVersionForLatest")"
-
-InstallPrebuiltOpenssl \
-    "$ndkVersionLatest" \
-    "$featureSuffixLatest" \
-    "$prebuiltOpensslShaLatest" \
-    "$sslVersionForLatest" \
-    "$outputDirLatest"
-SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$outputDirLatest"
-echo "OpenSSL for Android ${ndkVersionLatest} = ${sslVersionForLatest}" >> ~/versions.txt
+InstallPrebuiltOpenssl "$ndkVersionLatest" "$featureSuffixLatest" "$prebuiltOpensslShaLatest" "$sslVersionForLatest"
+SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
+echo "OpenSSL for Android $ndkVersionLatest = $sslVersionForLatest" >> ~/versions.txt
@@ -36,6 +36,4 @@ 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
 }
@@ -15,15 +15,15 @@ if (Is64BitWinHost) {
 # Msys need to be installed to target machine
 # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html

-$openssl_version_latest = "3.5.4"
-$ndk_version_latest = "r27c_16kb"
-$prebuilt_ssl_sha1_latest = "a76cd9ec719d4e71473dcf451d648a9766247081"
-$openssl_sha1_latest = "b75daac8e10f189abe28a076ba5905d363e4801f"
+$openssl_version_latest = "3.0.7"
+$ndk_version_latest = "r27c"
+$prebuilt_ssl_sha1_latest = "733cff853b6ee7738e78b90f46b5f028c8490e1e"
+$openssl_sha1_latest = "f20736d6aae36bcbfa9aba0d358c71601833bf27"

-$openssl_version_preview = "3.5.4"
-$ndk_version_preview = "r29-beta2_16kb"
-$prebuilt_ssl_sha1_preview = "664bab8b4f5e01c8bb87ab0ea8333b2ef1af703d"
-$openssl_sha1_preview = "b75daac8e10f189abe28a076ba5905d363e4801f"
+$openssl_version_preview = "3.0.7"
+$ndk_version_preview = "r29-beta2"
+$prebuilt_ssl_sha1_preview = "c2cf8fabfb7e00b31abcc554e6e306dafd99ae1b"
+$openssl_sha1_preview = "f20736d6aae36bcbfa9aba0d358c71601833bf27"

 $openssl_version_nightly1 = $openssl_version_latest
 $ndk_version_nightly1 = $ndk_version_latest
@@ -52,26 +52,25 @@ $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, $5) {
+function Install($1, $2, $3, $4) {
    $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\$ndkVersion\$baseDirectory" -Force
+    Move-Item -Path ($tempExtractDir + "\" + $baseDirectory) -Destination "C:\Utils\Android\$baseDirectory" -Force
    Remove $zip

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

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

 if ($ndkVersionNightly1 -ne $ndkVersionLatest) {
    Write-Host "Installing Android NDK $ndkVersionNightly1"
-    $ndkFolderNightly = Install $ndkCachedUrlNightly1 $ndkZip $ndkChecksumNightly1 $ndkOfficialUrlNightly1 $ndkVersionNightly1
+    $ndkFolderNightly = Install $ndkCachedUrlNightly1 $ndkZip $ndkChecksumNightly1 $ndkOfficialUrlNightly1
    Set-EnvironmentVariable "ANDROID_NDK_ROOT_NIGHTLY1" $ndkFolderNightly
    Write-Output "Android NDK = $ndkVersionNightly1" >> ~/versions.txt
 }

 if ($ndkVersionNightly2 -ne $ndkVersionLatest) {
    Write-Host "Installing Android NDK $ndkVersionNightly2"
-    $ndkFolderNightly = Install $ndkCachedUrlNightly2 $ndkZip $ndkChecksumNightly2 $ndkOfficialUrlNightly2 $ndkVersionNightly2
+    $ndkFolderNightly = Install $ndkCachedUrlNightly2 $ndkZip $ndkChecksumNightly2 $ndkOfficialUrlNightly2
    Set-EnvironmentVariable "ANDROID_NDK_ROOT_NIGHTLY2" $ndkFolderNightly
    Write-Output "Android NDK = $ndkVersionNightly2" >> ~/versions.txt
 }
@@ -3,22 +3,22 @@

 . "$PSScriptRoot\helpers.ps1"

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

 $cpu_arch = Get-CpuArchitecture
 Write-Host "Installing CMake for architecture $cpu_arch"
 switch ($cpu_arch) {
    arm64 {
        $arch = "arm64"
-        $sha1 = "71949e4637accf5a92f35d357dc861e6a8d645cf"
-        $majorminorversion = "4.3"
-        $version = "4.3.2"
+        $sha1 = "408977a174476407bd660604f110a26ba41a6efd"
+        $majorminorversion = "3.30"
+        $version = "3.30.5"
        Break
    }
    x64 {
        $arch = "i386"
-        $sha1 = "abc3ae51ec5a11fb367a39ddfb7db0c9ea697a7b"
+        $sha1 = "d0636735c2d13a4443662605cd80c708f265eacc"
    }
    default {
        throw "Unknown architecture $cpu_arch"
@@ -10,7 +10,7 @@ $sdkChecksumSha1 = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
 $package_path = "C:\Windows\Temp\$package"

 Download $officialUrl $cachedUrl $package_path
-Verify-Checksum $package_path $sdkChecksumSha1
+Verify-Checksum $package_path $sdkChecksumSha1 sha1
 Write-Host "Installing DirectX SDK"
 Run-Executable $package_path "/u"

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Qt Submodule Update Bot	b3a9d45d2d	Update submodules on '6.11.0 in qt/qt5' Change-Id: I49d99db463d140e58a9cd1629f1913ce1cc9597d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2026-03-17 20:24:37 +00:00
Qt Submodule Update Bot	3dbc5f0aca	Update submodules on '6.11.0 in qt/qt5' Change-Id: I793733d37314823cf90b2e2cdccfac8b5bde7880 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2026-03-10 15:02:19 +00:00
Qt Submodule Update Bot	0239beced4	Update submodules on '6.11.0 in qt/qt5' Change-Id: I56bbc7f77407d65f6af3e43e19af3c8b9c8a4a20 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2026-03-10 00:36:16 +00:00
Qt Submodule Update Bot	bdae7a53b6	Update submodules on '6.11.0 in qt/qt5' Change-Id: I6bcb641614c84e5514410b9a5a0433d86e665026 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2026-03-08 15:08:00 +00:00
Qt Submodule Update Bot	e8e3adeb11	Update submodules on '6.11.0 in qt/qt5' Change-Id: I0cb5ad46e152ebcd0317afc383470ffb254e00bb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2026-03-05 23:02:53 +00:00
Qt Submodule Update Bot	f6a5b90ab7	Update submodules on '6.11.0 in qt/qt5' Change-Id: Ia7584bcb188535d85c61ac3f3435517df3066015 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2026-02-26 21:09:46 +00:00
Jani Heikkinen	d4821293c3	Adjust submodule branches Change-Id: I4976925305224323c04f53e764e614af40fba939	2026-02-23 05:52:11 +00:00