Adjust submodule branches

Change-Id: I5c4813fe081a415425f7edf19914e19be91d5ac8
Update submodules on '6.11 in qt/qt5'
2026-08-03 19:35:51 +08:00 · 2026-08-03 08:26:30 +03:00 · 2026-08-01 00:10:20 +00:00 · 2026-07-28 22:03:54 +00:00 · 2026-07-27 07:38:43 +00:00 · 2026-07-27 07:38:43 +00:00
727 changed files with 3218 additions and 1919 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,53 +1,46 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.11
+	branch = 6.11.2
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.11
+	branch = 6.11.2
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.11
+	branch = 6.11.2
 	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
+	branch = 6.11.2
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +48,7 @@
 	recommends = qtmultimedia qtshadertools qttasktree qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.11
+	branch = 6.11.2
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,7 +61,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = 6.11
+	branch = 6.11.2
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -76,283 +69,243 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.11
+	branch = 6.11.2
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.11
+	branch = 6.11.2
 	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
+	branch = 6.11.2
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.11
+	branch = 6.11.2
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.11
+	branch = 6.11.2
 	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
+	branch = 6.11.2
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.11
+	branch = 6.11.2
 	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.11
+	branch = 6.11.2
 	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.11
+	branch = 6.11.2
 	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
+	branch = 6.11.2
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.11
+	branch = 6.11.2
 	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
+	branch = 6.11.2
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.11
+	branch = 6.11.2
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.11
+	branch = 6.11.2
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.11
+	branch = 6.11.2
 	status = addon
 [submodule "qttasktree"]
 	depends = qtbase
 	path = qttasktree
 	url = ../qttasktree.git
-	branch = 6.11
+	branch = 6.11.2
 	status = preview
 [submodule "qtopenapi"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtopenapi
 	url = ../qtopenapi.git
-	branch = 6.11
+	branch = 6.11.2
 	status = preview
 [submodule "qtcanvaspainter"]
 	depends = qtbase qtdeclarative qtshadertools
 	path = qtcanvaspainter
 	url = ../qtcanvaspainter.git
-	branch = 6.11
+	branch = 6.11.2
 	status = preview
@@ -178,7 +178,6 @@ function(qt_ir_command_line_set_input name val)
 endfunction()

 # Appends a value of a command line option into a global property.
-# Currently unused
 function(qt_ir_command_line_append_input name val)
    if(NOT "${commandline_option_${name}_alias}" STREQUAL "")
        set(name "${commandline_option_${name}_alias}")
@@ -240,6 +239,22 @@ function(qt_ir_commandline_string arg val nextok)
    endif()
 endfunction()

+# Like string, but appends to the existing value instead of overwriting.
+# Allows repeated flags like: -skip qtwebengine -skip qtwebview
+function(qt_ir_commandline_addString arg val nextok)
+    if(nextok)
+        qt_ir_args_get_next_command_line_arg(val)
+
+        if("${val}" MATCHES "^-")
+            qt_ir_add_error("No value supplied to command line options '${arg}'.")
+        endif()
+    endif()
+    qt_ir_validate_value("${arg}" "${val}" success)
+    if(success)
+        qt_ir_command_line_append_input("${arg}" "${val}")
+    endif()
+endfunction()
+
 # Sets / handles the value of a command line void option.
 # This is an option like --force, which doesn't take any arguments.
 # Currently unused
@@ -279,6 +294,7 @@ endfunction()
 #
 # Currently handles the following types of CLI arguments:
 #  string
+#  addString (like string, but accumulates values from repeated flags)
 #  boolean
 #  void
 #
@@ -421,3 +437,19 @@ function(qt_ir_get_option_as_cmake_flag_option cli_name cmake_option_name out_va
    endif()
    set(${out_var} "${cmake_option}" PARENT_SCOPE)
 endfunction()
+
+# Get the value of a command line option as existing absolute path.
+# Yield error if the path does not exist.
+# Convert to absolute path if necessary.
+function(qt_ir_get_option_as_existing_absolute_path name value)
+    qt_ir_get_option_value("${name}" path)
+    if(NOT "${path}" STREQUAL "")
+        if(NOT EXISTS "${path}")
+            qt_ir_add_error("The path '${path}' passed with -${name} does not exist.")
+        endif()
+        if(NOT IS_ABSOLUTE "${path}")
+            get_filename_component(path "${path}" ABSOLUTE)
+        endif()
+    endif()
+    set("${value}" "${path}" PARENT_SCOPE)
+endfunction()
@@ -315,7 +315,7 @@ function(qt_ir_get_already_initialized_submodules prefix
    )

    qt_ir_parse_git_config_file_contents("${prefix}"
-        READ_GIT_CONFIG
+        READ_GIT_CONFIG_LOCAL
        PARENT_REPO_BASE_GIT_PATH "${parent_repo_base_git_path}"
        WORKING_DIRECTORY "${working_directory}"
    )
@@ -89,6 +89,26 @@ function(qt_ir_handle_called_from_configure top_level_src_path out_var_exit_reas

    qt_ir_validate_options_for_configure()

+    # Convert -skip values to module-subset exclusions so init-repository respects them.
+    qt_ir_get_option_value(skip skip_modules)
+    if(skip_modules)
+        string(REPLACE "," ";" skip_modules "${skip_modules}")
+        list(TRANSFORM skip_modules STRIP)
+        list(TRANSFORM skip_modules PREPEND "-")
+
+        qt_ir_get_option_value(module-subset existing_subset)
+        if(NOT existing_subset)
+            set(existing_subset "default")
+        endif()
+
+        list(APPEND skip_modules "${existing_subset}")
+        list(REMOVE_DUPLICATES skip_modules)
+        list(JOIN skip_modules "," merged_subset)
+
+        qt_ir_set_option_value(module-subset "${merged_subset}")
+        message(DEBUG "Preprocessed -skip option: module-subset is now: ${merged_subset}")
+    endif()
+
    # -init_submodules implies --force
    qt_ir_set_option_value(force TRUE)

@@ -110,6 +130,11 @@ 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)
@@ -117,6 +142,7 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
        qt_ir_get_top_level_submodules(include_submodules exclude_submodules)
        if(NOT include_submodules AND arg_ALREADY_INITIALIZED)
            string(REPLACE "," ";" include_submodules "${submodules}")
+            list(FILTER include_submodules EXCLUDE REGEX "^$")
        endif()

        # qtrepotools is always implicitly cloned, but it doesn't actually
@@ -133,25 +159,10 @@ 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)

-        # 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()
+        # Merge exclusions from module-subset into the skip list.
+        if(exclude_submodules)
+            list(APPEND skip_modules ${exclude_submodules})
        endif()

        # Handle case when only '-submodules existing' is passed and the
@@ -159,9 +170,13 @@ 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()
-        if(exclude_submodules)
-            list(APPEND extra_configure_args "-skip" "${exclude_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}")
    endif()

    # Insert the extra arguments into the proper positions before and after '--'.
@@ -295,7 +310,7 @@ function(qt_ir_run_after_args_parsed top_level_src_path out_var_exit_reason)
        "${working_directory}")

    # Get some additional options to pass down.
-    qt_ir_get_option_value(alternates alternates)
+    qt_ir_get_option_as_existing_absolute_path(alternates alternates)
    qt_ir_get_option_as_cmake_flag_option(branch "CHECKOUT_BRANCH" checkout_branch_option)

    # The prefix for the cmake-style 'dictionary' that will be used by various functions.
@@ -37,6 +37,7 @@ macro(qt_ir_set_known_command_line_options)
    qt_ir_commandline_option(init-submodules TYPE boolean)
    # We alias qtbase's submodules option to init-repository module-subset.
    qt_ir_commandline_option(submodules ALIAS module-subset TYPE string)
+    qt_ir_commandline_option(skip TYPE addString)

    set_property(GLOBAL PROPERTY _qt_ir_known_command_line_options "${commandline_known_options}")
 endmacro()
@@ -1386,7 +1386,7 @@ function(qt_internal_foreach_repo_run)

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

+    # Re-fetch the qlitehtml repository in the Coin git mirror, otherwise the
+    # RunCMake.InitRepository test might fail trying to checkout a newer sha1 than what is
+    # available in the Coin git mirror.
+  - type: UpdateRepo
+    gitRemote: code.qt.io
+    repos: [playground/qlitehtml.git]
+
  - type: ExecuteCommand
    command: "{{.Env.CONFIGURE_ENV_PREFIX}} cmake {{.SourceDir}}/tests/manual/RunCMake"
    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
@@ -3,11 +3,6 @@ Include: []
 Configurations:
 -
    Id: 'qttas-on-linux'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['UseConfigure', 'Packaging', 'DisableTests']
-
-    Id: 'qttas-on-linux-rhel_9_6'
    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Compiler: 'GCC'
-    Features: ['UseConfigure', 'DisableTests']
+    Features: ['UseConfigure', 'Packaging', 'DisableTests']
@@ -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',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DINPUT_tiff=qt -DINPUT_webp=qt',
        'VCPKG_HOST_TRIPLET=arm64-linux-qt',
        'VCPKG_TARGET_TRIPLET=arm64-linux-qt',
    ]
@@ -120,15 +120,15 @@ Configurations:
 # Test on Ubuntu 24.04 x64 X11
 -
    Id: 'ubuntu-24.04-x64-developer-build-x11-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly', 'InsignificantTests']
+    Features: ['Sccache', 'TestOnly']
    Platform dependency: 'ubuntu-24.04-x64-developer-build'
 -
    Id: 'ubuntu-24.04-x64-x11-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly', 'InsignificantTests']
+    Features: ['Sccache', 'TestOnly']
    Platform dependency: 'ubuntu-24.04-x64'
 -
    Id: 'opensuse-15.6-developer-build'
@@ -155,6 +155,7 @@ 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'
@@ -182,29 +183,27 @@ Configurations:
        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
-        'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}',
    ]
 -
    Id: 'windows-11_24H2-msvc2022'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'Packaging', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
+        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_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',
        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
-        'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}',
    ]
 -
    Id: 'windows-11_23h2-arm64-msvc2022'
    Template: 'qtci-windows-11_23H2-aarch64-53'
    Compiler: 'MSVC2022'
-    Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Sccache', 'Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
@@ -213,11 +212,10 @@ Configurations:
        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
-        'ZLIB_ROOT={{.Env.ZLIB_PATH_ARM64}}',
    ]
 -
    Id: 'windows-11_24H2-msvc2022-arm64'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Target arch: 'arm64'
    Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
@@ -227,9 +225,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_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
-        'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
-        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
+        'OPENSSL_INCLUDE={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
+        'OPENSSL_LIB={{.Env.OPENSSL_LIB_x64_arm64}}',
+        'OPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}',
        'VCPKG_HOST_TRIPLET=x64-windows-qt',
        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
@@ -245,7 +243,7 @@ Configurations:
    Platform dependency: 'windows-11_24H2-msvc2022-arm64'
 -
    Id: 'windows-11_24H2-msvc2022-developer-build'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
    Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
@@ -256,36 +254,23 @@ Configurations:
        'VCPKG_HOST_TRIPLET=x64-windows-qt',
        'VCPKG_TARGET_TRIPLET=x64-windows-qt',
        'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
-        'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}',
-    ]
-
-    Id: 'rhel-8.10'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
-    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
-        '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',
-    ]
-
-    Id: 'rhel-9.4'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging','Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
-    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        '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',
    ]
 -
    Id: 'rhel-9.6'
    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Compiler: 'GCC'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
+    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    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',
+        'VCPKG_HOST_TRIPLET=x64-linux-qt',
+        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+    ]
+-
+    Id: 'rhel-10.0'
+    Template: 'qtci-linux-RHEL-10.0-x86_64-51'
+    Compiler: 'GCC'
    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
    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: [
@@ -309,7 +294,7 @@ Configurations:
    ]
 -
    Id: 'visionos-developer-build'
-    Template: 'qtci-macos-15-arm-104'
+    Template: 'qtci-macos-15-arm-105'
    Target os: 'IOS_ANY'
    Target arch: 'arm64'
    Compiler: 'Clang'
@@ -321,7 +306,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24h2-mingw13'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'Mingw'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
@@ -334,7 +319,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24H2-llvm'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'Clang'
    Features: ['Sccache', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
@@ -347,7 +332,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24H2-mingw13-developer-build'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'Mingw'
    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
    Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
@@ -3,7 +3,7 @@ Configurations:

 -
    Id: 'windows-11_24H2-msvc2022-minimal-static-test'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'Packaging', 'UseConfigure', 'MinimalStaticTests']
    Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++20 -no-feature-sql-psql'
@@ -19,7 +19,7 @@ Configurations:
    Id: 'windows-11_23h2-arm64-msvc2022-minimal-static-test'
    Template: 'qtci-windows-11_23H2-aarch64-53'
    Compiler: 'MSVC2022'
-    Features: ['UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
+    Features: ['Sccache', 'UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
    Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++17 -no-sql-psql'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
@@ -29,8 +29,8 @@ Configurations:
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
 -
-    Id: 'rhel-8.10-minimal-static-test'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Id: 'rhel-9.6-minimal-static-test'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Compiler: 'GCC'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'MinimalStaticTests']
    Configure arguments: '-static -nomake examples -release -qt-libjpeg -no-icu -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
@@ -44,7 +44,7 @@ Configurations:
    Id: 'ubuntu-24.04-arm64'
    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
    Compiler: 'GCC'
-    Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
+    Features: ['Sccache', 'Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
    Configure arguments: '-static -nomake examples -release -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput -no-icu -qt-doubleconversion'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
@@ -67,13 +67,13 @@ Configurations:

 -
    Id: 'macos-14-minimal-static-tests-x86_64'
-    Template: 'qtci-macos-14-x86_64-105'
+    Template: 'qtci-macos-14-x86_64-106'
    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-106'
+    Template: 'qtci-macos-14-arm-108'
    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-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
    Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
@@ -17,7 +17,7 @@ Configurations:
    ]
 -
    Id: 'android-armv7-on-windows'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Target os: 'Android_ANY'
    Target arch: 'armv7'
    Compiler: 'Mingw'
@@ -33,12 +33,12 @@ Configurations:
    ]
 -
    Id: 'android-9-x86-on-linux'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Target os: 'Android_ANY'
    Target arch: 'x86'
    Compiler: 'GCC'
    Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.4'
+    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 -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
@@ -51,32 +51,13 @@ Configurations:
        'ANDROID_EMULATOR=emulator_x86_api_28'
    ]
 -
-    Id: 'android-9-x86-on-linux-rhel_9_6'
+    Id: 'android-16-x86_64-on-linux'
    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Target os: 'Android_ANY'
-    Target arch: 'x86'
-    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 -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
-        # without this option work too.
-        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_USE_TARGET_ANDROID_BUILD_DIR=ON',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
-        'ANDROID_EMULATOR=emulator_x86_api_28'
-    ]
-
-    Id: 'android-15-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
-    Target os: 'Android_ANY'
    Target arch: 'x86_64'
    Compiler: 'GCC'
    Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.4'
+    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 -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
@@ -86,37 +67,24 @@ Configurations:
        # 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_35'
-    ]
-
-    Id: 'android-16-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.4'
-    Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
        'ANDROID_EMULATOR=emulator_x86_64_api_36'
    ]
 -
-    Id: 'android-16-x86_64-on-linux-rhel_9_6'
+    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', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        # 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_36'
+        'ANDROID_EMULATOR=emulator_x86_64_api_37'
    ]
@@ -28,7 +28,7 @@ Configurations:
    ]
 -
    Id: 'webassembly-windows'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Target os: 'WebAssembly'
    Compiler: 'Mingw'
    Target compiler: 'Clang'
@@ -1,10 +1,5 @@
 Version: 2
 Configurations:
-
-    Id: 'ubuntu-22.04-license-check'
-    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'LicenseCheckV2']
 -
    Id: 'ubuntu-24.04-x64-license-check'
    Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
@@ -2,12 +2,12 @@ Version: 2
 Configurations:
 -
    Id: 'android-x86-developer-build-testrun-on-linux'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Target os: 'Android_ANY'
    Target arch: 'x86'
    Compiler: 'GCC'
    Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.4'
+    Platform dependency: 'rhel-9.6'
    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
@@ -15,18 +15,3 @@ Configurations:
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
        'NON_QTBASE_TARGET_CMAKE_ARGS=',
        'ANDROID_EMULATOR=emulator_x86_api_28']
-
-    Id: 'android-x86-developer-build-testrun-on-linux-rhel_9_6'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
-    Target os: 'Android_ANY'
-    Target arch: 'x86'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.6'
-    Features: ['Sccache', 'AndroidTestRun', 'UseConfigure', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=',
-        'ANDROID_EMULATOR=emulator_x86_api_28']
@@ -2,32 +2,6 @@ Version: 2
 Configurations:
 -
    Id: 'android-9-multi-abi'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'multi'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: [
-        'rhel-9.4',
-        'android-9-x86-on-linux',
-        'android-15-x86_64-on-linux'
-    ]
-    Features: [
-        'Sccache',
-        'WarningsAreErrors',
-        'AndroidTestRun',
-        'MinimalAndroidMultiABITests',
-        'InstallDepsPerPlatformSubdir'
-    ]
-    Environment variables: [
-        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-9.4',
-        'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-9-x86-on-linux',
-        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-15-x86_64-on-linux',
-        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
-        'ANDROID_EMULATOR=emulator_x86_api_28'
-    ]
-
-    Id: 'android-9-multi-abi-rhel_9_6'
    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Target os: 'Android_ANY'
    Target arch: 'multi'
@@ -36,7 +10,7 @@ Configurations:
    Platform dependency: [
        'rhel-9.6',
        'android-9-x86-on-linux',
-        'android-15-x86_64-on-linux'
+        'android-16-x86_64-on-linux'
    ]
    Features: [
        'Sccache',
@@ -50,7 +24,7 @@ Configurations:
    Environment variables: [
        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-9.6',
        'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-9-x86-on-linux',
-        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-15-x86_64-on-linux',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-16-x86_64-on-linux',
        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
        'ANDROID_EMULATOR=emulator_x86_api_28'
    ]
@@ -9,10 +9,10 @@ Configurations:

    -
        Id: 'macos-universal-on-arm64'
-        Template: 'qtci-macos-15-arm-104'
+        Template: 'qtci-macos-15-arm-105'
        Compiler: 'Clang'
        Target arch: 'x86_64-arm64'
-        Features: ['Packaging', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+        Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
        Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
        Environment variables: [
            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
@@ -31,7 +31,7 @@ Configurations:
        Platform dependency: 'macos-universal-on-arm64'
    -
        Id: 'macos-14-x86_64-tests'
-        Template: 'qtci-macos-14-x86_64-105'
+        Template: 'qtci-macos-14-x86_64-106'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-universal-on-arm64'
@@ -46,27 +46,27 @@ Configurations:

    -
        Id: 'macos-13-arm64-tests'
-        Template: 'qtci-macos-13-arm-107'
+        Template: 'qtci-macos-13-arm-108'
        Compiler: 'Clang'
-        Features: ['TestOnly', 'Packaging']
+        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-universal-on-arm64'
    -
        Id: 'macos-14-arm64-tests'
-        Template: 'qtci-macos-14-arm-106'
+        Template: 'qtci-macos-14-arm-108'
        Compiler: 'Clang'
-        Features: ['TestOnly', 'Packaging']
+        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-universal-on-arm64'
    -
        Id: 'macos-15-arm64-tests'
-        Template: 'qtci-macos-15-arm-104'
+        Template: 'qtci-macos-15-arm-105'
        Compiler: 'Clang'
-        Features: ['TestOnly', 'Packaging']
+        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-universal-on-arm64'
    -
        Id: 'macos-26-arm64-tests'
-        Template: 'qtci-macos-26-arm-104'
+        Template: 'qtci-macos-26-arm-105'
        Compiler: 'Clang'
-        Features: ['TestOnly', 'Packaging']
+        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-universal-on-arm64'

    # =========================================================================
@@ -87,9 +87,9 @@ Configurations:
        ]
    -
        Id: 'macos-arm64-developer-build'
-        Template: 'qtci-macos-15-arm-104'
+        Template: 'qtci-macos-15-arm-105'
        Compiler: 'Clang'
-        Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
+        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
        Configure arguments: '-developer-build -nomake examples -debug -framework'
        Environment variables: [
            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
@@ -97,9 +97,9 @@ Configurations:
        ]
    -
        Id: 'macos-26-arm64-developer-build'
-        Template: 'qtci-macos-26-arm-104'
+        Template: 'qtci-macos-26-arm-105'
        Compiler: 'Clang'
-        Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'Insignificant']
+        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'Insignificant']
        Configure arguments: '-developer-build -nomake examples -debug -framework'
        Environment variables: [
            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
@@ -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-107'
+        Template: 'qtci-macos-13-arm-108'
        Compiler: 'Clang'
        Features: ['TestOnly']
        Platform dependency: 'macos-arm64-developer-build'
    -
        Id: 'macos-14-arm64-developer-build-tests'
-        Template: 'qtci-macos-14-arm-106'
+        Template: 'qtci-macos-14-arm-108'
        Compiler: 'Clang'
        Features: ['TestOnly']
        Platform dependency: 'macos-arm64-developer-build'
    -
        Id: 'macos-15-arm64-developer-build-tests'
-        Template: 'qtci-macos-15-arm-104'
+        Template: 'qtci-macos-15-arm-105'
        Compiler: 'Clang'
        Features: ['TestOnly']
        Platform dependency: 'macos-arm64-developer-build'
    -
        Id: 'macos-26-arm64-developer-build-tests'
-        Template: 'qtci-macos-26-arm-104'
+        Template: 'qtci-macos-26-arm-105'
        Compiler: 'Clang'
        Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
        Platform dependency: 'macos-26-arm64-developer-build'
@@ -1,7 +1,7 @@
 Version: 2
 Include: [
    cmake_platforms.yaml: [
-        'rhel-9.4'
+        'rhel-9.6'
    ],
    cmake_platforms_target_android.yaml: [
        'android-15-x86_64-on-linux',
@@ -1,7 +1,7 @@
 Version: 2
 Include: [
    cmake_platforms.yaml: [
-        'rhel-9.4',
+        'rhel-9.6',
        'windows-11_24h2-mingw13'
    ],
    cmake_platforms_target_android.yaml: [
@@ -1,7 +1,7 @@
 Version: 2
 Include: [
    cmake_platforms.yaml: [
-        'rhel-9.4',
+        'rhel-9.6',
        'windows-11_24h2-mingw13'
    ],
    cmake_platforms_target_android.yaml: [
@@ -1,7 +1,7 @@
 Version: 2
 Include: [
    cmake_platforms.yaml: [
-        'rhel-9.4'
+        'rhel-9.6'
    ],
    cmake_platforms_target_android.yaml: [
        'android-16-x86_64-on-linux',
@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
    Id: 'windows-11_24H2-msvc2022-developer-build-cxx23'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
    Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++23'
@@ -26,14 +26,3 @@ Configurations:
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
    ]
-# Test clang-20 on Ubuntu 24.04 ARM64 Wayland
-
-    Id: 'ubuntu-24.04-arm64-clang20-cxx23'
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests']
-    Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput -c++std c++23'
-    Environment variables: [
-        'COMMON_CMAKE_ARGS=-DCMAKE_C_COMPILER=clang-20 -DCMAKE_CXX_COMPILER=clang++-20',
-        'CMAKE_ARGS=-DQT_FEATURE_stdlib_libcpp=ON'
-    ]
@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
    Id: 'ubuntu-24.04-x64-examples-and-tests-build'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
    Compiler: 'GCC'
    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'NoSubmoduleDependencies']
    Configure arguments: '-make examples -make tests'
@@ -0,0 +1,14 @@
+Version: 2
+Module only: True
+Include: [
+  cmake_platforms.yaml: [
+    'ubuntu-22.04'
+  ]
+]
+Configurations:
+-
+    Id: 'ubuntu-22.04-Axivion'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['UseConfigure', 'VMSize16', 'RunAsPlatformDependency', 'PysideAxivion']
+    Platform dependency: 'ubuntu-22.04'
@@ -7,7 +7,7 @@ Include: [
 Configurations:
 -
    Id: 'qnx-710-arm64-on-windows'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Target os: 'QNX_710'
    Target arch: 'arm64'
    Compiler: 'Mingw'
@@ -2,11 +2,14 @@ Version: 2
 Module only: True
 Include: [
  cmake_platforms.yaml: [
-    "ubuntu-22.04"
+    'ubuntu-22.04'
  ]
 ]
-Configurations: []
-Overrides:
+Configurations:
 -
-    Id: 'ubuntu-22.04'
-    Features: ['Axivion', 'DisableTests', 'UseConfigure', 'VMSize16']
+    Id: 'ubuntu-22.04-Axivion'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['UseConfigure', 'VMSize16', 'TestOnly']
+    Environment variables: ['AXIVION_ANALYSIS=1']
+    Platform dependency: 'ubuntu-22.04'
@@ -0,0 +1,28 @@
+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: 'ubuntu-24.04-x64-run-cmake-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
    Compiler: 'GCC'
    Features: ['Sccache', 'NoSubmoduleDependencies', 'TopLevelRunCMakeTests', 'DisableTests', 'VMSize16']
    Configure arguments: ''
@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
    Id: 'windows-11_24H2-msvc2022-unity-build'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests']
    Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib'
@@ -13,8 +13,8 @@ Configurations:
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
    ]
 -
-    Id: 'rhel-8.10-unity-build'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-50'
+    Id: 'rhel-9.6-unity-build'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
    Configure arguments: '-make examples -debug -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
@@ -9,10 +9,6 @@ Configurations:
    Template: 'qtci-macos-13-x86_64-103'
    Compiler: 'Clang'
    Features: ['DisableTests']
-
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['DisableTests']
 -
    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Compiler: 'GCC'
@@ -2,14 +2,14 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease']
    Configure arguments: ''
    Environment variables: []
    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 -
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'DebugAndRelease']
    Configure arguments: ''
@@ -21,14 +21,14 @@ Configurations:
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-macos-15-arm-104'
+    Template: 'qtci-macos-15-arm-105'
    Compiler: 'Clang'
    Features: ['Sccache', 'DebugAndRelease']
    Configure arguments: ''
    Environment variables: []
 # without tests
 -
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease', 'DisableTests']
    Configure arguments: ''
@@ -36,14 +36,14 @@ Configurations:
    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 # oldest Qt version
 -
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
    Configure arguments: ''
    Environment variables: []
    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 -
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
    Configure arguments: ''
@@ -55,7 +55,7 @@ Configurations:
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-macos-15-arm-104'
+    Template: 'qtci-macos-15-arm-105'
    Compiler: 'Clang'
    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
    Configure arguments: ''
@@ -15,8 +15,3 @@ Include: [
    quick-bridges.yaml
 ]
 Configurations: []
-Overrides:
-# Make VxWorks tests insignificant.
-
-    Id: 'vxworks-x86_64-tests'
-    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
@@ -1,17 +1,5 @@
 Version: 2
 Configurations:
-# Test gcc-12 on RHEL 9.4
-
-    Id: 'rhel-9.4-gcc12'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
-    Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput'
-    Environment variables: [
-        'PATH=/opt/rh/gcc-toolset-12/root/usr/bin/:{{.Env.PATH}}',
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON'
-    ]
 # Test gcc-12 on RHEL 9.6
 -
    Id: 'rhel-9.6-gcc12'
@@ -1,16 +1,11 @@
 Version: 2
 Include: []
 Configurations:
-
-    Id: 'qtgp-on-linux'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['TestOnly']
 -
    Id: 'qtgp-on-linux-rhel_9_6'
    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Compiler: 'GCC'
-    Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Features: ['TestOnly']
 -
    Id: 'qtgp-on-macos'
    Template: 'qtci-macos-14-arm-106'
@@ -18,6 +13,6 @@ Configurations:
    Features: ['TestOnly']
 -
    Id: 'qtgp-on-windows-24h2'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['TestOnly']
@@ -2,7 +2,6 @@ Version: 2
 Module only: True
 Include: [
    cmake_platforms.yaml: [
-        'rhel-9.4',
        'rhel-9.6'
    ],
    cmake_platforms_target_android.yaml: [
@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
    Id: 'ubuntu-24.04-x86-static-qtlite'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
    Compiler: 'GCC'
    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'MinimalStaticTests']
    Configure arguments: >
@@ -224,7 +224,7 @@ Configurations:
    ]
 -
    Id: 'ubuntu-24.04-x86-static-qtlite-tests'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
    Compiler: 'GCC'
    Features: ['Sccache', 'TestOnly','InsignificantTests']
    Platform dependency: 'ubuntu-24.04-x86-static-qtlite'
@@ -12,7 +12,6 @@ Include: [
    "opensuse-16.0-developer-build",
    "sles-15_sp6-static",
    "windows-10_22h2-msvc2022",
-    "rhel-9.4",
    "rhel-9.6",
    "windows-11_24h2-mingw13",
    "windows-11_24H2-mingw13-developer-build",
@@ -13,7 +13,6 @@ Include: [
    "opensuse-16.0-developer-build",
    "sles-15_sp6-static",
    "windows-10_22h2-msvc2022",
-    "rhel-9.4",
    "rhel-9.6",
    "windows-11_24h2-mingw13",
    "windows-11_24H2-mingw13-developer-build",
@@ -40,21 +39,11 @@ Configurations:
    Environment variables: [
        'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'
    ]
-
-    Id: 'Linux-RHEL_9_4_Static'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
-    Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DINPUT_headersclean=ON'
-    ]
 -
    Id: 'Linux-RHEL_9_6_Static'
    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure', 'MinimalStaticTests', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
    Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
    Id: 'macos-quick-bridges'
-    Template: 'qtci-macos-15-arm-104'
+    Template: 'qtci-macos-15-arm-105'
    Compiler: 'Clang'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'Insignificant']
    Configure arguments: >
@@ -24,7 +24,7 @@ Configurations:
    Environment variables: []
 -
    Id: 'linux-quick-bridges'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
    Compiler: 'GCC'
    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-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    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-104'
+    Template: 'qtci-macos-15-arm-105'
    Compiler: 'Clang'
    Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'MinimalStaticTests', 'Insignificant']
    Configure arguments: >
@@ -145,13 +145,13 @@ Configurations:
    ]
 -
    Id: 'macos-quick-minimal-tests'
-    Template: 'qtci-macos-15-arm-104'
+    Template: 'qtci-macos-15-arm-105'
    Compiler: 'Clang'
    Features: ['Sccache', 'TestOnly', 'InsignificantTests', 'Insignificant']
    Platform dependency: 'macos-quick-minimal'
 -
    Id: 'linux-quick-minimal'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
    Compiler: 'GCC'
    Features: ['Sccache', 'UseConfigure', 'DisableTests', 'Insignificant']
    Configure arguments: >
@@ -293,7 +293,7 @@ Configurations:
    ]
 -
    Id: 'windows-11_24H2-msvc2022-static-quicklite'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'UseConfigure', 'DisableTests', 'Insignificant']
    Configure arguments: >
@@ -2,7 +2,6 @@ Version: 2
 Include: [
    cmake_platforms.yaml: [
        "documentation-warnings",
-        "rhel-9.4",
        "rhel-9.6",
        'windows-11_24h2-mingw13',
    ],
@@ -13,43 +12,11 @@ Include: [
        'android-arm64-on-macos',
        'android-armv7-on-windows',
        'android-9-x86-on-linux',
-        'android-15-x86_64-on-linux'
+        'android-16-x86_64-on-linux'
    ],
    offline_documentation.yaml
 ]
 Configurations:
-
-    Id: "automotive-android-14-x86_64-on-linux"
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.4'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
-        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_34'
-    ]
-
-    Id: "automotive-android-10-x86_64-on-linux"
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.4'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
-        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_29'
-    ]
 -
    Id: "automotive-android-14-x86_64-on-linux-rhel_9_6"
    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
@@ -58,7 +25,7 @@ Configurations:
    Compiler: 'GCC'
    Target compiler: 'Clang'
    Platform dependency: 'rhel-9.6'
-    Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',
@@ -67,18 +34,18 @@ Configurations:
        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_34'
    ]
 -
-    Id: "automotive-android-10-x86_64-on-linux-rhel_9_6"
+    Id: "automotive-android-12-x86_64-on-linux-rhel_9_6"
    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', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
        'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_29'
+        'ANDROID_EMULATOR=automotive_emulator_x86_64_api_31'
    ]
@@ -6,43 +6,43 @@ Include: [
     "windows-quick-bridges"
  ],
  cmake_platforms.yaml: [
-     "rhel-9.4"
+     "rhel-9.6"
  ]
 ]
 Configurations:
 -
    Id: 'windows-quick-bridges-dotnet'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Template: 'qtci-windows-11_24H2-x86_64-73'
    Compiler: 'MSVC2022'
    Platform dependency: 'windows-quick-bridges'
    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesDotnet']

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

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

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

 -
    Id: 'linux-quick-bridges-python'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
    Compiler: 'GCC'
-    Platform dependency: 'rhel-9.4'
+    Platform dependency: 'rhel-9.6'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']

 -
@@ -61,21 +61,21 @@ Configurations:

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

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

 -
    Id: 'macos-quick-bridges-swift'
-    Template: 'qtci-macos-15-arm-104'
+    Template: 'qtci-macos-15-arm-105'
    Compiler: 'Clang'
    Platform dependency: 'macos-quick-bridges'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesSwift']
@@ -3,7 +3,7 @@ Module only: true
 Include: [
  cmake_platforms.yaml: [
    "windows-10_22h2-msvc2019",
-    "rhel-8.10"
+    "rhel-9.6"
  ],
  macos.yaml: [
    "macos-universal-on-arm64"
@@ -12,5 +12,5 @@ Configurations:
    Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
    Target os: 'WebAssembly'
    Compiler: 'GCC'
-    Features: ['Sccache', 'TestOnly']
+    Features: ['Sccache', 'TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
    Platform dependency: 'webassembly-linux-thread-asyncify-new'
@@ -2,67 +2,67 @@ Version: 2
 Module only: True
 Configurations:
    -
-        Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+        Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
        Compiler: 'Yocto'
        Features: ['Packaging']
        Target arch: 'TARGET1'
    -
-        Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+        Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
        Compiler: 'Yocto'
        Features: ['Packaging']
        Target arch: 'TARGET2'
    -
-        Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+        Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
        Compiler: 'Yocto'
        Features: ['Packaging']
        Target arch: 'TARGET3'
    -
-        Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+        Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
        Compiler: 'Yocto'
        Features: ['Packaging']
        Target arch: 'TARGET4'
    -
-        Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+        Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
        Compiler: 'Yocto'
        Features: ['Packaging']
        Target arch: 'TARGET5'
    -
-        Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+        Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
        Compiler: 'Yocto'
        Features: ['Packaging']
        Target arch: 'TARGET6'
    -
-        Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+        Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
        Compiler: 'Yocto'
        Features: ['Packaging']
        Target arch: 'TARGET7'
    -
-        Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+        Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
        Compiler: 'Yocto'
        Features: ['Packaging']
        Target arch: 'TARGET8'
    -
-        Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+        Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
        Compiler: 'Yocto'
        Features: ['Packaging']
        Target arch: 'TARGET9'
    -
-        Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+        Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
        Compiler: 'Yocto'
        Features: ['Packaging']
        Target arch: 'TARGET10'
    -
-        Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+        Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
        Compiler: 'Yocto'
        Features: ['Insignificant']
        Target arch: 'INSIGNIFICANT_TARGET1'
    -
-        Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+        Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
        Compiler: 'Yocto'
        Features: ['Insignificant']
        Target arch: 'INSIGNIFICANT_TARGET2'
    -
-        Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+        Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
        Compiler: 'Yocto'
        Features: ['Insignificant']
        Target arch: 'INSIGNIFICANT_TARGET3'
@@ -0,0 +1,13 @@
+#!/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 -ex
+
+sudo tee -a /etc/dconf/db/local.d/00-media-automount <<"EOF"
+[org/gnome/desktop/media-handling]
+automount=false
+automount-open=false
+EOF
+
+sudo dconf update
@@ -0,0 +1,88 @@
+### RHEL 10.0 ###
+Hard Disk: 500G
+Network: CI
+Video Card: Total Video Memory: 64MB
+Boot options/Firmware: BIOS
+Language: English (United States)
+Keyboard: English (US), Norwegian (Windows), Finnish (Windows)
+Time & Date: Etc/Coordinated Universal Time
+Software Selection: Server with GUI
+Installation Destination: Automatic partitioning selected
+Root Passowrd: Set
+Network & Host..: Connected
+KDUMP enabled: Memory Reservation: automatic
+Begin Installation
+Reboot
+# Configure Settings
+ Notifications:
+    * Lock Screen Notifications: OFF
+    * Applications: Set notification off
+    * Do Not Disturb: on
+ Applications:
+    * Disable notifications from all applications
+ Privacy:
+    * Blank Screen Delay: Never
+    * Screen Lock: OFF
+ Power:
+    * Blank screen: Never
+ Displays:
+    * Resolution: 1280 x 800
+ Users:
+    * Automatic login on
+# Add user to sudoers
+Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
+Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub
+sudo grub2-mkconfig -o /etc/grub2.cfg
+sudo grub2-mkconfig -o /boot/grub2/grub.cfg
+# Add support for virtio driver
+su
+echo "add_drivers+=\" virtio-blk \"" >> /etc/dracut.conf.d/virtio.conf
+dracut -f
+
+# NOTE!
+#  - RHEL uses 'sudo subscription-manager release --set=10.0' in provisioning
+#  - Do not update Tier 1 via GUI without using this same --set before provisioning
+#  - To avoid System to have newer packages than RPMS which will cause update issues
+
+# Register RHEL before it's possible to install qemu-guest-agent
+subscription-manager register
+
+yum -y install qemu-guest-agent
+
+# Do these from Opennebula UI!
+
+# Enable network connection from right upper corner
+This is done when the VM is launched as persistent in OpenNebula.
+# Fetch and run coin-setup
+Download http://coin/coin/binary/linux_amd64/coin-setup
+# run as qt user
+run './coin-setup'
+# Switch to use GNOME Classic user interface
+# GNOME Classic was selected because there's an issue with Standard (wayland display server).
+# Autotest start failing because terminal session remains in Activities Overview.
+# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3854
+First execute script ./01-disable-automounting.sh (dconf update crash in GNOME Classic)
+logout -> Select user (without it the drop down menu won't appear) -> switch to 'GNOME Classic' -desktop session from drop down menu in login screen
+
+# If gear icon is not seen, check is 'GNOME Classic' -desktop session installed, and install if it's missing
+ls /usr/share/xsessions/
+# This should list something like these if it's installed
+gnome-classic.desktop
+gnome.desktop
+
+# To install GNOME Classic if it's missing
+sudo dnf reinstall gnome-classic-session
+
+# In RHEL 10.0 even with 'GNOME Classic' -desktop the Activities Overview is still in use
+# It can be bypassed via 'No Overview' -GNOME extension:
+#  - https://extensions.gnome.org/extension/4099/no-overview/
+#  - Select GNOME Shell version 47 to download
+#  - Unpack extension from tar.gz
+sudo mv <extension_folder> /usr/share/gnome-shell/extensions/no-overview@fthx
+sudo chown -R root: /usr/share/gnome-shell/extensions/no-overview@fthx
+sudo chmod 755 -R /usr/share/gnome-shell/extensions/no-overview@fthx
+sudo reboot
+gnome-extensions list
+gnome-extensions enable no-overview@fthx
+
+Reboot
@@ -53,6 +53,17 @@ run 'sudo ufw disable'

 run 'sudo apt install qemu-guest-agent'

+# Install no-overview gnome extension to prevent desktop overview at boot (QTBUG-132070)
+#  - https://extensions.gnome.org/extension/4099/no-overview/
+#  - Select GNOME Shell version 46 to download
+#  - Unpack extension to (mkdir): /usr/share/gnome-shell/extensions/no-overview@fthx
+sudo chown -R root /usr/share/gnome-shell/extensions/no-overview@fthx
+sudo chmod 755 -R /usr/share/gnome-shell/extensions/no-overview@fthx
+sudo reboot
+gnome-extensions list
+gnome-extensions enable no-overview@fthx
+gnome-extensions info no-overview@fthx  # Check for "Active"
+
 # Fetch and run coin-setup (in Opennebula)
 Download http://coin/coin/binary/linux_amd64/coin-setup
 run 'chmod +x ./coin-setup' to make it executable
@@ -63,3 +63,9 @@ https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
    * Modify 'Windows Software Development Kit' from Add or remove programs
        - Add feature 'Debugging Tools for Windows'
 ############################################################
+
+Visual Studio 2026 and build tools were later updated to 17.14.33 in VS installer.
+This updated (Latest) MSVC components to:
+    - MSVC v14.44.35211.0
+    - Windows 11 SDK (10.0.26100.7705)
+.NET SDK was added
@@ -1,12 +1,7 @@
 *.iml
 .gradle
+.idea
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
 .DS_Store
 /build
 /captures
@@ -4,19 +4,19 @@ plugins {

 android {
    namespace 'com.example.gradle_project'
-    compileSdk 35
+    compileSdk 36

    defaultConfig {
        applicationId "com.example.gradle_project"
        minSdk 28
-        targetSdk 35
+        targetSdk 36
        versionCode 1
        versionName "1.0"
    }

    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
    }
 }

@@ -6,7 +6,7 @@
        android:allowBackup="true"
        android:label="gradle_project"
        android:supportsRtl="true"
-        tools:targetApi="35">
+        tools:targetApi="36">
        <activity
            android:name=".MainActivity"
            android:exported="true">
@@ -1,8 +1,8 @@
 [versions]
-agp = "8.10.1"
-core = "1.16.0"
+agp = "9.0.0"
+core = "1.17.0"
 appcompat = "1.7.1"
-material = "1.12.0"
+material = "1.13.0"
 constraintlayout = "2.2.1"

 [libraries]
@@ -6,7 +6,7 @@

 # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version

-set -e
+set -ex

 # shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
@@ -22,11 +22,12 @@ sudo mkdir -p "$sdkTargetFolder"

 basePath="http://ci-files01-hki.ci.qt.io/input/android"

-toolsVersion="2.1"
-toolsFile="commandlinetools-linux-6609375_latest.zip"
-sdkBuildToolsVersion="35.0.1"
-sdkApiLevel="android-35"
-toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
+toolsVersion="19.0"
+toolsFile="commandlinetools-linux-13114758_latest.zip"
+toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile"
+sdkBuildToolsVersion="36.0.0"
+sdkApiLevel="android-36"
+toolsSha1="5fdcc763663eefb86a5b8879697aa6088b041e70"

 ndkVersionLatest="r27c"
 ndkSha1Latest="090e8083a715fdb1a3e402d0763c388abb03fb4e"
@@ -49,19 +50,25 @@ sdkApiLevelAutomotiveMax="android-34"
 androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
 androidAutomotiveMaxSha="2cc5dae4fd0bdefb188a3b84019d0d1e65501519"
 # Android Automotive min SDK level image
-sdkApiLevelAutomotiveMin="android-29"
+sdkApiLevelAutomotiveMin="android-31"
 androidAutomotiveMinUrl="$basePath/${sdkApiLevelAutomotiveMin}_automotive.tar.gz"
-androidAutomotiveMinSha="e6092585c00f87eb3b20a2eb7fdf6add42342d2f"
+androidAutomotiveMinSha="0b6498e0c0022c40b8bb2b275f704e6a298c04a3"

 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"

 echo "Download and unzip Android SDK"
-DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile"
+DownloadURL "$toolsSourceFile" "$toolsBackupUrl" "$toolsSha1" "$toolsTargetFile"
 echo "Unzipping Android Tools to '$sdkTargetFolder'"
 sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder"
 rm "$toolsTargetFile"

+# Android Command-Line Tools unpacks a directory 'cmdline-tools'. Due
+# to existing code, we need to move it into 'cmdline-tools/tools'
+sudo mv "$sdkTargetFolder/cmdline-tools" "$sdkTargetFolder/tools"
+sudo mkdir "$sdkTargetFolder/cmdline-tools"
+sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools"
+
 function InstallNdk() {

    ndkVersion=$1
@@ -71,18 +78,25 @@ function InstallNdk() {
    ndkTargetFile="/tmp/$ndkFile"
    ndkSourceFile="$basePath/$ndkFile"

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

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

+# To be used by vcpkg
+SetEnvVar "ANDROID_NDK_HOME" "$androidNdkRoot"
+export ANDROID_NDK_HOME="$androidNdkRoot"
+
 if [ "$ndkVersionPreview" != "$ndkVersionLatest" ]; then
    InstallNdk $ndkVersionPreview $ndkSha1Preview
    SetEnvVar "ANDROID_NDK_ROOT_PREVIEW" "$androidNdkRoot"
@@ -98,10 +112,6 @@ if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY2" "$androidNdkRoot"
 fi

-# To be used by vcpkg
-SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersionLatest"
-export ANDROID_NDK_HOME="$targetFolder/android-ndk-$ndkVersionLatest"
-
 echo "Changing ownership of Android files."
 if uname -a |grep -q "el7"; then
    sudo chown -R qt:wheel "$targetFolder"
@@ -115,9 +125,6 @@ sdkmanager_no_progress_bar_cmd="tr '\r' '\n'  |  grep -v '^\[[ =]*\]'"
 # But don't let the pipeline hide sdkmanager failures.
 set -o pipefail

-sudo mkdir "$sdkTargetFolder/cmdline-tools"
-sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools"
-
 echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
 # shellcheck disable=SC2031
 if [ "$http_proxy" != "" ]; then
@@ -145,7 +152,9 @@ cat >>~/versions.txt <<EOB
 Android SDK tools = $toolsVersion
 Android SDK Build Tools = $sdkBuildToolsVersion
 Android SDK API level = $sdkApiLevel
-Android NDK = $ndkVersion
+Android NDK latest = $ndkVersionLatest
+Android NDK nightly1 = $ndkVersionNightly1
+Android NDK nightly2 = $ndkVersionNightly2
 EOB

 cd "$sdkTargetFolder/cmdline-tools/tools/bin"
@@ -178,34 +187,36 @@ echo "Unzipping the Android 9 to $minVersionDestination"
 sudo unzip -o -q "$minVersionFilePath" -d "$minVersionDestination"
 rm "$minVersionFilePath"

-echo "Download and unzip Android 15 System Image"
-maxVersionFileName="x86_64-35_r08.zip"
-maxVersionDestination="$sdkTargetFolder/system-images/android-35/google_apis/"
+echo "Download and unzip Android 16 System Image"
+maxVersionFileName="x86_64-36_r07.zip"
+maxVersionDestination="$sdkTargetFolder/system-images/android-36/google_apis/"
 maxVersionFilePath="$maxVersionDestination/$maxVersionFileName"
 maxVersionCiUrl="$basePath/system_images/google_apis/$maxVersionFileName"
 maxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$maxVersionFileName"
-maxVersionSha1="d79169884cabc6680cb29d32c2112ad46c858c1b"
+maxVersionSha1="c6bf44bdcd885bb902b4ba752d111a073ad7a817"

 mkdir -p "$maxVersionDestination"
 DownloadURL "$maxVersionCiUrl" "$maxVersionUrl" "$maxVersionSha1" "$maxVersionFilePath"

-echo "Unzipping the Android 15 to $maxVersionDestination"
+echo "Unzipping the Android 16 to $maxVersionDestination"
 sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination"
 rm "$maxVersionFilePath"

-echo "Download and unzip Android 16 System Image for insignificant"
-insignificantMaxVersionFileName="x86_64-36_r06.zip"
-insignificantMaxVersionDestination="$sdkTargetFolder/system-images/android-36/google_apis/"
+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="a9b0b4a0488e0c6c380f5485507950f011388511"
+insignificantMaxVersionSha1="b89a6686f9a9e9942d596bed45d422cbccb70c98"

 mkdir -p "$insignificantMaxVersionDestination"
 DownloadURL "$insignificantMaxVersionCiUrl" "$insignificantMaxVersionUrl" "$insignificantMaxVersionSha1" "$insignificantMaxVersionFilePath"

-echo "Unzipping the Android 16 insignicant to $insignificantMaxVersionDestination"
+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..."
@@ -214,12 +225,12 @@ ls -l "$sdkTargetFolder"
 echo "no" | ./avdmanager create avd -n emulator_x86_api_28 -c 2048M -f \
    -k "system-images;android-28;google_apis;x86"

-echo "no" | ./avdmanager create avd -n emulator_x86_64_api_35 -c 2048M -f \
-    -k "system-images;android-35;google_apis;x86_64"
-
 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"
@@ -231,7 +242,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_29 -c 2048M -f \
+echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_31 -c 2048M -f \
    -k "system-images;${sdkApiLevelAutomotiveMin};android-automotive;x86_64"

 # Purely informative, show the list of avd devices
@@ -240,16 +251,20 @@ echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_29 -c 2048
 # To be used by the VMs to start the emulator for tests
 emulator_script_filename="android_emulator_launcher.sh"
 scripts_dir_name="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
-cp "${scripts_dir_name}/${emulator_script_filename}" "${HOME}"
+cp "${scripts_dir_name}/../unix/${emulator_script_filename}" "${HOME}"
 ANDROID_EMULATOR_RUNNER="${HOME}/${emulator_script_filename}"
 SetEnvVar "ANDROID_EMULATOR_RUNNER" "$ANDROID_EMULATOR_RUNNER"

+SetEnvVar "PATH" "\$PATH:$sdkTargetFolder/emulator"
+SetEnvVar "PATH" "\$PATH:$sdkTargetFolder/platform-tools"
+SetEnvVar "PATH" "\$PATH:$sdkTargetFolder/cmdline-tools/latest/bin"
+
 # Gradle Caching
 cp -r "${scripts_dir_name}/android/gradle_project" /tmp/gradle_project
 cd /tmp/gradle_project
 # Get Gradle files from qtbase
 qtbaseGradleUrl="https://code.qt.io/cgit/qt/qtbase.git/plain/src/3rdparty/gradle"
-commit_sha="bb12c984b2c838bdb06169ef7d659384c02c8b82"
+commit_sha="269a75dbd1262a714eb238c42e5159a0a8979818"
 curl "$qtbaseGradleUrl/gradle.properties?h=$commit_sha" > gradle.properties
 curl "$qtbaseGradleUrl/gradlew?h=$commit_sha" > gradlew
 curl "$qtbaseGradleUrl/gradlew.bat?h=$commit_sha" > gradlew.bat
@@ -12,7 +12,7 @@
            },
            "directory": "../work/qt/$(env:TESTED_MODULE_COIN)",
            "ir": "$(env:IRNAME)",
-            "name": "qt_$(env:PACKAGE)_$(env:MODULE)_dev_$(env:TARGET_OS_COIN)"
+            "name": "qt_$(env:PACKAGE)_$(env:MODULE)_$(env:TESTED_MODULE_BRANCH_COIN)_$(env:TARGET_OS_COIN)"
        },
        "VCSIntegration": {
            "vcs_mapping": {
@@ -22,6 +22,9 @@
            "_active": true,
            "excludes": [
                "$(splitpath:EXCLUDE_FILES)"
+            ],
+            "includes": [
+                "$(splitpath:INCLUDE_FILES)"
            ]
        },
        "Frameworks-QtSupport": {
@@ -272,14 +275,17 @@
        "Stylechecks": {
            "excludes": [
                "$(splitpath:EXCLUDE_FILES)"
+            ],
+            "includes": [
+                "$(splitpath:INCLUDE_FILES)"
            ]
        }
    },
    "_Format": "1.0",
    "_VersionNum": [
        7,
-        10,
-        4,
-        17655
+        11,
+        5,
+        19102
    ]
 }
@@ -10,4 +10,22 @@ 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 "$@"
@@ -0,0 +1,3 @@
+diffutils
+make
+yasm
@@ -0,0 +1,4 @@
+diffutils
+libva-devel
+make
+yasm
@@ -0,0 +1,3 @@
+diffutils
+make
+yasm
@@ -0,0 +1,4 @@
+diffutils
+libva-dev
+make
+yasm
@@ -3,6 +3,10 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

 # This script builds and installs FFmpeg static or shared (default) libs
+# It can take an optional output parameter for installation:
+#
+# install-ffmpeg-linx.sh shared ~/my/install/path
+
 set -ex

 source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh"
@@ -12,17 +16,18 @@ build_type=$(get_ffmpeg_build_type "$1")
 ffmpeg_source_dir=$(download_ffmpeg)
 ffmpeg_name=$(basename "$ffmpeg_source_dir")
 ffmpeg_config_options=$(get_ffmpeg_config_options "$build_type")
-prefix="/usr/local/$ffmpeg_name"
+default_prefix="/usr/local/$ffmpeg_name"
+prefix="${2:-$default_prefix}"
 pkgconfig_path="$PKG_CONFIG_PATH"

 install_ff_nvcodec_headers() {
-    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"
+    local nv_codec_version="11.1.5.3" # use 11.x.x.x to ensure compatibility with 470 nvidia drivers; might be upated to 12.0
+    local nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/archive/refs/tags/n$nv_codec_version.zip"
+    local nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-$nv_codec_version.zip"
+    local nv_codec_sha1="78715d521de102362e553dc92577bbe81905a321"
    #nv_codec_sha1="4f30539f8dd31945da4c3da32e66022f9ca59c08" // 12.0
    local target_dir="$HOME"
-    local nv_codec_dir="$target_dir/nv-codec-headers-sdk-$nv_codec_version"
+    local nv_codec_dir="$target_dir/nv-codec-headers-n$nv_codec_version"

    if [ ! -d  "$nv_codec_dir" ]; then
        source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
@@ -95,5 +100,6 @@ if [ "$build_type" == "shared" ]; then
    "$fix_dependencies" "$output_dir"
 fi

-sudo mv "$output_dir" "/usr/local"
+sudo mkdir -p "$prefix"
+sudo mv "$output_dir"/* "$prefix"
 set_ffmpeg_dir_env_var "FFMPEG_DIR" "$prefix"
@@ -15,18 +15,20 @@ case "$uname_m" in
    x86_64|amd64)
        sha256="6f98805688d19672bd699fbbfa2c2cf0fc054ac3df1f0e6a47664d963d530255"
        pkgname="ninja-$version-linux-x64.zip"
+        pkgnameExt="ninja-linux.zip"
        dirname="ninja-$version-linux-x64"
        ;;
    arm64|aarch64)
        sha256="5c25c6570b0155e95fce5918cb95f1ad9870df5768653afe128db822301a05a1"
        pkgname="ninja-$version-linux-arm64.zip"
+        pkgnameExt="ninja-linux-aarch64.zip"
        dirname="ninja-$version-linux-arm64"
        ;;
    *) fatal "Unknown architecture in uname: $uname_m" 43 ;;
 esac

 internalUrl="http://ci-files01-hki.ci.qt.io/input/ninja/$pkgname"
-externalUrl="https://github.com/ninja-build/ninja/releases/download/v$version/$pkgname"
+externalUrl="https://github.com/ninja-build/ninja/releases/download/v$version/$pkgnameExt"

 targetFile="$HOME/$pkgname"
 DownloadURL "$internalUrl" "$externalUrl" "$sha256" "$targetFile"
@@ -8,17 +8,17 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

 # This script will install node.js 18.16.0
-version="18.16.0"
+version="22.21.1"

 uname_m="$(uname -m)"
 case "$uname_m" in
    x86_64|amd64)
-        sha256="44d93d9b4627fe5ae343012d855491d62c7381b236c347f7666a7ad070f26548"
+        sha256="680d3f30b24a7ff24b98db5e96f294c0070f8f9078df658da1bce1b9c9873c88"
        pkgname="node-v$version-linux-x64.tar.xz"
        dirname="node-v$version-linux-x64"
        ;;
    arm64|aarch64)
-        sha256="c81dfa0bada232cb4583c44d171ea207934f7356f85f9184b32d0dde69e2e0ea"
+        sha256="e660365729b434af422bcd2e8e14228637ecf24a1de2cd7c916ad48f2a0521e1"
        pkgname="node-v$version-linux-arm64.tar.xz"
        dirname="node-v$version-linux-arm64"
        ;;
@@ -4,9 +4,7 @@

 echo "Installing vcpkg android ports"

-pushd "${BASH_SOURCE%/*}/vcpkg" || exit
-cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" .
-
+pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit
 "$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

@@ -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" "$appPrefix"
+InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "/tmp" ""

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

 # QNX SDP
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20250612.tar.xz"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20260410.tar.xz"
 targetFile="qnx800.tar.xz"
-sha1="d7ca20be6867b569067a17e8b3fa633c7eadad89"
+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"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"

 sudo cp "$aarch64le_toolchain" "$targetPath"
@@ -1,3 +1,9 @@
+# Loopback — the QNX SDP's default /etc/hosts ships these, but this
+# file overrides that default. Tests that connect to http(s)://localhost
+# (e.g. tst_qhttpserver, tst_abstractoauth2) need them present.
+127.0.0.1   localhost
+::1         localhost
+
 # Need to add all testserver names statically
 # as current Docker uses Multicast DNS (mDNS) (avahi)
 # Which does not work with QNX qemu
@@ -1,3 +1,9 @@
+# Loopback — the QNX SDP's default /etc/hosts ships these, but this
+# file overrides that default. Tests that connect to http(s)://localhost
+# (e.g. tst_qhttpserver, tst_abstractoauth2) need them present.
+127.0.0.1   localhost
+::1         localhost
+
 # Need to add all testserver names statically
 # as current Docker uses Multicast DNS (mDNS) (avahi)
 # Which does not work with QNX qemu
@@ -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.24=usr/lib/libfreetype.so.24
+lib/libfreetype.so.26=usr/lib/libfreetype.so.26
 lib/libbz2.so.1=usr/lib/libbz2.so.1
 lib/liblzma.so.5=usr/lib/liblzma.so.5
 lib/libdbus-1.so=usr/lib//libdbus-1.so
@@ -54,7 +54,7 @@ xbin/fsevmgr=sbin/fsevmgr
 lib/libscreen.so.1=usr/lib/libscreen.so.1

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

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

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

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

-installSccache "$targetArch" "$targetVersion" "$sha1"
+installSccache "$targetArch" "$targetVersion" "$sha256"
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# Copyright (C) 2026 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+# This script installs Syft
+
+# Syft is used for generating SBOM (Software Bill of Materials) files.
+
+# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+
+version="1.45.1"
+
+uname_m="$(uname -m)"
+case "$uname_m" in
+    x86_64|amd64)
+        SHA1="06e1d56173209977df8b11ad955843cb62f874fd"
+        arch="amd64"
+        ;;
+    arm64|aarch64)
+        SHA1="c48638b3998066dbd139e94e116a81a6cc6299be"
+        arch="arm64"
+        ;;
+    *) fatal "Unknown architecture in uname: $uname_m" 43 ;;
+esac
+
+PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/syft/syft_${version}_linux_${arch}.tar.gz"
+AltUrl="https://github.com/anchore/syft/releases/download/v${version}/syft_${version}_linux_${arch}.tar.gz"
+targetFolder="/opt/syft-$version"
+appPrefix=""
+
+InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
+
+SetEnvVar "PATH" "$targetFolder:\$PATH"
+
+echo "Syft = $version" >> ~/versions.txt
@@ -0,0 +1,20 @@
+#!/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
+}
+
@@ -8,79 +8,121 @@

 set -ex

+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/check_and_set_proxy.sh
+source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

 targetFolder="/opt/android"
 sdkTargetFolder="$targetFolder/sdk"

-basePath="/net/ci-files01-hki.ci.qt.io/hdd/www/input/android"
+sudo mkdir -p "$sdkTargetFolder"

-toolsVersion="2.1"
-# toolsFile dertermines tools version
-toolsFile="commandlinetools-mac-6609375_latest.zip"
+basePath="http://ci-files01-hki.ci.qt.io/input/android"
+
+toolsVersion="19.0"
+toolsFile="commandlinetools-mac-13114758_latest.zip"
+toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile"
+sdkBuildToolsVersion="36.0.0"
+sdkApiLevel="android-36"
+toolsSha1="c3e06a1959762e89167d1cbaa988605f6f7c1d24"
+
+ndkVersionLatest="r27c"
+ndkSha1Latest="0217c10ffbec496bb9fbfbb3c6fc2477c6b77297"
+
+# Preview NDK that is in alpha/beta/RC state
+ndkVersionPreview="r29-beta2"
+ndkSha1Preview="09be4f8fb626a9c93415198ea8e75d8d82f528fa"

 # Non-latest (but still supported by the qt/qt5 branch) NDKs are installed for nightly targets in:
 # coin/platform_configs/nightly_android.yaml

-ndkVersionLatest="r27c"
-ndkVersionPreview="r29-beta2"
-ndkVersionNightly1="$ndkVersionLatest"  # If same version as latest = skip NDK install for nightly
-ndkVersionNightly2="$ndkVersionLatest"
+ndkVersionNightly1=$ndkVersionLatest  # Set as same version as latest = skip NDK install in provisioning
+ndkSha1Nightly1=$ndkSha1Latest

-sdkBuildToolsVersion="35.0.1"
-# this is compile sdk version
-sdkApiLevel="android-35"
+ndkVersionNightly2=$ndkVersionLatest
+ndkSha1Nightly2=$ndkSha1Latest

+toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"

+echo "Download and unzip Android SDK"
+DownloadURL "$toolsSourceFile" "$toolsBackupUrl" "$toolsSha1" "$toolsTargetFile"
+echo "Unzipping Android Tools to '$sdkTargetFolder'"
+sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder"
+rm "$toolsTargetFile"
+
+# Android Command-Line Tools unpacks a directory 'cmdline-tools'. Due
+# to existing code, we need to move it into 'cmdline-tools/tools'
+sudo mv "$sdkTargetFolder/cmdline-tools" "$sdkTargetFolder/tools"
+sudo mkdir "$sdkTargetFolder/cmdline-tools"
+sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools"
+
 function InstallNdk() {

    ndkVersion=$1
+    ndkSha1=$2

-    if [[ ! -d "${targetFolder}/android-ndk-${ndkVersion}" ]]; then
-        echo "Unzipping Android NDK $ndkVersion to '${targetFolder}'"
-        ndkSourceFile="$basePath/android-ndk-$ndkVersion-darwin*.zip"
-        sudo unzip -q "$ndkSourceFile" -d "$targetFolder"
-    fi
+    ndkFile="android-ndk-$ndkVersion-darwin.zip"
+    ndkTargetFile="/tmp/$ndkFile"
+    ndkSourceFile="$basePath/$ndkFile"

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

-InstallNdk $ndkVersionLatest
-SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest"
+InstallNdk $ndkVersionLatest $ndkSha1Latest
+SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$androidNdkRoot"

 if [ "$ndkVersionPreview" != "$ndkVersionLatest" ]; then
-    InstallNdk $ndkVersionPreview
-    SetEnvVar "ANDROID_NDK_ROOT_PREVIEW" "$targetFolder/android-ndk-$ndkVersionPreview"
+    InstallNdk $ndkVersionPreview $ndkSha1Preview
+    SetEnvVar "ANDROID_NDK_ROOT_PREVIEW" "$androidNdkRoot"
 fi

 if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then
-    InstallNdk $ndkVersionNightly1
-    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY1" "$targetFolder/android-ndk-$ndkVersionNightly1"
+    InstallNdk $ndkVersionNightly1 $ndkSha1Nightly1
+    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY1" "$androidNdkRoot"
 fi

 if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
-    InstallNdk $ndkVersionNightly2
-    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY2" "$targetFolder/android-ndk-$ndkVersionNightly2"
+    InstallNdk $ndkVersionNightly2 $ndkSha1Nightly2
+    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY2" "$androidNdkRoot"
 fi

-echo "Unzipping Android Tools to '$sdkTargetFolder'"
-sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder"
-
 echo "Changing ownership of Android files."
 sudo chown -R qt:wheel "$targetFolder"
 sudo chmod -R 755 $targetFolder

-# Run the following command under `eval` or `sh -c` so that the shell properly splits it
+# Stop the sdkmanager from printing thousands of lines of #hashmarks.
+# Run the following command under `eval` or `sh -c` so that the shell properly splits it.
 sdkmanager_no_progress_bar_cmd="tr '\r' '\n'  |  grep -v '^\[[ =]*\]'"
-
-sudo mkdir "$sdkTargetFolder/cmdline-tools"
-sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools"
+# But don't let the pipeline hide sdkmanager failures.
+set -o pipefail

 echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
-(echo "y"; echo "y") | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" "--sdk_root=$sdkTargetFolder" \
-    "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
-    | eval "$sdkmanager_no_progress_bar_cmd"
+# shellcheck disable=SC2031
+if [ "$http_proxy" != "" ]; then
+    proxy_host=$(echo "$proxy" | cut -d'/' -f3 | cut -d':' -f1)
+    proxy_port=$(echo "$proxy" | cut -d':' -f3)
+    echo "y" | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" --sdk_root=$sdkTargetFolder  \
+                   --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port"  \
+                   "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
+        | eval "$sdkmanager_no_progress_bar_cmd"
+else
+    echo "y" | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" --sdk_root=$sdkTargetFolder  \
+                   "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
+        | eval "$sdkmanager_no_progress_bar_cmd"
+fi

 echo "Checking the contents of Android SDK..."
 ls -l "$sdkTargetFolder"
@@ -0,0 +1,2 @@
+diffutils
+yasm
@@ -0,0 +1,302 @@
+#!/usr/bin/env bash
+# Copyright (C) 2024 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+# This script will build and install FFmpeg shared libraries.
+#
+# The script will package iOS and iOS-simulator binaries into one
+# single .xcframework. This .xcframework cannot contain .dylibs
+# directly. It must contain .framework files. Unlike macOS, binaries
+# should NOT be lipoed together.
+#
+# From https://developer.apple.com/documentation/xcode/creating-a-multi-platform-binary-framework-bundle
+# "Avoid using dynamic library files (.dylib files) for dynamic
+# linking. An XCFramework can include dynamic library files, but only
+# macOS supports these libraries for dynamic linking. Dynamic linking
+# on iOS, iPadOS, tvOS, visionOS, and watchOS requires the XCFramework
+# to contain .framework bundles."
+#
+# This script can take an optional final parameter to control
+# installation directory.
+set -eoux pipefail
+
+# Must match or be lower than the minimum iOS version supported by the version of Qt that is
+# is currently being built.
+readonly MINIMUM_IOS_VERSION="16.0"
+
+source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh"
+
+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")
+default_prefix="/usr/local/ios/ffmpeg"
+prefix="${1:-$default_prefix}"
+
+# Qt doesn't utilize all FFmpeg components. This is a list of the ones
+# we care about
+ffmpeg_components="libavcodec libavformat libavutil libswresample libswscale"
+
+target_platform_to_sdk() {
+    local target_platform="$1"
+    if [[ "$target_platform" == "arm64-simulator" ]] \
+        || [[ "$target_platform" == "x86_64-simulator" ]]; then
+        echo "iphonesimulator"
+    elif [ "$target_platform" == "arm64-iphoneos" ]; then
+        echo "iphoneos"
+    else
+        echo "Error finding corresponding iOS SDK for target platform: ${target_platform}"
+        exit 1
+    fi
+}
+
+build_ffmpeg_ios() {
+    local target_platform="$1"
+    local target_cpu_arch=""
+    local target_sdk;
+    target_sdk="$(target_platform_to_sdk "${target_platform}")"
+
+    if [ "$target_platform" == "arm64-simulator" ]; then
+        target_cpu_arch="arm64"
+        minos="-mios-simulator-version-min=$MINIMUM_IOS_VERSION"
+    elif [ "$target_platform" == "x86_64-simulator" ]; then
+        target_cpu_arch="x86_64"
+        minos="-mios-simulator-version-min=$MINIMUM_IOS_VERSION"
+    elif [ "$target_platform" == "arm64-iphoneos" ]; then
+        target_cpu_arch="arm64"
+        minos="-miphoneos-version-min=$MINIMUM_IOS_VERSION"
+    else
+        echo "Error when building FFmpeg for iOS. Unknown parameter given for target_platform: '${target_platform}'"
+        exit 1
+    fi
+
+    local build_dir="$ffmpeg_source_dir/build_ios/$target_platform"
+    sudo mkdir -p "$build_dir"
+    pushd "$build_dir"
+
+    local sysroot;
+    sysroot="$(xcrun --sdk "${target_sdk}" --show-sdk-path)"
+    local cc;
+    cc="$(xcrun -f --sdk ${target_sdk} clang)"
+    local cxx;
+    cxx="$(xcrun -f --sdk ${target_sdk} clang++)"
+
+    # We add -g so we get debug symbols.
+    local common_arch_flags="${minos} -arch ${target_cpu_arch} -g"
+
+    local config_parameters=(
+        $ffmpeg_config_options
+        --sysroot="${sysroot}"
+        --enable-cross-compile
+        --enable-optimizations
+        --prefix="$prefix"
+        --arch="$target_cpu_arch"
+        --cc="$cc"
+        --cxx="$cxx"
+        --extra-cflags="${common_arch_flags}"
+        --extra-cxxflags="${common_arch_flags}"
+        --extra-ldflags="${common_arch_flags}"
+        --target-os=darwin
+        --install-name-dir="@rpath"
+        --disable-audiotoolbox
+
+        # We perform manual stripping after generating dSYMs.
+        # Make sure to skip it during FFmpeg compilation.
+        --disable-stripping
+    )
+    sudo "$ffmpeg_source_dir/configure" "${config_parameters[@]}"
+
+    sudo make install DESTDIR="$build_dir/installed" -j4
+    popd
+}
+
+build_info_plist() {
+    local file_path="$1"
+    local framework_name="$2"
+    local framework_id="$3"
+
+    # Apple plist format has a strict requirement that the version string
+    # contains up to 3 numerics separated by a dot. Meanwhile, FFmpeg versioning
+    # tends to use an 'n' prefix in their versioning. We use a regex to convert
+    # and verify the version string.
+    #
+    # https://developer.apple.com/documentation/bundleresources/information-property-list/cfbundleversion
+    local formatted_ffmpeg_version
+    if [[ $ffmpeg_version =~ ([0-9]+(\.[0-9]+){0,2}) ]]; then
+        formatted_ffmpeg_version="${BASH_REMATCH[1]}"
+    else
+        echo "Unable to format FFmpeg version string '$ffmpeg_version' into corresponding Apple Info.plist format"
+        exit 1
+    fi
+
+    local minimum_version_key="MinimumOSVersion"
+    local supported_platforms="iPhoneOS"
+
+    info_plist="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+<plist version=\"1.0\">
+<dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleExecutable</key>
+    <string>${framework_name}</string>
+    <key>CFBundleIdentifier</key>
+    <string>${framework_id}</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>${framework_name}</string>
+    <key>CFBundlePackageType</key>
+    <string>FMWK</string>
+    <key>CFBundleShortVersionString</key>
+    <string>${formatted_ffmpeg_version}</string>
+    <key>CFBundleVersion</key>
+    <string>${formatted_ffmpeg_version}</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>${minimum_version_key}</key>
+    <string>${MINIMUM_IOS_VERSION}</string>
+    <key>CFBundleSupportedPlatforms</key>
+    <array>
+        <string>${supported_platforms}</string>
+    </array>
+    <key>NSPrincipalClass</key>
+    <string></string>
+</dict>
+</plist>"
+    echo $info_plist | sudo tee ${file_path} 1>/dev/null
+}
+
+# Create a 'traditional' framework from the corresponding dylib.
+# This includes creating a folder for it, and inserting Info.plist
+# and dylib. We also patch runpaths in the dylib to match the
+# frameworks directory structure.
+#
+# There is no command-line tool for generating .framework
+# files. By inspecting .frameworks generated through Xcode, we
+# have found they are primarily a directory with a very specific
+# layout. The code below generates a matching layout.
+#
+# See https://developer.apple.com/library/archive/documentation/MacOSX/Conceptual/BPFrameworks/Frameworks.html
+create_framework() {
+    local ffmpeg_component_name="$1"
+    local platform="$2"
+
+    local ffmpeg_build_path="${ffmpeg_source_dir}/build_ios/${platform}/installed/${prefix}"
+    local ffmpeg_component_src_dylib="${ffmpeg_build_path}/lib/${ffmpeg_component_name}.dylib"
+    local ffmpeg_component_framework="${ffmpeg_build_path}/framework/${ffmpeg_component_name}.framework"
+    local ffmpeg_component_target_dylib="${ffmpeg_component_framework}/${ffmpeg_component_name}"
+
+    # Make directory for the .framework
+    sudo mkdir -p "${ffmpeg_component_framework}"
+
+    # Inser the Info.plist
+    build_info_plist \
+        "${ffmpeg_component_framework}/Info.plist" \
+        "${ffmpeg_component_name}" \
+        "io.qt.ffmpegkit.${ffmpeg_component_name}"
+
+    # Copy in the dylib
+    sudo cp \
+        "${ffmpeg_component_src_dylib}" \
+        "${ffmpeg_component_target_dylib}"
+
+    # By default, runpaths will look for FFmpeg dependencies in
+    # '@rpath/libavcodec.xx.yy.dylib'. We want this path to be in the form
+    # '@rpath/libavcodec.framework/libavcodec.dylib'.
+
+    # Set the dylibs self-identity
+    sudo install_name_tool \
+        -id "@rpath/${ffmpeg_component_name}.framework/${ffmpeg_component_name}" \
+        "${ffmpeg_component_target_dylib}"
+
+    # Update the runpaths for each FFmpeg dependency entry
+    otool -L "$ffmpeg_component_target_dylib" \
+        | tail -n +2 \
+        | awk '{print $1}' \
+        | while read -r dep; do
+            # Go through all dependency entries of this .dylib,
+            # see if they point to a FFmpeg component. If it does,
+            # modify the entry to match the final
+            # directory structure.
+            for ffdep in $ffmpeg_components; do
+                if [[ "$dep" == */${ffdep}.* ]]; then
+                    echo "Rewriting dependency: $dep -> @rpath/${ffdep}.framework/${ffdep}"
+                    sudo install_name_tool -change \
+                        "$dep" \
+                        "@rpath/${ffdep}.framework/${ffdep}" \
+                        "$ffmpeg_component_target_dylib"
+                fi
+            done
+        done
+}
+
+# dSYM symbols must be generated manually, these are required for
+# App Store deployment. We generate them from the .dylibs inside
+# our .frameworks. This has to be done after patching the runpaths.
+# At the end, we strip the dylib.
+create_dsym() {
+    local ffmpeg_component_name="$1"
+    local platform="$2"
+
+    local ffmpeg_build_path="${ffmpeg_source_dir}/build_ios/${platform}/installed/${prefix}"
+    local target_dylib="${ffmpeg_build_path}/framework/${ffmpeg_component_name}.framework/${ffmpeg_component_name}"
+
+    sudo dsymutil "${target_dylib}" \
+        -o "${ffmpeg_build_path}/framework/${ffmpeg_component_name}.framework.dSYM"
+
+    local target_sdk;
+    target_sdk=$(target_platform_to_sdk "${platform}")
+
+    local strip;
+    strip="$(xcrun -f --sdk ${target_sdk} strip)"
+    sudo ${strip} -x "${target_dylib}"
+}
+
+create_xcframework() {
+    # Create 'traditional' framework from the corresponding dylib,
+    # also creating
+    local framework_name="$1"
+    local target_platform_a="$2"
+    local target_platform_b="$3"
+
+    local platform_a_build="${ffmpeg_source_dir}/build_ios/${target_platform_a}/installed/${prefix}"
+    local fw_a="${platform_a_build}/framework/${framework_name}.framework"
+    local dsym_a="${fw_a}.dSYM"
+
+    local platform_b_build="${ffmpeg_source_dir}/build_ios/${target_platform_b}/installed/${prefix}"
+    local fw_b="${platform_b_build}/framework/${framework_name}.framework"
+    local dsym_b="${fw_b}.dSYM"
+
+    sudo mkdir -p "$prefix/lib/"
+    sudo xcodebuild -create-xcframework \
+        -framework "$fw_a" -debug-symbols "$dsym_a" \
+        -framework $fw_b -debug-symbols "$dsym_b" \
+        -output "${prefix}/lib/${framework_name}.xcframework"
+}
+
+build_ffmpeg_ios "arm64-iphoneos"
+build_ffmpeg_ios "x86_64-simulator"
+
+for name in $ffmpeg_components; do
+    create_framework "$name" "arm64-iphoneos"
+    create_framework "$name" "x86_64-simulator"
+
+    create_dsym "$name" "arm64-iphoneos"
+    create_dsym "$name" "x86_64-simulator"
+done
+
+# Create corresponding xcframeworks containing both arm64 and x86_64-simulator frameworks:
+for name in $ffmpeg_components; do
+    create_xcframework "$name" "arm64-iphoneos" "x86_64-simulator"
+done
+
+# xcframeworks are already installed directly into the target output directory.
+# We need to install headers
+sudo cp -r "${ffmpeg_source_dir}/build_ios/arm64-iphoneos/installed/${prefix}/include" "$prefix"
+
+set_ffmpeg_dir_env_var "FFMPEG_DIR_IOS" "$prefix"
@@ -41,7 +41,11 @@ build_ffmpeg() {
    popd
 }

-brew install yasm
+# 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[@]}"
+
 export MACOSX_DEPLOYMENT_TARGET=12
 fix_relative_dependencies="${BASH_SOURCE%/*}/../macos/fix_relative_dependencies.sh"

@@ -2,6 +2,8 @@
 # Copyright (C) 2021 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

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

@@ -20,6 +22,11 @@ function InstallXCode() {
    sourceFile=$1
    version=$2

+    if ! [[ $version =~ ^[0-9] ]]; then
+        echo "Error: version input must start with a digit"
+        exit 1
+    fi
+
    echo "Uncompressing and installing '$sourceFile'"
    if [[ $sourceFile =~ tar ]]; then
        cd /Applications/ && sudo tar -zxf "$sourceFile"
@@ -35,7 +42,7 @@ function InstallXCode() {
    fi

    echo "Versioning application bundle"
-    majorVersion=$(echo "$version" | cut -d '.' -f 1)
+    majorVersion="${version%%[^0-9]*}"
    versionedAppBundle="/Applications/Xcode${majorVersion}.app"
    sudo mv /Applications/Xcode*.app "${versionedAppBundle}"

@@ -46,11 +53,12 @@ function InstallXCode() {
    sudo xcodebuild -license accept

    echo "Install packages"
-    # -runFirstLaunch is valid in 9.x
-    sudo xcodebuild -runFirstLaunch || true
+    sudo xcodebuild -runFirstLaunch

    # Metal toolchain not included by default in Xcode 26
-    xcodebuild -downloadComponent MetalToolchain || true
+    if ((majorVersion >= 26)); then
+        xcodebuild -downloadComponent MetalToolchain
+    fi

    echo "Enabling developer mode, so that using lldb does not require interactive password entry"
    sudo /usr/sbin/DevToolsSecurity -enable
@@ -9,12 +9,12 @@ set -ex
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"

 echo "Installing Java Development Kit"
-version=17.0.12
+version=21.0.9
 targetFile=jdk-${version}_macos-x64_bin.dmg
-expectedHash="6fba2fbe5d181bd2ef7fd79e0335278c13f611cb"
+expectedHash="3df8761bfba8d6a4633ecc92f1eff0a58d79c304"

 url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac
-# url_alt=https://www.oracle.com/java/technologies/downloads/#jdk17-mac
+# url_alt=https://download.oracle.com/java/21/archive/jdk-21.0.8_macos-x64_bin.dmg

 echo "Mounting $targetFile"
 sudo mkdir -p /Volumes/files
@@ -8,10 +8,10 @@ set -ex

 echo "Installing Java Development Kit"

-targetFile=zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg
+targetFile=zulu21.46.19-ca-jdk21.0.9-macosx_aarch64.dmg

 url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac
-# url_alt=https://cdn.azul.com/zulu/bin/zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg
+# url_alt=https://cdn.azul.com/zulu/bin/zulu21.46.19-ca-jdk21.0.9-macosx_aarch64.dmg

 echo "Mounting $targetFile"
 sudo mkdir -p /Volumes/files
@@ -22,12 +22,12 @@ sudo umount /Volumes/files
 sudo hdiutil attach "/tmp/$targetFile"

 echo Installing JDK
-cd /Volumes/Azul\ Zulu\ JDK\ 17.54+21 && sudo installer -pkg Double-Click\ to\ Install\ Azul\ Zulu\ JDK\ 17.pkg -target /
+cd /Volumes/Azul\ Zulu\ JDK\ 21.46+19 && sudo installer -pkg Double-Click\ to\ Install\ Azul\ Zulu\ JDK\ 21.pkg -target /

 echo "Unmounting $targetFile"
-sudo hdiutil unmount /Volumes/Azul\ Zulu\ JDK\ 17.54+21 -force
+sudo hdiutil unmount /Volumes/Azul\ Zulu\ JDK\ 21.46+19 -force

 echo "Disable auto update"
 sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false

-echo "JDK Version = 17.0.13" >> ~/versions.txt
+echo "JDK Version = 21.0.9" >> ~/versions.txt
@@ -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'
+      ENV['CFLAGS'] = '-O -arch arm64 -arch x86_64 -mmacosx-version-min=10.9 -std=gnu89'
    end
    system "./autogen.sh"
    system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2020 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# Install libusb
-set -ex
-
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-brew install libusb
-read -r -a arr <<< "$(brew list --versions libusb)"
-version=${arr[1]}
-echo "libusb = $version" >> ~/versions.txt
-
-mkdir /tmp/arm64/
-mkdir /tmp/amd64/
-
-case $(sw_vers -productVersion) in
-    11*) codename=big_sur;;
-    12*) codename=monterey;;
-    13*) codename=ventura;;
-    14*) codename=sonoma;;
-esac
-
-brew fetch --bottle-tag=arm64_"${codename}" libusb
-brew fetch --bottle-tag="${codename}" libusb
-tar xf "$(brew --cache --bottle-tag=arm64_"${codename}" libusb)" -C /tmp/arm64/
-tar xf "$(brew --cache --bottle-tag="${codename}" libusb)" -C /tmp/amd64
-for f in /tmp/arm64/libusb/"$version"/lib/* ; do
-    if lipo -info "$f" >/dev/null 2>&1; then
-        file="$(basename "$f")"
-        lipo -create -output "$(brew --cellar)/libusb/$version/lib/$file" \
-            "/tmp/arm64/libusb/$version/lib/$file" \
-            "/tmp/amd64/libusb/$version/lib/$file"
-    fi
-done
@@ -7,10 +7,10 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"

 # This script will install Nodejs

-version="18.16.0"
+version="22.21.1"
 urlCache="http://ci-files01-hki.ci.qt.io/input/nodejs/node-v$version.pkg"
 urlOffcial="https://nodejs.org/dist/v$version/node-v$version.pkg"
-sha256="156aa5b9580288fb0b3c6134eb8fac64e50745d78d33eebe9e29eb7ff87b8e1e"
+sha256="182ad62634eabbb11497c2284a3172771944f1cd17e23b143e778bd189af6d65"

 DownloadURL $urlCache $urlOffcial $sha256 "/tmp/node-v$version.pkg"
 sudo installer -pkg "/tmp/node-v$version.pkg" -target /
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+# Copyright (C) 2025 The Qt Company Ltd.
+# Copyright (C) 2017 Pelagicore AG
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+# This script installs python3 on macOS ARM hosts.
+
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+# Use 3.12 as a default python
+# Note: Make sure that it's a version where dependencies are stored in CI-files.
+python_ver="3.12.11"
+
+export PYTHON_BUILD_MIRROR_URL="https://ci-files01-hki.ci.qt.io/input/python/"
+export PYTHON_BUILD_MIRROR_URL_SKIP_CHECKSUM=1
+pyenv install "$python_ver"
+
+/Users/qt/.pyenv/versions/$python_ver/bin/pip3 install --user virtualenv wheel html5lib
+/Users/qt/.pyenv/versions/$python_ver/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../shared/requirements.txt
+
+SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/$python_ver/bin/"
+SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/$python_ver/bin/"
+SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
+
+# Provisioning during installation says:
+# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.'
+# hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
+SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin"
+
+# Set SBOM_PYTHON_INTERP_PATH to Python3 instance which was used to install SBOM packages from requirements
+SetEnvVar "SBOM_PYTHON_INTERP_PATH" "/Users/qt/.pyenv/versions/$python_ver/bin/python3"
+
+echo "python3 = $python_ver" >> ~/versions.txt
@@ -6,12 +6,12 @@ set -ex

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

-targetVersion=0.2.14
+targetVersion=v0.15.0
 if [[ `arch` == arm* ]]; then
    targetArch=aarch64-apple-darwin
-    sha1=ad10cd4b8889fa08e193a4165ac664876a27c0dc
+    sha256=430ef7b5f54256d3ed5bfe77e8b0afc51aa209aeebe4f95b69c3a52ce3acc6e9
 else
    targetArch=x86_64-apple-darwin
-    sha1=764bc1664c0ff616d9980a6d127175d0a2041781
+    sha256=f8da93e0689122268f720ddb48c8357f3da18be8c88aff23a8e75a7a219367db
 fi
-installSccache "$targetArch" "$targetVersion" "$sha1"
+installSccache "$targetArch" "$targetVersion" "$sha256"
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+# Copyright (C) 2026 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+# This script installs Syft
+
+# Syft is used for generating SBOM (Software Bill of Materials) files.
+
+# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+
+version="1.45.1"
+
+uname_m="$(uname -m)"
+case "$uname_m" in
+    x86_64|amd64)
+        SHA1="ecd1a9283e4ce025b5905a85e505fcba237edd51"
+        arch="amd64"
+        ;;
+    arm64|aarch64)
+        SHA1="996f3985f14ebbe8661c0b72d7ad520200155c46"
+        arch="arm64"
+        ;;
+    *) fatal "Unknown architecture in uname: $uname_m" 43 ;;
+esac
+
+PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/syft/syft_${version}_darwin_${arch}.tar.gz"
+AltUrl="https://github.com/anchore/syft/releases/download/v${version}/syft_${version}_darwin_${arch}.tar.gz"
+targetFolder="/opt/syft-$version"
+appPrefix=""
+
+InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
+
+SetEnvVar "PATH" "$targetFolder:\$PATH"
+
+echo "Syft = $version" >> ~/versions.txt
@@ -1 +1 @@
--disable-programs --disable-doc --disable-debug --enable-network --disable-lzma --enable-pic --disable-vulkan --disable-v4l2-m2m --disable-decoder=truemotion1
+--disable-programs --disable-doc --disable-debug --enable-network --disable-lzma --enable-pic --disable-vulkan --disable-v4l2-m2m --disable-decoder=truemotion1 --disable-avdevice --disable-avfilter
@@ -7,25 +7,28 @@ set -euox pipefail
 lib_dir="$1/lib"
 additional_suffix="${2:-}"
 set_rpath="${3:-yes}"
+page_size="${4:-}"
+custom_readelf="${5:-""}"

-# 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."
+# 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"
        exit 1
    fi
-    readelf() { "$readelf_homebrew_path" "$@"; }
-fi
-
-if ! command -v readelf; then
+elif ! 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
@@ -37,7 +40,7 @@ if [[ "$patchelf_version" == "0.18.0" ]]; then
    echo "WARNING: patchelf version 0.18.0 is known to have issues with Android." >&2
 fi

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

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

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

    while read -r line; do
@@ -81,7 +84,12 @@ for lib_name in "${ffmpeg_libs[@]}"; do
                stub_name="${stub_name%%.*}${additional_suffix}.${stub_name#*.}" # Add additional_suffix
            fi

-            patchelf --replace-needed "${BASH_REMATCH[1]}" "${stub_name}" "$lib_path"
+            additional_command_args=""
+            if [ -n "$page_size" ]; then
+                additional_command_args+="--page-size ${page_size}"
+            fi
+
+            patchelf ${additional_command_args} --replace-needed "${BASH_REMATCH[1]}" "${stub_name}" "$lib_path"
        fi
    done <<< "$(read_needed_deps)"

@@ -4,4 +4,5 @@ ntia-conformance-checker ; python_version >= '3.9'
 sbomaudit ; python_version >= '3.9'
 sbom2doc ; python_version >= '3.9'
 reuse<=5.1.1 ; python_version >= '3.9'
-cyclonedx-python-lib==11.0.0 ; python_version >= '3.9'
+cyclonedx-python-lib==11.5.0 ; python_version >= '3.9'
+jsonschema>=4.20 ; python_version >= '3.12'
@@ -1,5 +1,10 @@
 FROM ubuntu:16.04
 ARG COIN_RUNS_IN_QT_COMPANY
-RUN  test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue  \
-  && sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \
-  || echo "Internal package repository not found. Using public repositories."
+RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
+  && { printf '%s\n' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-amd64 main restricted universe multiverse' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-updates-amd64 main restricted universe multiverse' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-backports-amd64 main restricted universe' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-security-amd64 main restricted universe multiverse' \
+> /etc/apt/sources.list; \
+  } \
@@ -1,5 +1,10 @@
 FROM ubuntu:18.04
 ARG COIN_RUNS_IN_QT_COMPANY
-RUN  test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue  \
-  && sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \
-  || echo "Internal package repository not found. Using public repositories."
+RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
+  && { printf '%s\n' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-amd64 main restricted universe multiverse' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-updates-amd64 main restricted universe multiverse' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-backports-amd64 main restricted universe' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-security-amd64 main restricted universe multiverse' \
+> /etc/apt/sources.list; \
+  } \
@@ -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/aledelev/vcpkg",
+    "repository": "https://git.qt.io/qtbuildsystem/vcpkg",
    "baseline": "9c5c2a0ab75aff5bcd08142525f6ff7f6f7ddeee"
  },
-  "overlay-triplets": [ "./../../shared/triplets" ]
+  "overlay-triplets": [ "./../triplets" ]
 }
--- a/Show More
+++ b/Show More