Update submodules on '6.11.3 in qt/qt5'

Change-Id: If39f140c3311f4b00522c3d0f5e27f27328be84c
Reviewed-by: Qt Submodule Update Bot <[email protected]>

.gitignore

@@ -5,8 +5,8 @@ Makefile
 CMakeLists.txt.user*
 CMakeUserPresets.json
 .vscode
-build
+build/
-build-*
+build-*/
 .DS_Store
 init-repository.opt
 init-repository.opt.in

.gitmodules

@@ -1,53 +1,46 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = dev
+	branch = 6.11.3
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = dev
+	branch = 6.11.3
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = dev
+	branch = 6.11.3
 	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 = dev
+	branch = 6.11.3
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +48,7 @@
 	recommends = qtmultimedia qtshadertools qttasktree qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = dev
+	branch = 6.11.3
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,7 +61,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = dev
+	branch = 6.11.3
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -76,283 +69,243 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = dev
+	branch = 6.11.3
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = dev
+	branch = 6.11.3
 	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 = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
+	branch = 6.11.3
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = dev
+	branch = 6.11.3
 	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 = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = dev
+	branch = 6.11.3
 	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = dev
+	branch = 6.11.3
 	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = dev
+	branch = 6.11.3
 	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 = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = dev
+	branch = 6.11.3
 	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 = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = dev
+	branch = 6.11.3
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = dev
+	branch = 6.11.3
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = dev
+	branch = 6.11.3
 	status = addon
 [submodule "qttasktree"]
 	depends = qtbase
 	path = qttasktree
 	url = ../qttasktree.git
-	branch = dev
+	branch = 6.11.3
 	status = preview
 [submodule "qtopenapi"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtopenapi
 	url = ../qtopenapi.git
-	branch = dev
+	branch = 6.11.3
 	status = preview
 [submodule "qtcanvaspainter"]
 	depends = qtbase qtdeclarative qtshadertools
 	path = qtcanvaspainter
 	url = ../qtcanvaspainter.git
-	branch = dev
+	branch = 6.11.3
 	status = preview

cmake/QtIRCommandLineHelpers.cmake

@@ -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()

cmake/QtIRGitHelpers.cmake

@@ -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}"
     )

cmake/QtIRHelpers.cmake

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

cmake/QtIROptionsHelpers.cmake

@@ -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()

cmake/QtTopLevelHelpers.cmake

@@ -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()

coin/instructions/coin_run_top_level_cmake_tests.yaml

@@ -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

coin/platform_configs/android-studio-tools.yaml

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

coin/platform_configs/cmake_platforms.yaml

@@ -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={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
-        'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
+        'OPENSSL_LIB={{.Env.OPENSSL_LIB_x64_arm64}}',
-        'OPENSSL_LIB_x64={{.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'

coin/platform_configs/cmake_platforms_qemu.yaml

@@ -12,7 +12,7 @@ Configurations:
         'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin",
+        "QT_CMAKE_DIR=/opt/cmake-4.3.2/bin",
         'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
         'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
         'QT_QUICK_BACKEND=software',
@@ -31,7 +31,7 @@ Configurations:
         'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin",
+        "QT_CMAKE_DIR=/opt/cmake-4.3.2/bin",
         'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
         'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
         'QT_QUICK_BACKEND=software',
@@ -50,7 +50,7 @@ Configurations:
         'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin",
+        "QT_CMAKE_DIR=/opt/cmake-4.3.2/bin",
         'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
         'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
         'QT_QUICK_BACKEND=software',

coin/platform_configs/cmake_platforms_qemu_qnx.yaml

@@ -12,8 +12,8 @@ Configurations:
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin',
+        'QT_CMAKE_DIR=/opt/cmake-4.3.2/bin',
-        'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
+        'QNX_TEST_ENV=TMPDIR=/data/var/tmp HOME=/data/home/root FONTCONFIG_FILE=/data/var/etc/fontconfig/fonts.conf LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_SYSTEM_VERSION=710 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
         'QNX_QEMU={{.Env.QNX_710_QEMU}}',
         'VCPKG_HOST_TRIPLET=x64-linux-qt',
@@ -63,8 +63,8 @@ Configurations:
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_800}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin',
+        'QT_CMAKE_DIR=/opt/cmake-4.3.2/bin',
-        'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
+        'QNX_TEST_ENV=TMPDIR=/data/var/tmp HOME=/data/home/root FONTCONFIG_FILE=/data/var/etc/fontconfig/fonts.conf LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
         'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_SYSTEM_VERSION=802 -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
         'QNX_QEMU={{.Env.QNX_800_QEMU}}',
         'VCPKG_HOST_TRIPLET=x64-linux-qt',

coin/platform_configs/cmake_platforms_static_release.yaml

@@ -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'
+    Id: 'rhel-9.6-minimal-static-test'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    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'

coin/platform_configs/cmake_platforms_static_tests.yaml

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

coin/platform_configs/cmake_platforms_target_android.yaml

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

coin/platform_configs/cmake_platforms_wasm.yaml

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

coin/platform_configs/default.yaml

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

coin/platform_configs/linux_android_tests_developer.yaml

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

coin/platform_configs/linux_android_tests_multi_abi.yaml

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

coin/platform_configs/macos.yaml

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

coin/platform_configs/nightly_android_namespace.yaml

@@ -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',

coin/platform_configs/nightly_android_ndk1.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: [

coin/platform_configs/nightly_android_ndk2.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: [

coin/platform_configs/nightly_android_ndk_preview.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',

coin/platform_configs/nightly_cxx23.yaml

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

coin/platform_configs/nightly_examples_and_tests.yaml

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

coin/platform_configs/nightly_pyside6_axivion.yaml

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

coin/platform_configs/nightly_qnx710_host_windows.yaml

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

coin/platform_configs/nightly_qt5_axivion.yaml

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

coin/platform_configs/nightly_qtmultimedia_elinux.yaml

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

coin/platform_configs/nightly_top_level_run_cmake_tests.yaml

@@ -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: ''

coin/platform_configs/nightly_unity_builds.yaml

@@ -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'
+    Id: 'rhel-9.6-unity-build'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-50'
+    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'

coin/platform_configs/qmake2cmake.yaml

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

coin/platform_configs/qt-creator.yaml

@@ -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-8.10-x86_64-51'
+    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-14-arm-106'
+    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,24 +36,37 @@ 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-8.10-x86_64-51'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
     Compiler: 'GCC'
     Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
     Configure arguments: ''
     Environment variables: []
 -
-    Template: 'qtci-macos-14-arm-106'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'DebugAndRelease', 'OldestQt', 'QtC18AndEarlier']
+    Configure arguments: ''
+    Environment variables: []
+-
+    Template: 'qtci-macos-15-arm-105'
     Compiler: 'Clang'
     Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
     Configure arguments: ''
     Environment variables: []
+# Tests GCC 11
+-
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
+    Configure arguments: ''
+    Environment variables: []
 # license check
 -
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'

coin/platform_configs/qtbase.yaml

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

coin/platform_configs/qtbase_new_compiler_testing.yaml

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

coin/platform_configs/qtgradleplugin.yaml

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

coin/platform_configs/qtjenny.yaml

@@ -2,7 +2,6 @@ Version: 2
 Module only: True
 Include: [
     cmake_platforms.yaml: [
-        'rhel-9.4',
         'rhel-9.6'
     ],
     cmake_platforms_target_android.yaml: [

coin/platform_configs/qtlite.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'

coin/platform_configs/qtsaferenderer-runtime.yaml

@@ -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",
@@ -54,7 +53,7 @@ Configurations:
         'TARGET_CONFIGURE_ARGS=-release -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd -qtlibinfix TestInfix',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin",
+        "QT_CMAKE_DIR=/opt/cmake-4.3.2/bin",
         'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
         'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
         'QT_QUICK_BACKEND=software',

coin/platform_configs/qtsaferenderer.yaml

@@ -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',

coin/platform_configs/quick-bridges.yaml

@@ -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: >

coin/platform_configs/quick-minimal.yaml

@@ -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: >

coin/platform_configs/tqtc-android-automotive.yaml

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

coin/platform_configs/tqtc-qtbridges.yaml

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

coin/platform_configs/tqtc-qtpip.yaml

@@ -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"

coin/platform_configs/wasm_qtbase_tests.yaml

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

coin/platform_configs/yocto.yaml

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

coin/pre-provisioning/qtci-linux-RHEL-10.0-x86_64/01-disable-automounting.sh

@@ -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

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

@@ -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

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

@@ -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

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

@@ -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

coin/provisioning/common/linux/android/gradle_project/.gitignore

@@ -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

coin/provisioning/common/linux/android/gradle_project/README.md

@@ -15,6 +15,11 @@ that might need updates in the future:
     layout and logic of the app, this shouldn't need to be touched.
 - AndroidManifest.xml / app/build.gradle: Sets project settings like target version.
 - gradle/libs.versions.toml: This sets the version numbers of various dependencies.
+- feature/: an on-demand dynamic feature module, it caches the
+    com.android.dynamic-feature plugin and the Play feature delivery library
+    used by the Feature Delivery tests.
+- build.gradle: also declares org.qtproject.qt.gradleplugin to cache the Qt
+    Gradle Plugin used by Qt for Android Studio projects.
 
 Other files required for the project build are gradle wrapper and scripts which
 are fetched by android_linux.sh from qtbase.

coin/provisioning/common/linux/android/gradle_project/app/build.gradle

@@ -4,24 +4,27 @@ 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
+        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_17
     }
+
+    dynamicFeatures = [':feature']
 }
 
 dependencies {
     implementation libs.core
     implementation libs.appcompat
     implementation libs.material
+    implementation libs.play.feature.delivery
 }

coin/provisioning/common/linux/android/gradle_project/app/src/main/AndroidManifest.xml

@@ -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">

coin/provisioning/common/linux/android/gradle_project/app/src/main/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="feature_title">Feature</string>
+</resources>

coin/provisioning/common/linux/android/gradle_project/build.gradle

@@ -1,4 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
 alias(libs.plugins.androidApplication) apply false
+alias(libs.plugins.androidDynamicFeature) apply false
+alias(libs.plugins.qtGradlePlugin) apply false
 }

coin/provisioning/common/linux/android/gradle_project/feature/build.gradle

@@ -0,0 +1,17 @@
+plugins {
+    alias(libs.plugins.androidDynamicFeature)
+}
+
+android {
+    namespace 'com.example.gradle_project.feature'
+    compileSdk 36
+
+    defaultConfig {
+        minSdk 28
+    }
+}
+
+dependencies {
+    implementation project(':app')
+    implementation libs.play.feature.delivery
+}

coin/provisioning/common/linux/android/gradle_project/feature/src/main/AndroidManifest.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:dist="http://schemas.android.com/apk/distribution">
+    <dist:module
+        dist:instant="false"
+        dist:title="@string/feature_title">
+        <dist:delivery>
+            <dist:on-demand />
+        </dist:delivery>
+        <dist:fusing dist:include="true" />
+    </dist:module>
+</manifest>

coin/provisioning/common/linux/android/gradle_project/feature/src/main/java/com/example/gradle_project/feature/Feature.java

@@ -0,0 +1,7 @@
+package com.example.gradle_project.feature;
+
+public class Feature {
+    public static String hello() {
+        return "hello";
+    }
+}

coin/provisioning/common/linux/android/gradle_project/gradle/libs.versions.toml

@@ -1,17 +1,22 @@
 [versions]
-agp = "8.10.1"
+agp = "9.0.0"
-core = "1.16.0"
+core = "1.17.0"
 appcompat = "1.7.1"
-material = "1.12.0"
+material = "1.13.0"
 constraintlayout = "2.2.1"
+play-feature-delivery = "2.1.0"
+qt-gradle-plugin = "1.4"
 
 [libraries]
 core = { group = 'androidx.core', name = "core", version.ref = "core" }
 appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
 constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" }
+play-feature-delivery = { module = "com.google.android.play:feature-delivery", version.ref = "play-feature-delivery" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
+androidDynamicFeature = { id = "com.android.dynamic-feature", version.ref = "agp" }
+qtGradlePlugin = { id = "org.qtproject.qt.gradleplugin", version.ref = "qt-gradle-plugin" }
 
 [bundles]

coin/provisioning/common/linux/android/gradle_project/settings.gradle

@@ -14,4 +14,4 @@ dependencyResolutionManagement {
 }
 
 rootProject.name = "gradle_project"
-include ':app'
+include ':app', ':feature'

coin/provisioning/common/linux/android_linux.sh

@@ -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"
+toolsVersion="19.0"
-toolsFile="commandlinetools-linux-6609375_latest.zip"
+toolsFile="commandlinetools-linux-13114758_latest.zip"
-sdkBuildToolsVersion="35.0.1"
+toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile"
-sdkApiLevel="android-35"
+sdkBuildToolsVersion="36.0.0"
-toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
+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"
+echo "Download and unzip Android 16 System Image"
-maxVersionFileName="x86_64-35_r08.zip"
+maxVersionFileName="x86_64-36_r07.zip"
-maxVersionDestination="$sdkTargetFolder/system-images/android-35/google_apis/"
+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"
+echo "Download and unzip Android 17 Beta 3 16KB System Image"
-insignificantMaxVersionFileName="x86_64-36_r06.zip"
+insignificantMaxVersionFileName="x86_64-ps16k-37.0_r03.zip"
-insignificantMaxVersionDestination="$sdkTargetFolder/system-images/android-36/google_apis/"
+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

coin/provisioning/common/linux/axivion/ci_config_common.json

@@ -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": {

coin/provisioning/common/linux/axivion/rule_config.json

@@ -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,
+        11,
-        4,
+        5,
-        17655
+        19102
     ]
 }

coin/provisioning/common/linux/axivion/start_analysis.sh

@@ -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 "$@"

coin/provisioning/common/linux/cmake_linux.sh

@@ -11,13 +11,26 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-majorminorversion="3.30"
+majorminorversion="4.3"
-version="3.30.5"
+version="4.3.2"
-PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz"
+
-AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz"
+uname_m="$(uname -m)"
-SHA1="61b339cac5f110d5ed2934f66a26c2e991945e01"
+case "$uname_m" in
+    x86_64|amd64)
+        SHA1="736c0722ed8393b3eb74fd573f6c9c245770206a"
+        arch="x86_64"
+        ;;
+    arm64|aarch64)
+        SHA1="a173eb910c808f561422feb45fe1fe57c3e346fa"
+        arch="aarch64"
+        ;;
+    *) fatal "Unknown architecture in uname: $uname_m" 43 ;;
+esac
+
+PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-linux-$arch.tar.gz"
+AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-$arch.tar.gz"
 targetFolder="/opt/cmake-$version"
-appPrefix="cmake-$version-linux-x86_64"
+appPrefix="cmake-$version-linux-$arch"
 
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
 

coin/provisioning/common/linux/distro_version_check.sh

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+# Copyright (C) 2026 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+set -e
+
+OS_STATE_DIR="/var/lib/qtciid"
+OS_STATE_FILE="$OS_STATE_DIR/os-version"
+
+get_os_id() {
+    if [[ -r /etc/os-release ]]; then
+        # shellcheck disable=SC1091
+        . /etc/os-release
+        # os-release contains ID of the distro (e.g. 'ubuntu')
+        # VERSION e.g. '24.04.1 LTS (Noble Numbat)'
+        if [[ -n "${ID:-}" && -n "${VERSION:-}" ]]; then
+            echo "${ID}:${VERSION}"
+            return 0
+        fi
+    fi
+
+    echo "unknown:unknown"
+    return 1
+}
+
+record_os_version() {
+    local os_id
+
+    os_id="$(get_os_id)"
+
+    if [[ "$os_id" == "unknown:unknown" ]]; then
+        echo "ERROR: Unable to determine OS version"
+        exit 1
+    fi
+
+    sudo mkdir -p "$OS_STATE_DIR"
+    echo "$os_id" | sudo tee "$OS_STATE_FILE" > /dev/null
+
+    echo "OS version: $os_id"
+}
+
+verify_os_version_unchanged() {
+    if [[ ! -f "$OS_STATE_FILE" ]]; then
+        echo "ERROR: OS version state file missing: $OS_STATE_FILE"
+        exit 1
+    fi
+
+    local start_version current_version
+
+    start_version="$(cat "$OS_STATE_FILE")"
+    current_version="$(get_os_id)"
+
+    if [[ "$current_version" == "unknown:unknown" ]]; then
+        echo "ERROR: Unable to determine current OS version"
+        exit 1
+    fi
+
+    if [[ "$start_version" != "$current_version" ]]; then
+        echo "ERROR: OS version changed during provisioning!"
+        echo "  Start version : $start_version"
+        echo "  End version   : $current_version"
+        exit 1
+    fi
+
+    echo "OS version unchanged ($current_version)"
+}

coin/provisioning/common/linux/ffmpeg_required_opensuse_packages.txt

@@ -0,0 +1,3 @@
+diffutils
+make
+yasm

coin/provisioning/common/linux/ffmpeg_required_rhel_packages.txt

@@ -0,0 +1,4 @@
+diffutils
+libva-devel
+make
+yasm

coin/provisioning/common/linux/ffmpeg_required_sles_packages.txt

@@ -0,0 +1,3 @@
+diffutils
+make
+yasm

coin/provisioning/common/linux/ffmpeg_required_ubuntu_packages.txt

@@ -0,0 +1,4 @@
+diffutils
+libva-dev
+make
+yasm

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

@@ -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_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/heads/sdk/$nv_codec_version.zip"
+    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-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-$nv_codec_version.zip"
-    local nv_codec_sha1="ceb4966ab01b2e41f02074675a8ac5b331bf603e"
+    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"

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

@@ -17,8 +17,8 @@ APPNAME="CiNetworkTest"
 EXECPATH="${ROOT}/${APPNAME}/bin"
 EXEC="${EXECPATH}/${APPNAME}"
 URL="https://ci-files01-hki.ci.qt.io/input/networktestapp"
-TARBALL="CiNetworkTest-rhel-linux-x86_64-v1.1.tgz"
+TARBALL="CiNetworkTest-rhel-linux-x86_64-v1.2.tgz"
-sha256="3a23593f163ca2452546d20d56cabc81fed03c930d6d96334a22827da5a6840a"
+sha256="2be05baebf48ff29ebcd06a0761b2a3d92ae5a66f78d0cd953513d8271eb7f83"
 SOURCE="$URL/$TARBALL"
 InstallFromCompressedFileFromURL "$SOURCE" "" "$sha256" "$ROOT" "$PREFIX"
 

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

@@ -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"

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

@@ -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"
         ;;

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

@@ -4,9 +4,7 @@
 
 echo "Installing vcpkg android ports"
 
-pushd "${BASH_SOURCE%/*}/vcpkg" || exit
+pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit
-cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" .
-
 "$VCPKG_ROOT/vcpkg" install --triplet x86-android-qt --x-install-root x86-android-qt-tmp --debug
 "$VCPKG_ROOT/vcpkg" install --triplet x86_64-android-qt --x-install-root x86_64-android-qt-tmp --debug
 

coin/provisioning/common/linux/install-vxworks-qemu.sh

@@ -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"

coin/provisioning/common/linux/qnx_710.sh

@@ -43,9 +43,9 @@ if [ ! -d "$targetFolder" ]; then
 fi
 
 # QNX SDP
-sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20240417.tar.xz"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20260422.tar.xz"
 targetFile="qnx710.tar.xz"
-sha1="cd2d35004fb2798089e29d9e1226691426632da0"
+sha1="98b24df7e8c53a104aee76e769011396fa4bdafd"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
 
 sudo cp "$aarch64le_toolchain" "$targetPath"

coin/provisioning/common/linux/qnx_800.sh

@@ -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"

coin/provisioning/common/linux/qnx_qemu_build_files/710/local/misc_files/etc/hosts

@@ -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

coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/data_files.custom

@@ -13,7 +13,7 @@ PATH=__IFS_PATH__:/system/xbin:.
 var/share/zoneinfo=usr/share/zoneinfo
 
 [uid=0 gid=0 dperms=755 type=dir] var/share/fonts
-var/etc/fontconfig/fonts.conf=etc/fontconfig/fonts.conf
+var/etc/fontconfig/fonts.conf=etc/fonts/fonts.conf
 var/share/fonts=usr/share/fonts
 
 var/etc/hosts=local/misc_files/etc/hosts

coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/ifs_files.custom

@@ -0,0 +1,3 @@
+# local/snippets/ifs_files.custom
+# Placeholder for local list of files to add to ifs
+/usr/libexec/sshd-session=usr/libexec/sshd-session

coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/post_start.custom

@@ -18,6 +18,8 @@ rm -rf /data/var/share/fonts/NotoSansCJK*
 rm -rf /data/var/share/fonts/NotoSansMonoCJK*
 echo "---> Create fontconfig cache"
 fc-cache &
+# For fc-match in QFont tests
+ln -Ps /system/lib/libfontconfig.so.17 /system/lib/libfontconfig.so.1
 
 # Add default route so QNX knows where to send
 # requests for unknown network

coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/system_files.custom

@@ -21,7 +21,7 @@ lib/libGLESv2.so.1=usr/lib/libGLESv2.so.1
 lib/libEGL.so.1=usr/lib/libEGL.so.1
 lib/libz.so.2=usr/lib/libz.so.2
 lib/libxml2.so.2=usr/lib/libxml2.so.2
-lib/libfreetype.so.24=usr/lib/libfreetype.so.24
+lib/libfreetype.so.26=usr/lib/libfreetype.so.26
 lib/libbz2.so.1=usr/lib/libbz2.so.1
 lib/liblzma.so.5=usr/lib/liblzma.so.5
 lib/libbacktrace.so.1=usr/lib/libbacktrace.so.1
@@ -54,7 +54,7 @@ lib/libmmrndclient.so.1=usr/lib/libmmrndclient.so.1
 lib/libscreen.so.1=usr/lib/libscreen.so.1
 
 # for fontconfig
-lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1
+lib/libfontconfig.so.17=usr/lib/libfontconfig.so.17
 xbin/fc-cache=bin/fc-cache
 xbin/fc-match=local/misc_files/fc-match
 

coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/hosts

@@ -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

coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/data_files.custom

@@ -13,7 +13,7 @@ PATH=__IFS_PATH__:/system/xbin:.
 var/share/zoneinfo=usr/share/zoneinfo
 
 [uid=0 gid=0 dperms=755 type=dir] var/share/fonts
-var/etc/fontconfig/fonts.conf=etc/fontconfig/fonts.conf
+var/etc/fontconfig/fonts.conf=etc/fonts/fonts.conf
 var/share/fonts=usr/share/fonts
 
 var/etc/hosts=local/misc_files/etc/hosts

coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/system_files.custom

@@ -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
@@ -53,8 +53,13 @@ xbin/fsevmgr=sbin/fsevmgr
 ##############################################
 lib/libscreen.so.1=usr/lib/libscreen.so.1
 
+##############################################
+### Audio support
+##############################################
+lib/libasound.so.5=lib/libasound.so.5
+
 # for fontconfig
-lib/libfontconfig.so.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
 

coin/provisioning/common/linux/sccache.sh

@@ -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"

coin/provisioning/common/linux/syft.sh

@@ -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

coin/provisioning/common/linux/verify-release-packages.sh

@@ -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
+}
+

coin/provisioning/common/macos/android.sh

@@ -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"
+basePath="http://ci-files01-hki.ci.qt.io/input/android"
-# toolsFile dertermines tools version
+
-toolsFile="commandlinetools-mac-6609375_latest.zip"
+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"
+ndkVersionNightly1=$ndkVersionLatest  # Set as same version as latest = skip NDK install in provisioning
-ndkVersionPreview="r29-beta2"
+ndkSha1Nightly1=$ndkSha1Latest
-ndkVersionNightly1="$ndkVersionLatest"  # If same version as latest = skip NDK install for nightly
-ndkVersionNightly2="$ndkVersionLatest"
 
-sdkBuildToolsVersion="35.0.1"
+ndkVersionNightly2=$ndkVersionLatest
-# this is compile sdk version
+ndkSha1Nightly2=$ndkSha1Latest
-sdkApiLevel="android-35"
 
+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
+    ndkFile="android-ndk-$ndkVersion-darwin.zip"
-        echo "Unzipping Android NDK $ndkVersion to '${targetFolder}'"
+    ndkTargetFile="/tmp/$ndkFile"
-        ndkSourceFile="$basePath/android-ndk-$ndkVersion-darwin*.zip"
+    ndkSourceFile="$basePath/$ndkFile"
-        sudo unzip -q "$ndkSourceFile" -d "$targetFolder"
-    fi
 
+    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
+InstallNdk $ndkVersionLatest $ndkSha1Latest
-SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest"
+SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$androidNdkRoot"
 
 if [ "$ndkVersionPreview" != "$ndkVersionLatest" ]; then
-    InstallNdk $ndkVersionPreview
+    InstallNdk $ndkVersionPreview $ndkSha1Preview
-    SetEnvVar "ANDROID_NDK_ROOT_PREVIEW" "$targetFolder/android-ndk-$ndkVersionPreview"
+    SetEnvVar "ANDROID_NDK_ROOT_PREVIEW" "$androidNdkRoot"
 fi
 
 if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then
-    InstallNdk $ndkVersionNightly1
+    InstallNdk $ndkVersionNightly1 $ndkSha1Nightly1
-    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY1" "$targetFolder/android-ndk-$ndkVersionNightly1"
+    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY1" "$androidNdkRoot"
 fi
 
 if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
-    InstallNdk $ndkVersionNightly2
+    InstallNdk $ndkVersionNightly2 $ndkSha1Nightly2
-    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY2" "$targetFolder/android-ndk-$ndkVersionNightly2"
+    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 '^\[[ =]*\]'"
-
+# But don't let the pipeline hide sdkmanager failures.
-sudo mkdir "$sdkTargetFolder/cmdline-tools"
+set -o pipefail
-sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools"
 
 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" \
+# shellcheck disable=SC2031
-    "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
+if [ "$http_proxy" != "" ]; then
-    | eval "$sdkmanager_no_progress_bar_cmd"
+    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"

coin/provisioning/common/macos/cmake.sh

@@ -11,11 +11,11 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-majorminorversion="3.30.5"
+majorminorversion="4.3"
-version="3.30.5"
+version="4.3.2"
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-macos-universal.tar.gz"
 AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-macos-universal.tar.gz"
-SHA1="c81c2f7482a901c4a32a81034920c23c22233a0f"
+SHA1="e3b456c03d992239f9d83d933336768c7fc1ff54"
 appPrefix="cmake-$version-macos-universal"
 
 InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"