QtBridge: Remove "disable-deprecated-up-to" from config

Remove the flag "-disable-deprecated-up-to 0x070000" which disables all
deprecated function up to Qt 7.0.
We want users to be able to combine qtbridge and cxx-qt in Rust, so both
must use the same Qt version for binary compatibility. If Qt installation
is not present on the system then we will download the minimal Qt from
web.
We also want to support picking specific version of Qt by user:
i.e. "qt_exact_6_10". In this case when the Qt installation is
downloaded from web and built with `disable-deprecated-up-to 0x700000`
it might confusing for user if some functions are missing from API.

Change-Id: I5d00124a1704d4b5a553b7c2d05b3693ff422e74
Reviewed-by: Matthias Rauter <matthias.rauter@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>

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

@@ -102,18 +102,27 @@ endfunction()
 # - ../qt/qttools-litehtml.git
 function(qt_ir_add_git_remotes repo_relative_url working_directory)
     set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/")
-    set(gerrit_repo_url "${gerrit_ssh_base}")
+    set(gerrit_https_base "https://@USER@codereview.qt-project.org@AUTH@/")
 
     qt_ir_get_option_value(codereview-username username)
+    qt_ir_get_option_value(codereview-https https)
+
+    if(https)
+        set(gerrit_repo_url "${gerrit_https_base}")
+    else()
+        set(gerrit_repo_url "${gerrit_ssh_base}")
+    endif()
 
     # If given a username, make a "verbose" remote.
     # Otherwise, rely on proper SSH configuration.
     if(username)
         string(REPLACE "@USER@" "${username}@" gerrit_repo_url "${gerrit_repo_url}")
         string(REPLACE "@PORT@" ":29418" gerrit_repo_url "${gerrit_repo_url}")
+        string(REPLACE "@AUTH@" "/a" gerrit_repo_url "${gerrit_repo_url}")
     else()
         string(REPLACE "@USER@" "" gerrit_repo_url "${gerrit_repo_url}")
         string(REPLACE "@PORT@" "" gerrit_repo_url "${gerrit_repo_url}")
+        string(REPLACE "@AUTH@" ""   gerrit_repo_url "${gerrit_repo_url}")
     endif()
 
     set(namespace "qt")

cmake/QtIRHelp.txt

@@ -98,6 +98,9 @@ Options:
         username and port number, and thus relies on a correct SSH
         configuration.
 
+    --codereview-https
+        Specify this option to use HTTPs instead of SSH.
+
     --alternates <path to other Qt5 repo>
         Adds alternates for each submodule to another full qt5 checkout.
         This makes this qt5 checkout very small, as it will use the object

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)
@@ -133,25 +158,10 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
         endif()
 
         list(JOIN include_submodules "," include_submodules)
-        list(JOIN exclude_submodules "," exclude_submodules)
 
-        # Handle case when the -skip argument is already passed.
-        # In that case read the passed values, merge with new ones,
-        # remove both the -skip and its values, and re-add it later.
-        list(FIND filtered_args "-skip" skip_index)
-        if(exclude_submodules AND skip_index GREATER -1)
-            list(LENGTH filtered_args filtered_args_length)
-            math(EXPR skip_args_index "${skip_index} + 1")
-
-            if(skip_args_index LESS filtered_args_length)
-                list(GET filtered_args "${skip_args_index}" skip_args)
-                string(REPLACE "," ";" skip_args "${skip_args}")
-                list(APPEND skip_args ${exclude_submodules})
-                list(REMOVE_DUPLICATES skip_args)
-                list(JOIN skip_args "," exclude_submodules)
-                list(REMOVE_AT filtered_args "${skip_args_index}")
-                list(REMOVE_AT filtered_args "${skip_index}")
-            endif()
+        # Merge exclusions from module-subset into the skip list.
+        if(exclude_submodules)
+            list(APPEND skip_modules ${exclude_submodules})
         endif()
 
         # Handle case when only '-submodules existing' is passed and the
@@ -159,9 +169,13 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
         if(include_submodules)
             list(APPEND extra_configure_args "-submodules" "${include_submodules}")
         endif()
-        if(exclude_submodules)
-            list(APPEND extra_configure_args "-skip" "${exclude_submodules}")
-        endif()
+    endif()
+
+    # Forward all collected skip modules to configure.
+    if(skip_modules)
+        list(REMOVE_DUPLICATES skip_modules)
+        list(JOIN skip_modules "," skip_csv)
+        list(APPEND extra_configure_args "-skip" "${skip_csv}")
     endif()
 
     # Insert the extra arguments into the proper positions before and after '--'.
@@ -295,7 +309,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

@@ -14,6 +14,7 @@ macro(qt_ir_set_known_command_line_options)
     qt_ir_commandline_option(berlin TYPE boolean)
     qt_ir_commandline_option(branch TYPE boolean)
     qt_ir_commandline_option(codereview-username TYPE string)
+    qt_ir_commandline_option(codereview-https TYPE boolean)
     qt_ir_commandline_option(copy-objects TYPE boolean)
     qt_ir_commandline_option(fetch TYPE boolean DEFAULT_VALUE yes)
     qt_ir_commandline_option(force SHORT_NAME f TYPE boolean)
@@ -37,6 +38,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()

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

@@ -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'
@@ -182,7 +182,6 @@ 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'
@@ -198,13 +197,12 @@ 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_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,7 +211,6 @@ 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'
@@ -256,25 +253,12 @@ 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'
+    Id: 'rhel-9.6'
+    Template: 'qtci-linux-RHEL-9.6-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']
+    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',
@@ -283,8 +267,8 @@ Configurations:
         'VCPKG_TARGET_TRIPLET=x64-linux-qt',
     ]
 -
-    Id: 'rhel-9.6'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    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'

coin/platform_configs/cmake_platforms_static_release.yaml

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

coin/platform_configs/cmake_platforms_target_android.yaml

@@ -33,12 +33,12 @@ Configurations:
     ]
 -
     Id: 'android-9-x86-on-linux'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.4'
+    Platform dependency: 'rhel-9.6'
     Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
@@ -51,32 +51,13 @@ Configurations:
         'ANDROID_EMULATOR=emulator_x86_api_28'
     ]
 -
-    Id: 'android-9-x86-on-linux-rhel_9_6'
+    Id: 'android-16-x86_64-on-linux'
     Template: 'qtci-linux-RHEL-9.6-x86_64-51'
     Target os: 'Android_ANY'
-    Target arch: 'x86'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.6'
-    Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        # We check QT_USE_TARGET_ANDROID_BUILD_DIR only in one configuration, to ensure builds
-        # without this option work too.
-        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_USE_TARGET_ANDROID_BUILD_DIR=ON',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
-        'ANDROID_EMULATOR=emulator_x86_api_28'
-    ]
--
-    Id: 'android-15-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
-    Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.4'
+    Platform dependency: 'rhel-9.6'
     Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
@@ -86,37 +67,5 @@ Configurations:
         # configuration, to ensure builds without this option work too.
         'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_USE_TARGET_ANDROID_BUILD_DIR=ON -DQT_USE_ANDROID_MODERN_BUNDLE=ON',
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_35'
-    ]
--
-    Id: 'android-16-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.4'
-    Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_36'
-    ]
--
-    Id: 'android-16-x86_64-on-linux-rhel_9_6'
-    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']
-    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'
     ]

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

@@ -12,23 +12,19 @@ Configurations:
         Template: 'qtci-macos-15-arm-104'
         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}}',
             'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_FEATURE_open62541_security=OFF',
+            'VCPKG_HOST_TRIPLET=universal-osx-qt',
+            'VCPKG_TARGET_TRIPLET=universal-osx-qt',
         ]
 
     # Test on all supported macOS versions (deployment targets)
 
     # On x86_64
 
-    -
-        Id: 'macos-13-x86_64-tests'
-        Template: 'qtci-macos-13-x86_64-103'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-arm64'
     -
         Id: 'macos-14-x86_64-tests'
         Template: 'qtci-macos-14-x86_64-105'
@@ -41,32 +37,33 @@ Configurations:
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-arm64'
+    -
+        Id: 'macos-26-x86_64-tests'
+        Template: 'qtci-macos-26-x86_64-101'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly', 'Packaging', 'DoNotAbortTestingOnFirstFailure']
+        Platform dependency: 'macos-universal-on-arm64'
+        Environment variables: [ 'COIN_CTEST_IGNORE_EXIT_CODE=1' ]
 
     # And arm64
 
-    -
-        Id: 'macos-13-arm64-tests'
-        Template: 'qtci-macos-13-arm-107'
-        Compiler: 'Clang'
-        Features: ['TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-arm64'
     -
         Id: 'macos-14-arm64-tests'
         Template: 'qtci-macos-14-arm-106'
         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'
         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'
         Compiler: 'Clang'
-        Features: ['TestOnly', 'Packaging']
+        Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-arm64'
 
     # =========================================================================
@@ -81,6 +78,18 @@ Configurations:
         Compiler: 'Clang'
         Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
         Configure arguments: '-developer-build -release -force-asserts -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
+        Environment variables: [
+            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
+            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
+            'VCPKG_HOST_TRIPLET=universal-osx-qt',
+            'VCPKG_TARGET_TRIPLET=universal-osx-qt',
+        ]
+    -
+        Id: 'macos-26-x86_64-developer-build'
+        Template: 'qtci-macos-26-x86_64-101'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
+        Configure arguments: '-developer-build -release -force-asserts -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
         Environment variables: [
             'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
             'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
@@ -89,30 +98,28 @@ Configurations:
         Id: 'macos-arm64-developer-build'
         Template: 'qtci-macos-15-arm-104'
         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}}',
             'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
+            'VCPKG_HOST_TRIPLET=universal-osx-qt',
+            'VCPKG_TARGET_TRIPLET=universal-osx-qt',
         ]
     -
         Id: 'macos-26-arm64-developer-build'
         Template: 'qtci-macos-26-arm-104'
         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}}',
             'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
+            'VCPKG_HOST_TRIPLET=arm64-osx-qt',
+            'VCPKG_TARGET_TRIPLET=arm64-osx-qt',
         ]
 
     # Test on all supported macOS versions (deployment targets)
-    -
-        Id: 'macos-13-arm64-developer-build-tests'
-        Template: 'qtci-macos-13-arm-107'
-        Compiler: 'Clang'
-        Features: ['TestOnly']
-        Platform dependency: 'macos-arm64-developer-build'
     -
         Id: 'macos-14-arm64-developer-build-tests'
         Template: 'qtci-macos-14-arm-106'
@@ -129,6 +136,6 @@ Configurations:
         Id: 'macos-26-arm64-developer-build-tests'
         Template: 'qtci-macos-26-arm-104'
         Compiler: 'Clang'
-        Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+        Features: ['TestOnly']
         Platform dependency: 'macos-26-arm64-developer-build'
         Environment variables: [ 'COIN_CTEST_IGNORE_EXIT_CODE=1' ]

coin/platform_configs/messagingframework.yaml

@@ -0,0 +1,8 @@
+Version: 2
+Module only: true
+Include: [
+  cmake_platforms.yaml: [
+    "ubuntu-22.04"
+  ]
+]
+Configurations: []

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_build_qt_with_cmake_master.yaml

@@ -0,0 +1,11 @@
+Version: 2
+Include: [
+    cmake_platforms.yaml,
+    address_sanitizer_platforms.yaml,
+    offline_documentation.yaml
+]
+Configurations: []
+Overrides:
+-
+    Id: '.*'
+    +Features: ['BuildCMakeFromSources']

coin/platform_configs/nightly_cxx23.yaml

@@ -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_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_ubuntu_22_04_baseline_tests.yaml

@@ -0,0 +1,16 @@
+Version: 2
+Module only: True
+Configurations:
+-
+    Id: 'ubuntu-22.04-baseline-tests'
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'UseConfigure']
+    Configure arguments: '-developer-build -nomake examples'
+    Environment variables: [
+        'CMAKE_ARGS=-DFEATURE_test_auto=OFF -DFEATURE_test_baseline=ON -DOpenGL_GL_PREFERENCE=LEGACY',
+        'CTEST_DIR=tests/baseline',
+        'TESTARGS=-auto',
+        'QT_LANCELOT_SERVER=10.150.153.60'
+    ]
+

coin/platform_configs/nightly_unity_builds.yaml

@@ -5,7 +5,7 @@ Configurations:
     Template: 'qtci-windows-11_24H2-x86_64-71'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests']
-    Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib'
+    Configure arguments: '-debug -force-debug-info -headersclean -nomake examples -qt-zlib' # disabled example builds: qmake builds fail with C1041
     Environment variables: [
         'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DQT_UNITY_BUILD=ON',
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON',
@@ -13,8 +13,8 @@ Configurations:
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
 -
-    Id: 'rhel-8.10-unity-build'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-50'
+    Id: 'rhel-9.6-unity-build'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
     Compiler: 'GCC'
     Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
     Configure arguments: '-make examples -debug -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'

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

@@ -9,7 +9,7 @@ Configurations:
     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,7 +21,7 @@ Configurations:
     Configure arguments: ''
     Environment variables: []
 -
-    Template: 'qtci-macos-14-arm-106'
+    Template: 'qtci-macos-15-arm-104'
     Compiler: 'Clang'
     Features: ['Sccache', 'DebugAndRelease']
     Configure arguments: ''
@@ -43,17 +43,30 @@ Configurations:
     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-104'
     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/qtbridge-csharp.yaml

@@ -0,0 +1,13 @@
+Version: 2
+Include: [
+  quick-bridges.yaml: [
+     "windows-quick-bridges"
+  ]
+]
+Configurations:
+-
+    Id: 'windows-quick-bridges-csharp'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'MSVC2022'
+    Platform dependency: 'windows-quick-bridges'
+    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesCsharp']

coin/platform_configs/qtbridge-java.yaml

@@ -0,0 +1,46 @@
+Version: 2
+Include: [
+  quick-bridges.yaml: [
+     "macos-quick-bridges",
+     "linux-quick-bridges",
+     "windows-quick-bridges"
+     ]
+]
+
+Configurations:
+-
+    Id: 'windows-quick-bridges-java'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'MSVC2022'
+    Platform dependency: 'windows-quick-bridges'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesJava']
+
+-
+    Id: 'windows-on-arm-quick-bridges-java'
+    Template: 'qtci-windows-11_23H2-aarch64-53'
+    Compiler: 'MSVC2022'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'QtBridgesJava']
+
+-
+    Id: 'linux-quick-bridges-java'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
+    Compiler: 'GCC'
+    Platform dependency: 'linux-quick-bridges'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesJava']
+
+-
+    Id: 'linux-on-arm-quick-bridges-java'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-52'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'QtBridgesJava']
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
+    ]
+-
+    Id: 'macos-quick-bridges-universal-java'
+    Template: 'qtci-macos-15-arm-104'
+    Compiler: 'Clang'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'QtBridgesJava']
+    Environment variables: [
+        'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"',
+    ]

coin/platform_configs/qtbridge-python.yaml

@@ -0,0 +1,37 @@
+Version: 2
+Include: [
+  quick-bridges.yaml: [
+     "macos-quick-bridges",
+     "windows-quick-bridges"
+  ],
+  cmake_platforms.yaml: [
+     "rhel-9.6"
+  ]
+]
+Configurations:
+-
+    Id: 'windows-quick-bridges-python'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'MSVC2022'
+    Platform dependency: 'windows-quick-bridges'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
+
+-
+    Id: 'linux-quick-bridges-python'
+    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Compiler: 'GCC'
+    Platform dependency: 'rhel-9.6'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
+
+-
+    Id: 'macos-quick-bridges-python'
+    Template: 'qtci-macos-15-arm-104'
+    Compiler: 'Clang'
+    Platform dependency: 'macos-quick-bridges'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
+
+-
+    Id: 'windows-on-arm-quick-bridges-python'
+    Template: 'qtci-windows-11_23H2-aarch64-53'
+    Compiler: 'MSVC2022'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'QtBridgesPython']

coin/platform_configs/qtbridge-rust.yaml

@@ -0,0 +1,21 @@
+Version: 2
+Include: [
+  quick-bridges.yaml: [
+     "linux-quick-bridges",
+     "windows-quick-bridges"
+  ]
+]
+Configurations:
+-
+    Id: 'windows-quick-bridges-rust'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'MSVC2022'
+    Platform dependency: 'windows-quick-bridges'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesRust']
+
+-
+    Id: 'linux-quick-bridges-rust'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
+    Compiler: 'GCC'
+    Platform dependency: 'linux-quick-bridges'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesRust']

coin/platform_configs/qtbridge-swift.yaml

@@ -0,0 +1,21 @@
+Version: 2
+Include: [
+  quick-bridges.yaml: [
+     "macos-quick-bridges",
+     "linux-quick-bridges"
+  ]
+]
+Configurations:
+-
+    Id: 'macos-quick-bridges-swift'
+    Template: 'qtci-macos-15-arm-104'
+    Compiler: 'Clang'
+    Platform dependency: 'macos-quick-bridges'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesSwift']
+
+-
+    Id: 'linux-quick-bridges-swift'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
+    Compiler: 'GCC'
+    Platform dependency: 'linux-quick-bridges'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesSwift']

coin/platform_configs/qtbridges.yaml

@@ -6,17 +6,10 @@ 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'
-    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'
@@ -40,21 +33,21 @@ Configurations:
 
 -
     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']
 
 -
     Id: 'linux-quick-bridges-java'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
     Compiler: 'GCC'
     Platform dependency: 'linux-quick-bridges'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesJava']
 
 -
     Id: 'linux-quick-bridges-rust'
-    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-54'
     Compiler: 'GCC'
     Platform dependency: 'linux-quick-bridges'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesRust']

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: ['Packaging', 'UseConfigure']
 -
     Id: 'qtgp-on-macos'
     Template: 'qtci-macos-14-arm-106'

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

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

@@ -13,7 +13,6 @@ Configurations:
         -separate-debug-info
         -optimize-size
         -shared
-        -disable-deprecated-up-to 0x070000
         -no-feature-widgets
         -no-feature-sql
         -no-feature-printsupport
@@ -24,7 +23,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: >
@@ -35,7 +34,6 @@ Configurations:
         -separate-debug-info
         -optimize-size
         -shared
-        -disable-deprecated-up-to 0x070000
         -no-feature-widgets
         -no-feature-sql
         -no-feature-printsupport
@@ -43,7 +41,9 @@ Configurations:
         -no-feature-vnc
         -no-feature-picture
         -no-feature-pdf
-    Environment variables: []
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
+    ]
 -
     Id: 'windows-quick-bridges'
     Template: 'qtci-windows-11_24H2-x86_64-71'
@@ -56,7 +56,6 @@ Configurations:
         -force-debug-info
         -optimize-size
         -shared
-        -disable-deprecated-up-to 0x070000
         -no-feature-widgets
         -no-feature-sql
         -no-feature-printsupport

coin/platform_configs/quick-minimal.yaml

@@ -151,7 +151,7 @@ Configurations:
     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: >

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}}',
@@ -74,7 +41,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}}',

coin/platform_configs/tqtc-qtmcp.yaml

@@ -0,0 +1,15 @@
+Version: 2
+Include: [
+    cmake_platforms.yaml: [
+        'ubuntu-22.04',
+        'ubuntu-22.04-x11-tests',
+        'ubuntu-24.04-x64',
+        'ubuntu-24.04-x64-x11-tests',
+        'windows-11_24H2-msvc2022'
+    ],
+    macos.yaml: [
+        'macos-arm64-developer-build',
+        'macos-14-arm64-developer-build-tests'
+    ]
+]
+Configurations: []

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/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/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/app/build.gradle

@@ -4,19 +4,19 @@ plugins {
 
 android {
     namespace 'com.example.gradle_project'
-    compileSdk 35
+    compileSdk 36
 
     defaultConfig {
         applicationId "com.example.gradle_project"
         minSdk 28
-        targetSdk 35
+        targetSdk 36
         versionCode 1
         versionName "1.0"
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 }
 

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/gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-agp = "8.10.1"
-core = "1.16.0"
+agp = "9.0.0"
+core = "1.17.0"
 appcompat = "1.7.1"
-material = "1.12.0"
+material = "1.13.0"
 constraintlayout = "2.2.1"
 
 [libraries]

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"
-toolsFile="commandlinetools-linux-6609375_latest.zip"
-sdkBuildToolsVersion="35.0.1"
-sdkApiLevel="android-35"
-toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
+toolsVersion="19.0"
+toolsFile="commandlinetools-linux-13114758_latest.zip"
+toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile"
+sdkBuildToolsVersion="36.0.0"
+sdkApiLevel="android-36"
+toolsSha1="5fdcc763663eefb86a5b8879697aa6088b041e70"
 
 ndkVersionLatest="r27c"
 ndkSha1Latest="090e8083a715fdb1a3e402d0763c388abb03fb4e"
@@ -57,11 +58,17 @@ 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
@@ -115,9 +122,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 +149,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,45 +184,27 @@ echo "Unzipping the Android 9 to $minVersionDestination"
 sudo unzip -o -q "$minVersionFilePath" -d "$minVersionDestination"
 rm "$minVersionFilePath"
 
-echo "Download and unzip Android 15 System Image"
-maxVersionFileName="x86_64-35_r08.zip"
-maxVersionDestination="$sdkTargetFolder/system-images/android-35/google_apis/"
+echo "Download and unzip Android 16 System Image"
+maxVersionFileName="x86_64-36_r07.zip"
+maxVersionDestination="$sdkTargetFolder/system-images/android-36/google_apis/"
 maxVersionFilePath="$maxVersionDestination/$maxVersionFileName"
 maxVersionCiUrl="$basePath/system_images/google_apis/$maxVersionFileName"
 maxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$maxVersionFileName"
-maxVersionSha1="d79169884cabc6680cb29d32c2112ad46c858c1b"
+maxVersionSha1="c6bf44bdcd885bb902b4ba752d111a073ad7a817"
 
 mkdir -p "$maxVersionDestination"
 DownloadURL "$maxVersionCiUrl" "$maxVersionUrl" "$maxVersionSha1" "$maxVersionFilePath"
 
-echo "Unzipping the Android 15 to $maxVersionDestination"
+echo "Unzipping the Android 16 to $maxVersionDestination"
 sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination"
 rm "$maxVersionFilePath"
 
-echo "Download and unzip Android 16 System Image for insignificant"
-insignificantMaxVersionFileName="x86_64-36_r06.zip"
-insignificantMaxVersionDestination="$sdkTargetFolder/system-images/android-36/google_apis/"
-insignificantMaxVersionFilePath="$insignificantMaxVersionDestination/$insignificantMaxVersionFileName"
-insignificantMaxVersionCiUrl="$basePath/system_images/google_apis/$insignificantMaxVersionFileName"
-insignificantMaxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$insignificantMaxVersionFileName"
-insignificantMaxVersionSha1="a9b0b4a0488e0c6c380f5485507950f011388511"
-
-mkdir -p "$insignificantMaxVersionDestination"
-DownloadURL "$insignificantMaxVersionCiUrl" "$insignificantMaxVersionUrl" "$insignificantMaxVersionSha1" "$insignificantMaxVersionFilePath"
-
-echo "Unzipping the Android 16 insignicant to $insignificantMaxVersionDestination"
-sudo unzip -o -q "$insignificantMaxVersionFilePath" -d "$insignificantMaxVersionDestination"
-rm "$insignificantMaxVersionFilePath"
-
 echo "Checking the contents of Android SDK again..."
 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"
 
@@ -240,16 +228,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="b775c756f019d067c491bad7816f3a0cc8ea8b31"
 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

@@ -51,13 +51,13 @@
             "_active": true
         },
         "Qt-CtorMissingParentArgument": {
-            "_active": true
+            "_active": false
         },
         "Qt-DetachingTemporary": {
             "_active": true
         },
         "Qt-FullyQualifiedMocTypes": {
-            "_active": true
+            "_active": false
         },
         "Qt-FunctionArgsByValueRef": {
             "_active": false
@@ -69,13 +69,13 @@
             "_active": true
         },
         "Qt-Generic-InitializeAllFieldsInConstructor": {
-            "_active": true
+            "_active": false
         },
         "Qt-Generic-MissingBaseCopy": {
-            "_active": true
+            "_active": false
         },
         "Qt-Generic-MissingIncludeGuard": {
-            "_active": true
+            "_active": false
         },
         "Qt-Generic-MissingTrCall": {
             "_active": true
@@ -84,7 +84,7 @@
             "_active": true
         },
         "Qt-Generic-NoFunctionDefinitionInHeader": {
-            "_active": true
+            "_active": false
         },
         "Qt-Generic-NoIrregularInclude": {
             "_active": true
@@ -114,7 +114,7 @@
             "_active": true
         },
         "Qt-IncorrectEmit": {
-            "_active": true
+            "_active": false
         },
         "Qt-InstallEventFilter": {
             "_active": true
@@ -129,16 +129,16 @@
             "_active": true
         },
         "Qt-MissingQObjectMacro": {
-            "_active": true
+            "_active": false
         },
         "Qt-MutableContainerKey": {
             "_active": true
         },
         "Qt-NonPodGlobalStatic": {
-            "_active": true
+            "_active": false
         },
         "Qt-OldStyleConnect": {
-            "_active": true
+            "_active": false
         },
         "Qt-OverloadedSignal": {
             "_active": true
@@ -162,7 +162,7 @@
             "_active": true
         },
         "Qt-QPropertyWithoutNotify": {
-            "_active": true
+            "_active": false
         },
         "Qt-QStringArg": {
             "_active": true
@@ -186,7 +186,7 @@
             "_active": true
         },
         "Qt-RuleOfThree": {
-            "_active": true
+            "_active": false
         },
         "Qt-RuleOfTwoSoft": {
             "_active": true

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,7 +16,8 @@ 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() {
@@ -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-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
-cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" .
-
+pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit
 "$VCPKG_ROOT/vcpkg" install --triplet x86-android-qt --x-install-root x86-android-qt-tmp --debug
 "$VCPKG_ROOT/vcpkg" install --triplet x86_64-android-qt --x-install-root x86_64-android-qt-tmp --debug
 

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/sccache.sh

@@ -6,14 +6,13 @@ set -ex
 
 source "${BASH_SOURCE%/*}/../unix/sccache.sh"
 
-targetVersion=0.2.14
-
+targetVersion=v0.11.0
 if [[ $(uname -m) == 'aarch64' ]]; then
   targetArch=aarch64-unknown-linux-musl
-  sha1=0f9b57c423d77f7aa89bb642864ac7689d84d6a0
+  sha1=b7606d0fb461c0aa7351f511d9223416a322d52a
 else
   targetArch=x86_64-unknown-linux-musl
-  sha1=281680c0fc2c09173e94d12ba45d9f1b8e62e5b3
+  sha1=ef389a20c85b732cccd48436a5e28ed40bed2806
 fi
 
 installSccache "$targetArch" "$targetVersion" "$sha1"

coin/provisioning/common/macos/android.sh

@@ -8,79 +8,120 @@
 
 set -ex
 
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/check_and_set_proxy.sh
+source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 targetFolder="/opt/android"
 sdkTargetFolder="$targetFolder/sdk"
 
-basePath="/net/ci-files01-hki.ci.qt.io/hdd/www/input/android"
+sudo mkdir -p "$sdkTargetFolder"
 
-toolsVersion="2.1"
-# toolsFile dertermines tools version
-toolsFile="commandlinetools-mac-6609375_latest.zip"
+basePath="http://ci-files01-hki.ci.qt.io/input/android"
+
+toolsVersion="19.0"
+toolsFile="commandlinetools-mac-13114758_latest.zip"
+toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile"
+sdkBuildToolsVersion="35.0.1"
+sdkApiLevel="android-35"
+toolsSha1="c3e06a1959762e89167d1cbaa988605f6f7c1d24"
+
+ndkVersionLatest="r27c"
+ndkSha1Latest="0217c10ffbec496bb9fbfbb3c6fc2477c6b77297"
+
+# Preview NDK that is in alpha/beta/RC state
+ndkVersionPreview="r29-beta2"
+ndkSha1Preview="09be4f8fb626a9c93415198ea8e75d8d82f528fa"
 
 # Non-latest (but still supported by the qt/qt5 branch) NDKs are installed for nightly targets in:
 # coin/platform_configs/nightly_android.yaml
 
-ndkVersionLatest="r27c"
-ndkVersionPreview="r29-beta2"
-ndkVersionNightly1="$ndkVersionLatest"  # If same version as latest = skip NDK install for nightly
-ndkVersionNightly2="$ndkVersionLatest"
-
-sdkBuildToolsVersion="35.0.1"
+ndkVersionNightly1=$ndkVersionLatest  # Set as same version as latest = skip NDK install in provisioning
+ndkSha1Nightly1=$ndkSha1Latest
+ndkVersionNightly2=$ndkVersionLatest
+ndkSha1Nightly2=$ndkSha1Latest
+sdkBuildToolsVersion="36.0.0"
 # this is compile sdk version
-sdkApiLevel="android-35"
+sdkApiLevel="android-36"
 
+toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
 
+echo "Download and unzip Android SDK"
+DownloadURL "$toolsSourceFile" "$toolsBackupUrl" "$toolsSha1" "$toolsTargetFile"
+echo "Unzipping Android Tools to '$sdkTargetFolder'"
+sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder"
+rm "$toolsTargetFile"
+
+# Android Command-Line Tools unpacks a directory 'cmdline-tools'. Due
+# to existing code, we need to move it into 'cmdline-tools/tools'
+sudo mv "$sdkTargetFolder/cmdline-tools" "$sdkTargetFolder/tools"
+sudo mkdir "$sdkTargetFolder/cmdline-tools"
+sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools"
+
 function InstallNdk() {
 
     ndkVersion=$1
+    ndkSha1=$2
 
-    if [[ ! -d "${targetFolder}/android-ndk-${ndkVersion}" ]]; then
-        echo "Unzipping Android NDK $ndkVersion to '${targetFolder}'"
-        ndkSourceFile="$basePath/android-ndk-$ndkVersion-darwin*.zip"
-        sudo unzip -q "$ndkSourceFile" -d "$targetFolder"
-    fi
+    ndkFile="android-ndk-$ndkVersion-darwin.zip"
+    ndkTargetFile="/tmp/$ndkFile"
+    ndkSourceFile="$basePath/$ndkFile"
 
+    DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
+    echo "Unzipping Android NDK to '$targetFolder'"
+    # Get the package base directory name as string
+    zipBase=$(sudo zipinfo -1 "$ndkTargetFile" 2>/dev/null | awk '!seen {sub("/.*",""); print; seen=1}')
+    sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
+    rm "$ndkTargetFile"
+    androidNdkRoot="${targetFolder}/${zipBase}"
 }
 
-InstallNdk $ndkVersionLatest
-SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest"
+InstallNdk $ndkVersionLatest $ndkSha1Latest
+SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$androidNdkRoot"
 
 if [ "$ndkVersionPreview" != "$ndkVersionLatest" ]; then
-    InstallNdk $ndkVersionPreview
-    SetEnvVar "ANDROID_NDK_ROOT_PREVIEW" "$targetFolder/android-ndk-$ndkVersionPreview"
+    InstallNdk $ndkVersionPreview $ndkSha1Preview
+    SetEnvVar "ANDROID_NDK_ROOT_PREVIEW" "$androidNdkRoot"
 fi
 
 if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then
-    InstallNdk $ndkVersionNightly1
-    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY1" "$targetFolder/android-ndk-$ndkVersionNightly1"
+    InstallNdk $ndkVersionNightly1 $ndkSha1Nightly1
+    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY1" "$androidNdkRoot"
 fi
 
 if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
-    InstallNdk $ndkVersionNightly2
-    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY2" "$targetFolder/android-ndk-$ndkVersionNightly2"
+    InstallNdk $ndkVersionNightly2 $ndkSha1Nightly2
+    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY2" "$androidNdkRoot"
 fi
 
-echo "Unzipping Android Tools to '$sdkTargetFolder'"
-sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder"
-
 echo "Changing ownership of Android files."
 sudo chown -R qt:wheel "$targetFolder"
 sudo chmod -R 755 $targetFolder
 
-# Run the following command under `eval` or `sh -c` so that the shell properly splits it
+# Stop the sdkmanager from printing thousands of lines of #hashmarks.
+# Run the following command under `eval` or `sh -c` so that the shell properly splits it.
 sdkmanager_no_progress_bar_cmd="tr '\r' '\n'  |  grep -v '^\[[ =]*\]'"
-
-sudo mkdir "$sdkTargetFolder/cmdline-tools"
-sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools"
+# But don't let the pipeline hide sdkmanager failures.
+set -o pipefail
 
 echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
-(echo "y"; echo "y") | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" "--sdk_root=$sdkTargetFolder" \
-    "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
-    | eval "$sdkmanager_no_progress_bar_cmd"
+# shellcheck disable=SC2031
+if [ "$http_proxy" != "" ]; then
+    proxy_host=$(echo "$proxy" | cut -d'/' -f3 | cut -d':' -f1)
+    proxy_port=$(echo "$proxy" | cut -d':' -f3)
+    echo "y" | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" --sdk_root=$sdkTargetFolder  \
+                   --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port"  \
+                   "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
+        | eval "$sdkmanager_no_progress_bar_cmd"
+else
+    echo "y" | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" --sdk_root=$sdkTargetFolder  \
+                   "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
+        | eval "$sdkmanager_no_progress_bar_cmd"
+fi
 
 echo "Checking the contents of Android SDK..."
 ls -l "$sdkTargetFolder"

coin/provisioning/common/macos/install-ffmpeg-ios.sh

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

coin/provisioning/common/macos/install-lipomerge.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+pip3 install --user lipomerge

coin/provisioning/common/macos/install_xcode.sh

@@ -2,6 +2,8 @@
 # Copyright (C) 2021 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
+set -ex
+
 # shellcheck source=./../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 
@@ -20,6 +22,11 @@ function InstallXCode() {
     sourceFile=$1
     version=$2
 
+    if ! [[ $version =~ ^[0-9] ]]; then
+        echo "Error: version input must start with a digit"
+        exit 1
+    fi
+
     echo "Uncompressing and installing '$sourceFile'"
     if [[ $sourceFile =~ tar ]]; then
         cd /Applications/ && sudo tar -zxf "$sourceFile"
@@ -35,7 +42,7 @@ function InstallXCode() {
     fi
 
     echo "Versioning application bundle"
-    majorVersion=$(echo "$version" | cut -d '.' -f 1)
+    majorVersion="${version%%[^0-9]*}"
     versionedAppBundle="/Applications/Xcode${majorVersion}.app"
     sudo mv /Applications/Xcode*.app "${versionedAppBundle}"
 
@@ -46,11 +53,12 @@ function InstallXCode() {
     sudo xcodebuild -license accept
 
     echo "Install packages"
-    # -runFirstLaunch is valid in 9.x
-    sudo xcodebuild -runFirstLaunch || true
+    sudo xcodebuild -runFirstLaunch
 
     # Metal toolchain not included by default in Xcode 26
-    xcodebuild -downloadComponent MetalToolchain || true
+    if ((majorVersion >= 26)); then
+        xcodebuild -downloadComponent MetalToolchain
+    fi
 
     echo "Enabling developer mode, so that using lldb does not require interactive password entry"
     sudo /usr/sbin/DevToolsSecurity -enable

coin/provisioning/common/macos/java.sh

@@ -9,12 +9,12 @@ set -ex
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 
 echo "Installing Java Development Kit"
-version=17.0.12
+version=21.0.9
 targetFile=jdk-${version}_macos-x64_bin.dmg
-expectedHash="6fba2fbe5d181bd2ef7fd79e0335278c13f611cb"
+expectedHash="3df8761bfba8d6a4633ecc92f1eff0a58d79c304"
 
 url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac
-# url_alt=https://www.oracle.com/java/technologies/downloads/#jdk17-mac
+# url_alt=https://download.oracle.com/java/21/archive/jdk-21.0.8_macos-x64_bin.dmg
 
 echo "Mounting $targetFile"
 sudo mkdir -p /Volumes/files

coin/provisioning/common/macos/java_arm.sh

@@ -8,10 +8,10 @@ set -ex
 
 echo "Installing Java Development Kit"
 
-targetFile=zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg
+targetFile=zulu21.46.19-ca-jdk21.0.9-macosx_aarch64.dmg
 
 url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac
-# url_alt=https://cdn.azul.com/zulu/bin/zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg
+# url_alt=https://cdn.azul.com/zulu/bin/zulu21.46.19-ca-jdk21.0.9-macosx_aarch64.dmg
 
 echo "Mounting $targetFile"
 sudo mkdir -p /Volumes/files
@@ -22,12 +22,12 @@ sudo umount /Volumes/files
 sudo hdiutil attach "/tmp/$targetFile"
 
 echo Installing JDK
-cd /Volumes/Azul\ Zulu\ JDK\ 17.54+21 && sudo installer -pkg Double-Click\ to\ Install\ Azul\ Zulu\ JDK\ 17.pkg -target /
+cd /Volumes/Azul\ Zulu\ JDK\ 21.46+19 && sudo installer -pkg Double-Click\ to\ Install\ Azul\ Zulu\ JDK\ 21.pkg -target /
 
 echo "Unmounting $targetFile"
-sudo hdiutil unmount /Volumes/Azul\ Zulu\ JDK\ 17.54+21 -force
+sudo hdiutil unmount /Volumes/Azul\ Zulu\ JDK\ 21.46+19 -force
 
 echo "Disable auto update"
 sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false
 
-echo "JDK Version = 17.0.13" >> ~/versions.txt
+echo "JDK Version = 21.0.9" >> ~/versions.txt

coin/provisioning/common/macos/mimersql.sh

@@ -7,7 +7,6 @@
 # Mimer SQL is needed for Qt to be able to support Mimer SQL
 
 set -ex
-os="$1"
 
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"

coin/provisioning/common/macos/nodejs.sh

@@ -7,10 +7,10 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 
 # This script will install Nodejs
 
-version="18.16.0"
+version="22.21.1"
 urlCache="http://ci-files01-hki.ci.qt.io/input/nodejs/node-v$version.pkg"
 urlOffcial="https://nodejs.org/dist/v$version/node-v$version.pkg"
-sha256="156aa5b9580288fb0b3c6134eb8fac64e50745d78d33eebe9e29eb7ff87b8e1e"
+sha256="182ad62634eabbb11497c2284a3172771944f1cd17e23b143e778bd189af6d65"
 
 DownloadURL $urlCache $urlOffcial $sha256 "/tmp/node-v$version.pkg"
 sudo installer -pkg "/tmp/node-v$version.pkg" -target /

coin/provisioning/common/macos/python-arm.sh

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

coin/provisioning/common/macos/sccache.sh

@@ -6,12 +6,12 @@ set -ex
 
 source "${BASH_SOURCE%/*}/../unix/sccache.sh"
 
-targetVersion=0.2.14
+targetVersion=v0.11.0
 if [[ `arch` == arm* ]]; then
     targetArch=aarch64-apple-darwin
-    sha1=ad10cd4b8889fa08e193a4165ac664876a27c0dc
+    sha1=3261ab99e5bb1f9f36eafa597d11491bd85da5ec
 else
     targetArch=x86_64-apple-darwin
-    sha1=764bc1664c0ff616d9980a6d127175d0a2041781
+    sha1=57810789bf2813dfa9bf5da26a712dc30b56ce16
 fi
 installSccache "$targetArch" "$targetVersion" "$sha1"

coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh

@@ -7,6 +7,7 @@ set -euox pipefail
 lib_dir="$1/lib"
 additional_suffix="${2:-}"
 set_rpath="${3:-yes}"
+page_size="${4:-}"
 
 # readelf and patchelf are prerequisite tools for this script. Check
 # that they are available.
@@ -81,7 +82,12 @@ for lib_name in "${ffmpeg_libs[@]}"; do
                 stub_name="${stub_name%%.*}${additional_suffix}.${stub_name#*.}" # Add additional_suffix
             fi
 
-            patchelf --replace-needed "${BASH_REMATCH[1]}" "${stub_name}" "$lib_path"
+            additional_command_args=""
+            if [ -n "$page_size" ]; then
+                additional_command_args+="--page-size ${page_size}"
+            fi
+
+            patchelf ${additional_command_args} --replace-needed "${BASH_REMATCH[1]}" "${stub_name}" "$lib_path"
         fi
     done <<< "$(read_needed_deps)"
 

coin/provisioning/common/shared/sbom_requirements.txt

@@ -4,4 +4,5 @@ ntia-conformance-checker ; python_version >= '3.9'
 sbomaudit ; python_version >= '3.9'
 sbom2doc ; python_version >= '3.9'
 reuse<=5.1.1 ; python_version >= '3.9'
-cyclonedx-python-lib==11.0.0 ; python_version >= '3.9'
+cyclonedx-python-lib==11.5.0 ; python_version >= '3.9'
+jsonschema>=4.20 ; python_version >= '3.12'

coin/provisioning/common/shared/testserver/qt_ubuntu_16.04/Dockerfile

@@ -1,5 +1,10 @@
 FROM ubuntu:16.04
 ARG COIN_RUNS_IN_QT_COMPANY
-RUN  test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue  \
-  && sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \
-  || echo "Internal package repository not found. Using public repositories."
+RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
+  && { printf '%s\n' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-amd64 main restricted universe multiverse' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-updates-amd64 main restricted universe multiverse' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-backports-amd64 main restricted universe' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-security-amd64 main restricted universe multiverse' \
+> /etc/apt/sources.list; \
+  } \

coin/provisioning/common/shared/testserver/qt_ubuntu_18.04/Dockerfile

@@ -1,5 +1,10 @@
 FROM ubuntu:18.04
 ARG COIN_RUNS_IN_QT_COMPANY
-RUN  test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue  \
-  && sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \
-  || echo "Internal package repository not found. Using public repositories."
+RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
+  && { printf '%s\n' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-amd64 main restricted universe multiverse' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-updates-amd64 main restricted universe multiverse' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-backports-amd64 main restricted universe' \
+  'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-security-amd64 main restricted universe multiverse' \
+> /etc/apt/sources.list; \
+  } \

coin/provisioning/common/shared/triplets/arm64-osx-qt.cmake

@@ -0,0 +1,13 @@
+set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
+set(VCPKG_OSX_ARCHITECTURES arm64)
+set(VCPKG_TARGET_ARCHITECTURE arm64)
+
+# Default settings of the triplet from the official vcpkg registry
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+# Qt custom per-port customizations
+if(PORT MATCHES "openssl")
+    set(VCPKG_LIBRARY_LINKAGE dynamic)
+    set(VCPKG_FIXUP_ELF_RPATH ON)
+endif()

coin/provisioning/common/shared/triplets/x64-osx-qt.cmake

@@ -0,0 +1,13 @@
+set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
+set(VCPKG_OSX_ARCHITECTURES x86_64)
+set(VCPKG_TARGET_ARCHITECTURE x64)
+
+# Default settings of the triplet from the official vcpkg registry
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+# Qt custom per-port customizations
+if(PORT MATCHES "openssl")
+    set(VCPKG_LIBRARY_LINKAGE dynamic)
+    set(VCPKG_FIXUP_ELF_RPATH ON)
+endif()

coin/provisioning/common/shared/vcpkg/vcpkg-configuration.json

@@ -5,5 +5,5 @@
     "repository": "https://git.qt.io/aledelev/vcpkg",
     "baseline": "9c5c2a0ab75aff5bcd08142525f6ff7f6f7ddeee"
   },
-  "overlay-triplets": [ "./../../shared/triplets" ]
+  "overlay-triplets": [ "./../triplets" ]
 }

coin/provisioning/common/shared/vcpkg_tool_release_tag.txt

@@ -1,4 +1,4 @@
 vcpkg_tool_release_tag=2025-09-03
 windows_x64_checksum=4523B5B2CE77BD0F6DCA55140D831EA6EB03046D5F4496C85DF94AC1A7EFAB01
 windows_arm64_checksum=1E8653243C0E7D73FF1F0F3F25A55C8154888F331510F9545AD200EDD3CCB962
-linux_checksum=f0c4b30afc2f7baa9cc4372ac325042418251343e0192dbfac94c4f602e9d3ed
+unix_checksum=f0c4b30afc2f7baa9cc4372ac325042418251343e0192dbfac94c4f602e9d3ed

coin/provisioning/common/unix/check_and_set_proxy.sh

@@ -7,4 +7,22 @@ set -ex
 # shellcheck source=../shared/http_proxy.txt
 source "${BASH_SOURCE%/*}/../shared/http_proxy.txt"
 
-{ wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io && echo "Setting http_proxy to $proxy" && export http_proxy=$proxy; } || echo "Proxy not detected at $proxy"
+# check using wget, if not, check with curl.
+if command -v wget > /dev/null; then
+    if wget --quiet --execute "http_proxy=$proxy" --spider "proxy.intra.qt.io"; then
+        echo "Setting http_proxy to $proxy"
+        export http_proxy=$proxy
+    else
+        echo "Proxy not detected at $proxy"
+    fi
+elif command -v curl > /dev/null; then
+    if curl --silent --proxy "$proxy" --head "proxy.intra.qt.io"; then
+        echo "Setting http_proxy to $proxy"
+        export http_proxy=$proxy
+    else
+        echo "Proxy not detected at $proxy"
+    fi
+else
+    echo "Error: Neither 'wget' or 'curl' is installed. Cannot attempt to setup proxy."
+    exit 1
+fi

coin/provisioning/common/unix/common.sourced.sh

@@ -116,7 +116,7 @@ set_common_environment () {
     CMD_INSTALL="sudo install"
 
     COIN_RUNS_IN_QT_COMPANY=false
-    if  ping -c1 repo-clones.ci.qt.io  >/dev/null 2>&1
+    if  ping -c1 repo-clones-apt.ci.qt.io  >/dev/null 2>&1
     then
         COIN_RUNS_IN_QT_COMPANY=true
     fi

coin/provisioning/common/unix/ffmpeg-installation-utils.sh

@@ -3,12 +3,12 @@
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 ffmpeg_version_default() {
-    echo "n7.1.2"
+    echo "n7.1.3"
 }
 
 download_ffmpeg() {
     local version="${1:-$(ffmpeg_version_default)}"
-    local sha1="${2:-1e4e937facdbde15943dd093121836bf69f27c7c}"
+    local sha1="${2:-27051817deec88bed3b9652d49f9127d22268d83}"
 
     local ffmpeg_name="FFmpeg-$version"
     local target_dir="$HOME"

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

@@ -24,43 +24,46 @@ assert_envvar_is_populated_dir() {
 }
 
 build_ffmpeg_android() {
-    local target_arch=$1
-    local target_dir=$2
-    local ndk_root=$3
-    local openssl_android_path=$4
+    local target_dir=$1
+    local ndk_root=$2
+    local openssl_android_path=$3
 
     sudo mkdir -p "$target_dir"
 
     local openssl_include="$openssl_android_path/include"
+    local target_arch
     local openssl_libs
     local libs_prefix
     local target_cpu
     local target_toolchain_arch
 
-    if [ "$target_arch" == "x86_64" ]; then
-        target_toolchain_arch="x86_64-linux-android"
-        target_arch=x86_64
-        target_cpu=x86-64
-        openssl_libs="$openssl_android_path/x86_64"
-        libs_prefix="_x86_64"
-    elif [ "$target_arch" == "x86" ]; then
+    if [ "$os" == "android-x86" ]; then
         target_toolchain_arch="i686-linux-android"
         target_arch=x86
         target_cpu=i686
         openssl_libs="$openssl_android_path/x86"
         libs_prefix="_x86"
-    elif [ "$target_arch" == "arm32" ]; then
+    elif [ "$os" == "android-x86_64" ]; then
+        target_toolchain_arch="x86_64-linux-android"
+        target_arch=x86_64
+        target_cpu=x86-64
+        openssl_libs="$openssl_android_path/x86_64"
+        libs_prefix="_x86_64"
+    elif [ "$os" == "android-arm32" ]; then
         target_toolchain_arch="armv7a-linux-androideabi"
         target_arch=arm
         target_cpu=armv7-a
         openssl_libs="$openssl_android_path/armeabi-v7a"
         libs_prefix="_arm32-v7a"
-    elif [ "$target_arch" == "arm64" ]; then
+    elif [ "$os" == "android-arm64" ]; then
         target_toolchain_arch="aarch64-linux-android"
         target_arch=aarch64
         target_cpu=armv8-a
         openssl_libs="$openssl_android_path/arm64-v8a"
         libs_prefix="_arm64-v8a"
+    else
+        >&2 echo "Unhandled android os param: $os"
+        exit 1
     fi
 
     ln -Ffs "${openssl_libs}/libcrypto_3.so" "${openssl_libs}/libcrypto.so"
@@ -82,12 +85,13 @@ build_ffmpeg_android() {
     local cc=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang
     local ar=${toolchain_bin}/llvm-ar
     local ranlib=${toolchain_bin}/llvm-ranlib
+    local strip=${toolchain_bin}/llvm-strip
     local ffmpeg_config_options
 
     ffmpeg_config_options=$(get_ffmpeg_config_options $build_type)
     ffmpeg_config_options+=" --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-openssl --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera"
     ffmpeg_config_options+=" --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/"
-    ffmpeg_config_options+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}"
+    ffmpeg_config_options+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib} --strip=${strip}"
     ffmpeg_config_options+=" --extra-cflags=-I${openssl_include} --extra-ldflags=-L${openssl_libs}"
     if [ $page_size == "use_16kb_page_size" ]; then
         ffmpeg_config_options+=" --extra-ldflags=-Wl,-z,max-page-size=16384"
@@ -115,33 +119,35 @@ build_ffmpeg_android() {
 
     if [[ "$build_type" == "shared" ]]; then
         local fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh"
-        sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no"
+
+        local page_size_arg=""
+        if [ $page_size == "use_16kb_page_size" ]; then
+            page_size_arg="16384"
+        fi
+
+        sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no" "$page_size_arg"
     fi
 }
 
 if  [ "$os" == "android-x86" ]; then
-    target_arch=x86
     target_dir="/usr/local/android/ffmpeg-x86"
     envvar_latest="FFMPEG_DIR_ANDROID_X86_NDK_LATEST"
     envvar_nightly1="FFMPEG_DIR_ANDROID_X86_NDK_NIGHTLY1"
     envvar_nightly2="FFMPEG_DIR_ANDROID_X86_NDK_NIGHTLY2"
     envvar_preview="FFMPEG_DIR_ANDROID_X86_NDK_PREVIEW"
 elif  [ "$os" == "android-x86_64" ]; then
-    target_arch=x86_64
     target_dir="/usr/local/android/ffmpeg-x86_64"
     envvar_latest="FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST"
     envvar_nightly1="FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY1"
     envvar_nightly2="FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY2"
     envvar_preview="FFMPEG_DIR_ANDROID_X86_64_NDK_PREVIEW"
 elif  [ "$os" == "android-arm32" ]; then
-    target_arch=arm32
     target_dir="/usr/local/android/ffmpeg-arm32"
     envvar_latest="FFMPEG_DIR_ANDROID_ARM32_NDK_LATEST"
     envvar_nightly1="FFMPEG_DIR_ANDROID_ARM32_NDK_NIGHTLY1"
     envvar_nightly2="FFMPEG_DIR_ANDROID_ARM32_NDK_NIGHTLY2"
     envvar_preview="FFMPEG_DIR_ANDROID_ARM32_NDK_PREVIEW"
 elif  [ "$os" == "android-arm64" ]; then
-    target_arch=arm64
     target_dir="/usr/local/android/ffmpeg-arm64"
     envvar_latest="FFMPEG_DIR_ANDROID_ARM64_NDK_LATEST"
     envvar_nightly1="FFMPEG_DIR_ANDROID_ARM64_NDK_NIGHTLY1"
@@ -159,26 +165,26 @@ fi
 
 assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_LATEST"
 assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_LATEST"
-build_ffmpeg_android "$target_arch" "$target_dir/latest" "$ANDROID_NDK_ROOT_LATEST" "$OPENSSL_ANDROID_HOME_LATEST"
+build_ffmpeg_android "$target_dir/latest" "$ANDROID_NDK_ROOT_LATEST" "$OPENSSL_ANDROID_HOME_LATEST"
 set_ffmpeg_dir_env_var "$envvar_latest" "$target_dir/latest"
 
 if [ "${ANDROID_NDK_ROOT_PREVIEW}" ]; then
     assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_PREVIEW"
     assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_PREVIEW"
-    build_ffmpeg_android "$target_arch" "$target_dir/preview" "$ANDROID_NDK_ROOT_PREVIEW" "$OPENSSL_ANDROID_HOME_PREVIEW"
+    build_ffmpeg_android "$target_dir/preview" "$ANDROID_NDK_ROOT_PREVIEW" "$OPENSSL_ANDROID_HOME_PREVIEW"
     set_ffmpeg_dir_env_var "$envvar_preview" "$target_dir/preview"
 fi
 
 if [ "${ANDROID_NDK_ROOT_NIGHTLY1}" ]; then
     assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_NIGHTLY1"
     assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_NIGHTLY1"
-    build_ffmpeg_android "$target_arch" "$target_dir/nightly1" "$ANDROID_NDK_ROOT_NIGHTLY1" "$OPENSSL_ANDROID_HOME_NIGHTLY1"
+    build_ffmpeg_android "$target_dir/nightly1" "$ANDROID_NDK_ROOT_NIGHTLY1" "$OPENSSL_ANDROID_HOME_NIGHTLY1"
     set_ffmpeg_dir_env_var "$envvar_nightly1" "$target_dir/nightly1"
 fi
 
 if [ "${ANDROID_NDK_ROOT_NIGHTLY2}" ]; then
     assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_NIGHTLY2"
     assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_NIGHTLY2"
-    build_ffmpeg_android "$target_arch" "$target_dir/nightly2" "$ANDROID_NDK_ROOT_NIGHTLY2" "$OPENSSL_ANDROID_HOME_NIGHTLY2"
+    build_ffmpeg_android "$target_dir/nightly2" "$ANDROID_NDK_ROOT_NIGHTLY2" "$OPENSSL_ANDROID_HOME_NIGHTLY2"
     set_ffmpeg_dir_env_var "$envvar_nightly2" "$target_dir/nightly2"
 fi

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

@@ -1,188 +0,0 @@
-#!/usr/bin/env bash
-# Copyright (C) 2024 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# This script will build and install FFmpeg static libs
-# Can take an optional final parameter to control installation directory
-set -ex
-
-# Must match or be lower than the minimum iOS version supported by the version of Qt that is
-# is currently being built.
-readonly MINIMUM_IOS_VERSION="16.0"
-
-source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh"
-
-ffmpeg_version=$(ffmpeg_version_default)
-ffmpeg_source_dir=$(download_ffmpeg)
-ffmpeg_config_options=$(get_ffmpeg_config_options "shared")
-default_prefix="/usr/local/ios/ffmpeg"
-prefix="${1:-$default_prefix}"
-dylib_regex="^@rpath/.*\.dylib$"
-
-build_ffmpeg_ios() {
-    local target_platform=$1
-    local target_cpu_arch=""
-    if [ "$target_platform" == "arm64-simulator" ]; then
-        target_sdk="iphonesimulator"
-        target_cpu_arch="arm64"
-        minos="-mios-simulator-version-min=$MINIMUM_IOS_VERSION"
-    elif [ "$target_platform" == "x86_64-simulator" ]; then
-        target_sdk="iphonesimulator"
-        target_cpu_arch="x86_64"
-        minos="-mios-simulator-version-min=$MINIMUM_IOS_VERSION"
-    elif [ "$target_platform" == "arm64-iphoneos" ]; then
-        target_sdk="iphoneos"
-        target_cpu_arch="arm64"
-        minos="-miphoneos-version-min=$MINIMUM_IOS_VERSION"
-    else
-        echo "Error when building FFmpeg for iOS. Unknown parameter given for target_platform: '${target_platform}'"
-        exit 1
-    fi
-
-    local build_dir="$ffmpeg_source_dir/build_ios/$target_platform"
-    sudo mkdir -p "$build_dir"
-    pushd "$build_dir"
-
-    # shellcheck disable=SC2086
-    sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \
-    --sysroot="$(xcrun --sdk "$target_sdk" --show-sdk-path)" \
-    --enable-cross-compile \
-    --enable-optimizations \
-    --prefix=$prefix \
-    --arch=$target_cpu_arch \
-    --cc="xcrun --sdk ${target_sdk} clang -arch $target_cpu_arch" \
-    --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_cpu_arch" \
-    --target-os=darwin \
-    --extra-ldflags="$minos" \
-    --enable-shared \
-    --disable-static \
-    --install-name-dir='@rpath' \
-    --disable-audiotoolbox
-
-    sudo make install DESTDIR="$build_dir/installed" -j4
-    popd
-}
-
-build_info_plist() {
-    local file_path="$1"
-    local framework_name="$2"
-    local framework_id="$3"
-
-    # Apple plist format has a strict requirement that the version string
-    # contains up to 3 numerics separated by a dot. Meanwhile, FFmpeg versioning
-    # tends to use an 'n' prefix in their versioning. We use a regex to convert
-    # and verify the version string.
-    #
-    # https://developer.apple.com/documentation/bundleresources/information-property-list/cfbundleversion
-    local formatted_ffmpeg_version
-    if [[ $ffmpeg_version =~ ([0-9]+(\.[0-9]+){0,2}) ]]; then
-        formatted_ffmpeg_version="${BASH_REMATCH[1]}"
-    else
-        echo "Unable to format FFmpeg version string '$ffmpeg_version' into corresponding Apple Info.plist format"
-        exit 1
-    fi
-
-    local minimum_version_key="MinimumOSVersion"
-    local supported_platforms="iPhoneOS"
-
-    info_plist="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-    <key>CFBundleDevelopmentRegion</key>
-    <string>en</string>
-    <key>CFBundleExecutable</key>
-    <string>${framework_name}</string>
-    <key>CFBundleIdentifier</key>
-    <string>${framework_id}</string>
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-    <key>CFBundleName</key>
-    <string>${framework_name}</string>
-    <key>CFBundlePackageType</key>
-    <string>FMWK</string>
-    <key>CFBundleShortVersionString</key>
-    <string>${formatted_ffmpeg_version}</string>
-    <key>CFBundleVersion</key>
-    <string>${formatted_ffmpeg_version}</string>
-    <key>CFBundleSignature</key>
-    <string>????</string>
-    <key>${minimum_version_key}</key>
-    <string>${MINIMUM_IOS_VERSION}</string>
-    <key>CFBundleSupportedPlatforms</key>
-    <array>
-        <string>${supported_platforms}</string>
-    </array>
-    <key>NSPrincipalClass</key>
-    <string></string>
-</dict>
-</plist>"
-    echo $info_plist | sudo tee ${file_path} 1>/dev/null
-}
-
-
-create_framework() {
-    # Create a 'traditional' framework from the corresponding dylib.
-    local framework_name="$1"
-    local platform="$2" # For now it's either arm64, x86_64-simulator, see below.
-    local ffmpeg_library_path="$ffmpeg_source_dir/build_ios/${platform}/installed$prefix"
-    local framework_complete_path="${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
-
-    sudo mkdir -p "${ffmpeg_library_path}/framework/${framework_name}.framework"
-    sudo cp "${ffmpeg_library_path}/lib/${framework_name}.dylib" "${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
-
-    # Fix LC_ID_DYLIB (to be libavcodec.framework/libavcodec instead of @rpath/libavcodec.xx.yy.dylib
-    sudo install_name_tool -id @rpath/${framework_name}.framework/${framework_name} "${framework_complete_path}"
-
-    build_info_plist "${ffmpeg_library_path}/framework/${framework_name}.framework/Info.plist" "${framework_name}" "io.qt.ffmpegkit."${framework_name}
-
-    # Fix all FFmpeg-related LC_LOAD_DYLIB, similar to how we fixed LC_ID_DYLIB above:
-    otool -L "$framework_complete_path" | awk '/\t/ {print $1}' | egrep "$dylib_regex" | while read -r dependency_path; do
-        found_name=$(tmp=${dependency_path/*\/}; echo ${tmp/\.*})
-        if [ "$found_name" != "$framework_name" ]
-        then
-            sudo install_name_tool -change "$dependency_path" @rpath/${found_name}.framework/${found_name} "${framework_complete_path}"
-        fi
-    done
-    #sudo mkdir -p "$prefix/framework/"
-    #sudo cp -r "${ffmpeg_library_path}/framework/${framework_name}.framework" "$prefix/framework/"
-}
-
-create_xcframework() {
-    # Create 'traditional' framework from the corresponding dylib,
-    # also creating
-    local framework_name="$1"
-    local target_platform_a="$2"
-    local target_platform_b="$3"
-
-    local fw_a="$ffmpeg_source_dir/build_ios/${target_platform_a}/installed$prefix/framework/${framework_name}.framework"
-    local fw_b="$ffmpeg_source_dir/build_ios/${target_platform_b}/installed$prefix/framework/${framework_name}.framework"
-
-    sudo mkdir -p "$prefix/framework/"
-    sudo xcodebuild -create-xcframework -framework $fw_a -framework $fw_b -output "${prefix}/framework/${framework_name}.xcframework"
-}
-
-build_ffmpeg_ios "x86_64-simulator"
-build_ffmpeg_ios "arm64-iphoneos"
-
-ffmpeg_libs="libavcodec libavformat libavutil libswresample libswscale"
-
-for name in $ffmpeg_libs; do
-    create_framework $name "arm64-iphoneos"
-    create_framework $name "x86_64-simulator"
-done
-
-# Create corresponding (xc)frameworks containing both arm64 and arm64-simulator frameworks:
-for name in $ffmpeg_libs; do
-    create_xcframework $name "arm64-iphoneos" "x86_64-simulator"
-done
-
-# xcframeworks are already installed directly into the target output directory.
-# We need to install headers
-sudo cp -r "$ffmpeg_source_dir/build_ios/arm64-iphoneos/installed$prefix/include" $prefix
-# The set_ffmpeg_dir_env_var requires the presence of the "lib" subfolder in order to validate
-# our FFmpeg install. On iOS we don't use this subfolder, we only rely on the "framework" subfolder.
-# So we create a dummy "lib" folder to pass the check.
-sudo mkdir -p "${prefix}/lib"
-
-set_ffmpeg_dir_env_var "FFMPEG_DIR_IOS" $prefix

coin/provisioning/common/unix/install-openssl.sh

@@ -37,6 +37,7 @@ if [[ "$os" == "linux" ]]; then
     make && make install_sw install_ssldirs
     SetEnvVar "OPENSSL_HOME" "$opensslHome"
     SetEnvVar "PATH" "\"$opensslHome/bin:\$PATH\""
+    SetEnvVar "PKG_CONFIG_PATH" "\"$opensslHome/lib64/pkgconfig:\$PKG_CONFIG_PATH\""
     if uname -a |grep -q "Debian"; then
         SetEnvVar "LD_LIBRARY_PATH" "\"$opensslHome/lib:$LD_LIBRARY_PATH\""
     else

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

@@ -7,12 +7,12 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 echo "Installing vcpkg ports"
 
-pushd "${BASH_SOURCE%/*}/vcpkg" || exit
-cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" .
+pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit
 
-install_root=x64-linux-qt-tmp
+install_root=$1-tmp
+vcpkg_extra_args=$2
 
-"$VCPKG_ROOT/vcpkg" install --triplet x64-linux-qt --x-install-root $install_root --debug
+"$VCPKG_ROOT/vcpkg" install --triplet $1 --x-install-root $install_root --debug $vcpkg_extra_args
 
 cmake "-DVCPKG_EXECUTABLE=$VCPKG_ROOT/vcpkg"\
     "-DVCPKG_INSTALL_ROOT=$PWD/$install_root"\

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

@@ -34,7 +34,7 @@ do
         "vcpkg_tool_release_tag")
             vcpkgToolReleaseTag=${keyValue[1]}
             ;;
-        "linux_checksum")
+        "unix_checksum")
             vcpkgToolChecksum=${keyValue[1]}
             ;;
     esac
@@ -86,7 +86,7 @@ SetEnvVar "VCPKG_ROOT" "$vcpkgRoot"
 export VCPKG_ROOT="$vcpkgRoot"
 
 # Set a source for vcpkg Binary and Asset Cache
-# The `coin/provisioning/common/linux/mount-vcpkg-cache-drive.sh` script is
+# The `coin/provisioning/common/<platform>/mount-vcpkg-cache-drive.sh` script is
 # mounting the SMB share located in `vcpkg-server.ci.qt.io/vcpkg` to
 # $HOME/vcpkg-cache/
 export VCPKG_BINARY_SOURCES="files,$HOME/vcpkg-cache/binaries,readwrite"

coin/provisioning/common/unix/install_grpc.sh

@@ -63,6 +63,7 @@ cmake "$targetDir" -G"Ninja Multi-Config" \
     -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
     -DCMAKE_CONFIGURATION_TYPES="Release;Debug;RelWithDebugInfo" \
     -DCMAKE_INSTALL_PREFIX="$installPrefix" \
+    -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
     "${extraCMakeArgs[@]}" \
     "$extraOpenSslArg" \
     -DgRPC_BUILD_TESTS=OFF \

coin/provisioning/common/unix/install_openapi.sh

@@ -8,10 +8,10 @@
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
 source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 
-version="7.15.0"
+version="7.18.0"
 PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/qtopenapi/openapi_client_generators/openapi-generator-cli-$version.jar"
 AltUrl="https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/$version/openapi-generator-cli-$version.jar"
-SHA1="bb58e257f724fb46b7f2b309a9fa98e63fd7199f"
+SHA1="8bd615a50b15ebf5be30e612af112526a6e81ac4"
 targetFolder="/opt/qt-openapi/"
 targetFile="openapi-generator-cli.jar"
 

coin/provisioning/common/unix/libclang-dyn.sh

@@ -16,6 +16,7 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
 
+zswitch=$1 # Since 7z 25.01 multi-hop symbolic links are restricted with -snl switch levels
 version="20.1.3"
 baseUrl="https://download.qt.io/development_releases/prebuilt/libclang"
 cachedUrl="http://ci-files01-hki.ci.qt.io/input/libclang/dynamic"
@@ -40,7 +41,7 @@ DownloadURL "$url_cached" "$url" "$sha1" "$zip"
 if command -v 7zr &> /dev/null; then
     sudo 7zr x $zip -o/usr/local/
 else
-    sudo 7z x $zip -o/usr/local/
+    sudo 7z x $zswitch $zip -o/usr/local/
 fi
 sudo mv /usr/local/libclang "$destination"
 rm -rf $zip

coin/provisioning/common/unix/libclang.sh

@@ -20,6 +20,7 @@ PROVISIONING_DIR="$(dirname "$0")/../../"
 # shellcheck source=./common.sourced.sh
 source "$PROVISIONING_DIR"/common/unix/common.sourced.sh
 
+zswitch=$1 # Since 7z 25.01 multi-hop symbolic links are restricted with -snl switch levels
 libclang_version="20.1.0"
 
 if uname -a |grep -q Darwin; then
@@ -61,7 +62,7 @@ DownloadURL $url_cached $url $sha1 $zip
 if command -v 7zr &> /dev/null; then
     sudo 7zr x $zip -o/usr/local/
 else
-    sudo 7z x $zip -o/usr/local/
+    sudo 7z x $zswitch $zip -o/usr/local/
 fi
 sudo mv /usr/local/libclang "$destination"
 rm -rf $zip

coin/provisioning/common/unix/openssl_for_android.sh

@@ -5,26 +5,32 @@
 # This script install prebuilt OpenSSL which was built against Android NDK 25.
 # OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories
 
-set -ex
+set -eux
 # shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
+outputPathBase="${HOME}"
+
 sslVersionForLatest="3.0.7"
 ndkVersionLatest="r27c"
+featureSuffixLatest="_16kb"
 prebuiltOpensslShaLatest="2cc15dd990460c2c7157ab257a47071fbd9e0ac8"
 
 sslVersionForPreview="3.0.7"
 ndkVersionPreview="r29-beta2"
+featureSuffixPreview="_16kb"
 prebuiltOpensslShaPreview="76c9788216440111be97ea1a63c4d8cd807baacd"
 
 ndkVersionNightly1=$ndkVersionLatest
 sslVersionForNightly1=$sslVersionForLatest
+featureSuffixNightly1=""
 prebuiltOpensslShaNightly1=$prebuiltOpensslShaLatest
 
 ndkVersionNightly2=$ndkVersionLatest
 sslVersionForNightly2=$sslVersionForLatest
+featureSuffixNightly2=""
 prebuiltOpensslShaNightly2=$prebuiltOpensslShaLatest
 
 : <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK r29-beta2
@@ -59,41 +65,110 @@ PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
 PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
 EOB
 
+function BuildOutputPath() {
+    local ndkVersion="$1"
+    local suffix="$2"
+    local sslVersion="$3"
+
+    echo "${outputPathBase}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}"
+}
+
 function InstallPrebuiltOpenssl() {
+    local ndkVersion="$1"
+    local suffix="$2"
+    local sha="$3"
+    local sslVersion="$4"
+    local output_dir="$5"
 
-    ndkVersion=$1
-    sha=$2
-    sslVersion=$3
+    local prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
+    local targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
 
-    opensslHome="${HOME}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}_16kb"
-    if [[ ! -d ${opensslHome} ]]; then
-        prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}_16kb.zip"
-        targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}_16kb.zip"
+    DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
 
-        DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
-        unzip -o "$targetFile" -d "${HOME}"
-        sudo rm -f "$targetFile"
+    local tmp_extract
+    tmp_extract="$(mktemp -d "${TMPDIR:-/tmp}/openssl-extract.XXXXXX")"
+    unzip -q -o "$targetFile" -d "$tmp_extract"
+    rm -f "$targetFile"
+
+    # We assume there is only one top-level directory in the openssl zip
+    local temp_openssl_root
+    temp_openssl_root="$(find "$tmp_extract" -mindepth 1 -maxdepth 1 -type d | head -n 1)"
+    if [[ -z "$temp_openssl_root" ]]; then
+        echo "ERROR: Expected a single top-level directory in the archive, but none was found." >&2
+        exit 1
     fi
+
+    mv "$temp_openssl_root" "$output_dir"
+    rm -rf "$tmp_extract"
+
+    # There have been cases where necessary symlinks are lost when unarchiving.
+    # Force-create them now.
+    local abi_list="arm64-v8a armeabi-v7a x86 x86_64"
+    for abi in $abi_list; do
+        ln -fs "${output_dir}/include" "${output_dir}/${abi}/include"
+        ln -fs "${output_dir}/${abi}/libcrypto_3.so" "${output_dir}/${abi}/libcrypto.so"
+        ln -fs "${output_dir}/${abi}/libssl_3.so" "${output_dir}/${abi}/libssl.so"
+    done
 }
 
 if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then
-    InstallPrebuiltOpenssl $ndkVersionNightly1 $prebuiltOpensslShaNightly1 $sslVersionForNightly1
-    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$opensslHome"
-    echo "OpenSSL for Android $ndkVersionNightly1 = $sslVersionForNightly1" >> ~/versions.txt
+    outputDirNightly1=$(BuildOutputPath \
+        "$ndkVersionNightly1" \
+        "$featureSuffixNightly1" \
+        "$sslVersionForNightly1")
+
+    InstallPrebuiltOpenssl \
+        "$ndkVersionNightly1" \
+        "$featureSuffixNightly1" \
+        "$prebuiltOpensslShaNightly1" \
+        "$sslVersionForNightly1" \
+        "$outputDirNightly1"
+    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$outputDirNightly1"
+    echo "OpenSSL for Android ${ndkVersionNightly1} = ${sslVersionForNightly1}" >> ~/versions.txt
 fi
 
 if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
-    InstallPrebuiltOpenssl $ndkVersionNightly2 $prebuiltOpensslShaNightly2 $sslVersionForNightly2
-    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY2" "$opensslHome"
-    echo "OpenSSL for Android $ndkVersionNightly2 = $sslVersionForNightly2" >> ~/versions.txt
+    outputDirNightly2=$(BuildOutputPath \
+        "$ndkVersionNightly2" \
+        "$featureSuffixNightly2" \
+        "$sslVersionForNightly2")
+
+    InstallPrebuiltOpenssl \
+        "$ndkVersionNightly2" \
+        "$featureSuffixNightly2" \
+        "$prebuiltOpensslShaNightly2" \
+        "$sslVersionForNightly2" \
+        "$outputDirNightly2"
+    SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$outputDirNightly2"
+    echo "OpenSSL for Android ${ndkVersionNightly2} = ${sslVersionForNightly2}" >> ~/versions.txt
 fi
 
 if [ "$ndkVersionPreview" != "$ndkVersionLatest" ]; then
-    InstallPrebuiltOpenssl $ndkVersionPreview $prebuiltOpensslShaPreview $sslVersionForPreview
-    SetEnvVar "OPENSSL_ANDROID_HOME_PREVIEW" "$opensslHome"
-    echo "OpenSSL for Android $ndkVersionPreview = $sslVersionForPreview" >> ~/versions.txt
+    outputDirPreview="$(BuildOutputPath \
+        "$ndkVersionPreview" \
+        "$featureSuffixPreview" \
+        "$sslVersionForPreview")"
+
+    InstallPrebuiltOpenssl \
+        "$ndkVersionPreview" \
+        "$featureSuffixPreview" \
+        "$prebuiltOpensslShaPreview" \
+        "$sslVersionForPreview" \
+        "$outputDirPreview"
+    SetEnvVar "OPENSSL_ANDROID_HOME_PREVIEW" "$outputDirPreview"
+    echo "OpenSSL for Android ${ndkVersionPreview} = ${sslVersionForPreview}" >> ~/versions.txt
 fi
 
-InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslShaLatest $sslVersionForLatest
-SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
-echo "OpenSSL for Android $ndkVersionLatest = $sslVersionForLatest" >> ~/versions.txt
+outputDirLatest="$(BuildOutputPath \
+    "$ndkVersionLatest" \
+    "$featureSuffixLatest" \
+    "$sslVersionForLatest")"
+
+InstallPrebuiltOpenssl \
+    "$ndkVersionLatest" \
+    "$featureSuffixLatest" \
+    "$prebuiltOpensslShaLatest" \
+    "$sslVersionForLatest" \
+    "$outputDirLatest"
+SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$outputDirLatest"
+echo "OpenSSL for Android ${ndkVersionLatest} = ${sslVersionForLatest}" >> ~/versions.txt