Update submodules on '6.11 in qt/qt5'

Change-Id: I9207ec0945a946f08e952de36d68de4d2780df3b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

.gitmodules

@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = dev
+	branch = 6.11
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = dev
+	branch = 6.11
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = dev
+	branch = 6.11
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = dev
+	branch = 6.11
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qttasktree qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = dev
+	branch = 6.11
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,7 +68,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = dev
+	branch = 6.11
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = dev
+	branch = 6.11
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
+	branch = 6.11
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = dev
+	branch = 6.11
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = dev
+	branch = 6.11
 	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = dev
+	branch = 6.11
 	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,107 +252,107 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = dev
+	branch = 6.11
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = dev
+	branch = 6.11
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = dev
+	branch = 6.11
 	status = addon
 [submodule "qttasktree"]
 	depends = qtbase
 	path = qttasktree
 	url = ../qttasktree.git
-	branch = dev
+	branch = 6.11
 	status = preview
 [submodule "qtopenapi"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtopenapi
 	url = ../qtopenapi.git
-	branch = dev
+	branch = 6.11
 	status = preview
 [submodule "qtcanvaspainter"]
 	depends = qtbase qtdeclarative qtshadertools
 	path = qtcanvaspainter
 	url = ../qtcanvaspainter.git
-	branch = dev
+	branch = 6.11
 	status = preview

cmake/QtIRCommandLineHelpers.cmake

@@ -421,19 +421,3 @@ 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,27 +102,18 @@ 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_https_base "https://@USER@codereview.qt-project.org@AUTH@/")
+    set(gerrit_repo_url "${gerrit_ssh_base}")
 
     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,9 +98,6 @@ 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

@@ -295,7 +295,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_as_existing_absolute_path(alternates alternates)
+    qt_ir_get_option_value(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,7 +14,6 @@ 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)

coin/platform_configs/android-studio-tools.yaml

@@ -3,6 +3,11 @@ Include: []
 Configurations:
 -
     Id: 'qttas-on-linux'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    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']

coin/platform_configs/cmake_platforms.yaml

@@ -182,6 +182,7 @@ 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'
@@ -197,12 +198,13 @@ 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: ['Sccache', 'Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['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}}\..',
@@ -211,6 +213,7 @@ 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'
@@ -253,12 +256,37 @@ Configurations:
         'VCPKG_HOST_TRIPLET=x64-windows-qt',
         'VCPKG_TARGET_TRIPLET=x64-windows-qt',
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
+        'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}',
+    ]
+-
+    Id: 'rhel-8.10'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
+    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
+        'VCPKG_HOST_TRIPLET=x64-linux-qt',
+        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
+    ]
+-
+    Id: 'rhel-9.4'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Packaging','Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
+    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Environment variables: [
+        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
+        'VCPKG_HOST_TRIPLET=x64-linux-qt',
+        'VCPKG_TARGET_TRIPLET=x64-linux-qt',
     ]
 -
     Id: 'rhel-9.6'
     Template: 'qtci-linux-RHEL-9.6-x86_64-51'
     Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
     Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
     Environment variables: [
         'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',

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: ['Sccache', 'UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
+    Features: ['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-9.6-minimal-static-test'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Id: 'rhel-8.10-minimal-static-test'
+    Template: 'qtci-linux-RHEL-8.10-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: ['Sccache', 'Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests']
+    Features: ['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.6-x86_64-51'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.6'
+    Platform dependency: 'rhel-9.4'
     Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
@@ -51,13 +51,32 @@ Configurations:
         'ANDROID_EMULATOR=emulator_x86_api_28'
     ]
 -
-    Id: 'android-16-x86_64-on-linux'
+    Id: 'android-9-x86-on-linux-rhel_9_6'
     Template: 'qtci-linux-RHEL-9.6-x86_64-51'
     Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'rhel-9.6'
+    Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    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.6'
+    Platform dependency: 'rhel-9.4'
     Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
@@ -67,5 +86,37 @@ 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,5 +1,10 @@
 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.6-x86_64-51'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'rhel-9.6'
+    Platform dependency: 'rhel-9.4'
     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,3 +15,18 @@ 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,6 +2,32 @@ 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'
@@ -10,7 +36,7 @@ Configurations:
     Platform dependency: [
         'rhel-9.6',
         'android-9-x86-on-linux',
-        'android-16-x86_64-on-linux'
+        'android-15-x86_64-on-linux'
     ]
     Features: [
         'Sccache',
@@ -24,7 +50,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-16-x86_64-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'
     ]

coin/platform_configs/macos.yaml

@@ -17,8 +17,6 @@ Configurations:
         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)
@@ -43,13 +41,6 @@ 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-100'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging', 'DoNotAbortTestingOnFirstFailure']
-        Platform dependency: 'macos-universal-on-arm64'
-        Environment variables: [ 'COIN_CTEST_IGNORE_EXIT_CODE=1' ]
 
     # And arm64
 
@@ -57,25 +48,25 @@ Configurations:
         Id: 'macos-13-arm64-tests'
         Template: 'qtci-macos-13-arm-107'
         Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Features: ['TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-arm64'
     -
         Id: 'macos-14-arm64-tests'
         Template: 'qtci-macos-14-arm-106'
         Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Features: ['TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-arm64'
     -
         Id: 'macos-15-arm64-tests'
         Template: 'qtci-macos-15-arm-104'
         Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Features: ['TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-arm64'
     -
         Id: 'macos-26-arm64-tests'
         Template: 'qtci-macos-26-arm-104'
         Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Features: ['TestOnly', 'Packaging']
         Platform dependency: 'macos-universal-on-arm64'
 
     # =========================================================================
@@ -90,18 +81,6 @@ 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-100'
-        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',
@@ -110,25 +89,21 @@ Configurations:
         Id: 'macos-arm64-developer-build'
         Template: 'qtci-macos-15-arm-104'
         Compiler: 'Clang'
-        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
+        Features: ['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: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'Insignificant']
+        Features: ['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)

coin/platform_configs/nightly_android_namespace.yaml

@@ -1,7 +1,7 @@
 Version: 2
 Include: [
     cmake_platforms.yaml: [
-        'rhel-9.6'
+        'rhel-9.4'
     ],
     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.6',
+        'rhel-9.4',
         '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.6',
+        'rhel-9.4',
         '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.6'
+        'rhel-9.4'
     ],
     cmake_platforms_target_android.yaml: [
         'android-16-x86_64-on-linux',

coin/platform_configs/nightly_cxx23.yaml

@@ -26,3 +26,14 @@ 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_unity_builds.yaml

@@ -13,8 +13,8 @@ Configurations:
         'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
     ]
 -
-    Id: 'rhel-9.6-unity-build'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Id: 'rhel-8.10-unity-build'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-50'
     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,6 +9,10 @@ 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-9.6-x86_64-51'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'DebugAndRelease']
     Configure arguments: ''
@@ -43,7 +43,7 @@ Configurations:
     Environment variables: []
     Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 -
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
     Configure arguments: ''

coin/platform_configs/qtbase.yaml

@@ -15,3 +15,8 @@ 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,5 +1,17 @@
 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/qtdotnet.yaml

@@ -1,13 +0,0 @@
-Version: 2
-Include: [
-  quick-bridges.yaml: [
-     "windows-quick-bridges"
-  ]
-]
-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']

coin/platform_configs/qtgradleplugin.yaml

@@ -1,11 +1,16 @@
 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: ['Packaging', 'UseConfigure']
+    Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
 -
     Id: 'qtgp-on-macos'
     Template: 'qtci-macos-14-arm-106'

coin/platform_configs/qtjenny.yaml

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

coin/platform_configs/qtsaferenderer-runtime.yaml

@@ -12,6 +12,7 @@ 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,6 +13,7 @@ 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",
@@ -39,11 +40,21 @@ 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: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
+    Features: ['Sccache', 'UseConfigure', 'MinimalStaticTests', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
     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/tqtc-android-automotive.yaml

@@ -2,6 +2,7 @@ Version: 2
 Include: [
     cmake_platforms.yaml: [
         "documentation-warnings",
+        "rhel-9.4",
         "rhel-9.6",
         'windows-11_24h2-mingw13',
     ],
@@ -12,11 +13,43 @@ Include: [
         'android-arm64-on-macos',
         'android-armv7-on-windows',
         'android-9-x86-on-linux',
-        'android-16-x86_64-on-linux'
+        'android-15-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'
@@ -25,7 +58,7 @@ Configurations:
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: 'rhel-9.6'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
+    Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', '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}}',
@@ -41,7 +74,7 @@ Configurations:
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: 'rhel-9.6'
-    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
+    Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', '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}}',

coin/platform_configs/tqtc-qtbridges.yaml

@@ -6,10 +6,17 @@ Include: [
      "windows-quick-bridges"
   ],
   cmake_platforms.yaml: [
-     "rhel-9.6"
+     "rhel-9.4"
   ]
 ]
 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'
@@ -33,9 +40,9 @@ Configurations:
 
 -
     Id: 'linux-quick-bridges-python'
-    Template: 'qtci-linux-RHEL-9.6-x86_64-51'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
     Compiler: 'GCC'
-    Platform dependency: 'rhel-9.6'
+    Platform dependency: 'rhel-9.4'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
 
 -

coin/platform_configs/tqtc-qtpip.yaml

@@ -3,7 +3,7 @@ Module only: true
 Include: [
   cmake_platforms.yaml: [
     "windows-10_22h2-msvc2019",
-    "rhel-9.6"
+    "rhel-8.10"
   ],
   macos.yaml: [
     "macos-universal-on-arm64"

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

@@ -4,12 +4,12 @@ plugins {
 
 android {
     namespace 'com.example.gradle_project'
-    compileSdk 36
+    compileSdk 35
 
     defaultConfig {
         applicationId "com.example.gradle_project"
         minSdk 28
-        targetSdk 36
+        targetSdk 35
         versionCode 1
         versionName "1.0"
     }

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 -ex
+set -e
 
 # shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
@@ -22,12 +22,11 @@ sudo mkdir -p "$sdkTargetFolder"
 
 basePath="http://ci-files01-hki.ci.qt.io/input/android"
 
-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"
+toolsVersion="2.1"
+toolsFile="commandlinetools-linux-6609375_latest.zip"
+sdkBuildToolsVersion="35.0.1"
+sdkApiLevel="android-35"
+toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
 
 ndkVersionLatest="r27c"
 ndkSha1Latest="090e8083a715fdb1a3e402d0763c388abb03fb4e"
@@ -58,17 +57,11 @@ toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
 
 echo "Download and unzip Android SDK"
-DownloadURL "$toolsSourceFile" "$toolsBackupUrl" "$toolsSha1" "$toolsTargetFile"
+DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$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
@@ -122,6 +115,9 @@ 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
@@ -149,9 +145,7 @@ cat >>~/versions.txt <<EOB
 Android SDK tools = $toolsVersion
 Android SDK Build Tools = $sdkBuildToolsVersion
 Android SDK API level = $sdkApiLevel
-Android NDK latest = $ndkVersionLatest
-Android NDK nightly1 = $ndkVersionNightly1
-Android NDK nightly2 = $ndkVersionNightly2
+Android NDK = $ndkVersion
 EOB
 
 cd "$sdkTargetFolder/cmdline-tools/tools/bin"
@@ -184,27 +178,45 @@ echo "Unzipping the Android 9 to $minVersionDestination"
 sudo unzip -o -q "$minVersionFilePath" -d "$minVersionDestination"
 rm "$minVersionFilePath"
 
-echo "Download and unzip Android 16 System Image"
-maxVersionFileName="x86_64-36_r07.zip"
-maxVersionDestination="$sdkTargetFolder/system-images/android-36/google_apis/"
+echo "Download and unzip Android 15 System Image"
+maxVersionFileName="x86_64-35_r08.zip"
+maxVersionDestination="$sdkTargetFolder/system-images/android-35/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="c6bf44bdcd885bb902b4ba752d111a073ad7a817"
+maxVersionSha1="d79169884cabc6680cb29d32c2112ad46c858c1b"
 
 mkdir -p "$maxVersionDestination"
 DownloadURL "$maxVersionCiUrl" "$maxVersionUrl" "$maxVersionSha1" "$maxVersionFilePath"
 
-echo "Unzipping the Android 16 to $maxVersionDestination"
+echo "Unzipping the Android 15 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"
 
@@ -228,7 +240,7 @@ 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}/../unix/${emulator_script_filename}" "${HOME}"
+cp "${scripts_dir_name}/${emulator_script_filename}" "${HOME}"
 ANDROID_EMULATOR_RUNNER="${HOME}/${emulator_script_filename}"
 SetEnvVar "ANDROID_EMULATOR_RUNNER" "$ANDROID_EMULATOR_RUNNER"
 

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)_(env:TESTED_MODULE_BRANCH_COIN)_$(env:TARGET_OS_COIN)"
+            "name": "qt_$(env:PACKAGE)_$(env:MODULE)_dev_$(env:TARGET_OS_COIN)"
         },
         "VCSIntegration": {
             "vcs_mapping": {

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

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

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

@@ -3,10 +3,6 @@
 # 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"
@@ -16,8 +12,7 @@ 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")
-default_prefix="/usr/local/$ffmpeg_name"
-prefix="${2:-$default_prefix}"
+prefix="/usr/local/$ffmpeg_name"
 pkgconfig_path="$PKG_CONFIG_PATH"
 
 install_ff_nvcodec_headers() {
@@ -100,6 +95,5 @@ if [ "$build_type" == "shared" ]; then
     "$fix_dependencies" "$output_dir"
 fi
 
-sudo mkdir -p "$prefix"
-sudo mv "$output_dir"/* "$prefix"
+sudo mv "$output_dir" "/usr/local"
 set_ffmpeg_dir_env_var "FFMPEG_DIR" "$prefix"

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="22.21.1"
+version="18.16.0"
 
 uname_m="$(uname -m)"
 case "$uname_m" in
     x86_64|amd64)
-        sha256="680d3f30b24a7ff24b98db5e96f294c0070f8f9078df658da1bce1b9c9873c88"
+        sha256="44d93d9b4627fe5ae343012d855491d62c7381b236c347f7666a7ad070f26548"
         pkgname="node-v$version-linux-x64.tar.xz"
         dirname="node-v$version-linux-x64"
         ;;
     arm64|aarch64)
-        sha256="e660365729b434af422bcd2e8e14228637ecf24a1de2cd7c916ad48f2a0521e1"
+        sha256="c81dfa0bada232cb4583c44d171ea207934f7356f85f9184b32d0dde69e2e0ea"
         pkgname="node-v$version-linux-arm64.tar.xz"
         dirname="node-v$version-linux-arm64"
         ;;

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

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

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

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

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

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

coin/provisioning/common/linux/sccache.sh

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

coin/provisioning/common/macos/android.sh

@@ -8,120 +8,79 @@
 
 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"
 
-sudo mkdir -p "$sdkTargetFolder"
+basePath="/net/ci-files01-hki.ci.qt.io/hdd/www/input/android"
 
-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"
+toolsVersion="2.1"
+# toolsFile dertermines tools version
+toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 # Non-latest (but still supported by the qt/qt5 branch) NDKs are installed for nightly targets in:
 # coin/platform_configs/nightly_android.yaml
 
-ndkVersionNightly1=$ndkVersionLatest  # Set as same version as latest = skip NDK install in provisioning
-ndkSha1Nightly1=$ndkSha1Latest
-ndkVersionNightly2=$ndkVersionLatest
-ndkSha1Nightly2=$ndkSha1Latest
-sdkBuildToolsVersion="36.0.0"
+ndkVersionLatest="r27c"
+ndkVersionPreview="r29-beta2"
+ndkVersionNightly1="$ndkVersionLatest"  # If same version as latest = skip NDK install for nightly
+ndkVersionNightly2="$ndkVersionLatest"
+
+sdkBuildToolsVersion="35.0.1"
 # this is compile sdk version
-sdkApiLevel="android-36"
+sdkApiLevel="android-35"
 
-toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
 
-echo "Download and unzip Android SDK"
-DownloadURL "$toolsSourceFile" "$toolsBackupUrl" "$toolsSha1" "$toolsTargetFile"
-echo "Unzipping Android Tools to '$sdkTargetFolder'"
-sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder"
-rm "$toolsTargetFile"
-
-# Android Command-Line Tools unpacks a directory 'cmdline-tools'. Due
-# to existing code, we need to move it into 'cmdline-tools/tools'
-sudo mv "$sdkTargetFolder/cmdline-tools" "$sdkTargetFolder/tools"
-sudo mkdir "$sdkTargetFolder/cmdline-tools"
-sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools"
-
 function InstallNdk() {
 
     ndkVersion=$1
-    ndkSha1=$2
 
-    ndkFile="android-ndk-$ndkVersion-darwin.zip"
-    ndkTargetFile="/tmp/$ndkFile"
-    ndkSourceFile="$basePath/$ndkFile"
+    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
 
-    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 $ndkSha1Latest
-SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$androidNdkRoot"
+InstallNdk $ndkVersionLatest
+SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest"
 
 if [ "$ndkVersionPreview" != "$ndkVersionLatest" ]; then
-    InstallNdk $ndkVersionPreview $ndkSha1Preview
-    SetEnvVar "ANDROID_NDK_ROOT_PREVIEW" "$androidNdkRoot"
+    InstallNdk $ndkVersionPreview
+    SetEnvVar "ANDROID_NDK_ROOT_PREVIEW" "$targetFolder/android-ndk-$ndkVersionPreview"
 fi
 
 if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then
-    InstallNdk $ndkVersionNightly1 $ndkSha1Nightly1
-    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY1" "$androidNdkRoot"
+    InstallNdk $ndkVersionNightly1
+    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY1" "$targetFolder/android-ndk-$ndkVersionNightly1"
 fi
 
 if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
-    InstallNdk $ndkVersionNightly2 $ndkSha1Nightly2
-    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY2" "$androidNdkRoot"
+    InstallNdk $ndkVersionNightly2
+    SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY2" "$targetFolder/android-ndk-$ndkVersionNightly2"
 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
 
-# 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.
+# Run the following command under `eval` or `sh -c` so that the shell properly splits it
 sdkmanager_no_progress_bar_cmd="tr '\r' '\n'  |  grep -v '^\[[ =]*\]'"
-# But don't let the pipeline hide sdkmanager failures.
-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
-    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 "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"
 
 echo "Checking the contents of Android SDK..."
 ls -l "$sdkTargetFolder"

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

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

coin/provisioning/common/macos/install_xcode.sh

@@ -2,8 +2,6 @@
 # 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"
 
@@ -22,11 +20,6 @@ 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"
@@ -42,7 +35,7 @@ function InstallXCode() {
     fi
 
     echo "Versioning application bundle"
-    majorVersion="${version%%[^0-9]*}"
+    majorVersion=$(echo "$version" | cut -d '.' -f 1)
     versionedAppBundle="/Applications/Xcode${majorVersion}.app"
     sudo mv /Applications/Xcode*.app "${versionedAppBundle}"
 
@@ -53,12 +46,11 @@ function InstallXCode() {
     sudo xcodebuild -license accept
 
     echo "Install packages"
-    sudo xcodebuild -runFirstLaunch
+    # -runFirstLaunch is valid in 9.x
+    sudo xcodebuild -runFirstLaunch || true
 
     # Metal toolchain not included by default in Xcode 26
-    if ((majorVersion >= 26)); then
-        xcodebuild -downloadComponent MetalToolchain
-    fi
+    xcodebuild -downloadComponent MetalToolchain || true
 
     echo "Enabling developer mode, so that using lldb does not require interactive password entry"
     sudo /usr/sbin/DevToolsSecurity -enable

coin/provisioning/common/macos/nodejs.sh

@@ -7,10 +7,10 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 
 # This script will install Nodejs
 
-version="22.21.1"
+version="18.16.0"
 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="182ad62634eabbb11497c2284a3172771944f1cd17e23b143e778bd189af6d65"
+sha256="156aa5b9580288fb0b3c6134eb8fac64e50745d78d33eebe9e29eb7ff87b8e1e"
 
 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

@@ -1,34 +0,0 @@
-#!/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=v0.11.0
+targetVersion=0.2.14
 if [[ `arch` == arm* ]]; then
     targetArch=aarch64-apple-darwin
-    sha1=3261ab99e5bb1f9f36eafa597d11491bd85da5ec
+    sha1=ad10cd4b8889fa08e193a4165ac664876a27c0dc
 else
     targetArch=x86_64-apple-darwin
-    sha1=57810789bf2813dfa9bf5da26a712dc30b56ce16
+    sha1=764bc1664c0ff616d9980a6d127175d0a2041781
 fi
 installSccache "$targetArch" "$targetVersion" "$sha1"

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

@@ -1,13 +0,0 @@
-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

@@ -1,13 +0,0 @@
-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-configuration.json

@@ -5,5 +5,5 @@
     "repository": "https://git.qt.io/aledelev/vcpkg",
     "baseline": "9c5c2a0ab75aff5bcd08142525f6ff7f6f7ddeee"
   },
-  "overlay-triplets": [ "./../triplets" ]
+  "overlay-triplets": [ "./../../shared/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
-unix_checksum=f0c4b30afc2f7baa9cc4372ac325042418251343e0192dbfac94c4f602e9d3ed
+linux_checksum=f0c4b30afc2f7baa9cc4372ac325042418251343e0192dbfac94c4f602e9d3ed

coin/provisioning/common/unix/check_and_set_proxy.sh

@@ -7,22 +7,4 @@ set -ex
 # shellcheck source=../shared/http_proxy.txt
 source "${BASH_SOURCE%/*}/../shared/http_proxy.txt"
 
-# 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
+{ 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"

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

@@ -82,13 +82,12 @@ 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} --strip=${strip}"
+    ffmpeg_config_options+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}"
     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"

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

@@ -158,8 +158,8 @@ create_xcframework() {
     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/lib/"
-    sudo xcodebuild -create-xcframework -framework $fw_a -framework $fw_b -output "${prefix}/lib/${framework_name}.xcframework"
+    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"
@@ -180,5 +180,9 @@ 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/squishInstall.sh

@@ -0,0 +1,104 @@
+#!/usr/bin/env bash
+# Copyright (C) 2020 The Qt Company Ltd.
+# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+
+PROVISIONING_DIR="$(dirname "$0")/../../"
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+source "$PROVISIONING_DIR"/common/unix/common.sourced.sh
+
+set -ex
+
+# This script will fetch and extract pre-buildt squish package for Linux and Mac.
+# Squish is need by Release Test Automation (RTA)
+
+version="8.1.0"
+qtBranch="68x"
+installFolder="/opt"
+squishFolder="$installFolder/squish"
+preBuildCacheUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/jenkins_build/stable"
+licenseFile=".squish-license"
+licenseBranch="squish_license"
+licenseUrl="http://ci-files01-hki.ci.qt.io/input/squish/coin/$licenseBranch/$licenseFile"
+licenseSHA="e84b499a2011f9bb1a6eefc7b2338d7ae770927a"
+testSuiteUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/coin/suite_test_squish"
+testSuiteLocal="/tmp/squish_test_suite"
+if uname -a |grep -q Darwin; then
+    compressedFolder="prebuild-squish-$version-$qtBranch-mac-x64.tar.gz"
+    sha1="03a0c713d0d328667df2e7804f2e4d507707b849"
+else
+    if [ "$PROVISIONING_ARCH" = arm64 ] ; then
+        compressedFolder="prebuild-squish-$version-$qtBranch-linux-arm64.tar.gz"
+        sha1="f6a2eb69faed64f13b164fb8d056182c41d2952c"
+    else
+        compressedFolder="prebuild-squish-$version-$qtBranch-linux-x64.tar.gz"
+        sha1="b798417ddf4b668306cb90d551df906828644152"
+    fi
+fi
+
+mountFolder="/tmp/squish"
+sudo mkdir "$mountFolder"
+sudo mkdir "$testSuiteLocal"
+
+# Check which platform
+if uname -a |grep -q Darwin; then
+    usersGroup="staff"
+elif uname -a |grep -q "el7"; then
+    usersGroup="qt"
+elif uname -a |grep -q "Ubuntu"; then
+    usersGroup="users"
+else
+    usersGroup="users"
+fi
+
+targetFileMount="$mountFolder"/"$compressedFolder"
+
+echo "Mounting Squish packages from $preBuildCacheUrl to $mountFolder"
+echo "Mounting Squish test suite from $testSuiteUrl to $testSuiteLocal"
+if uname -a |grep -q Darwin; then
+   sudo mount -o locallocks "$preBuildCacheUrl" "$mountFolder"
+   sudo mount -o locallocks "$testSuiteUrl" "$testSuiteLocal"
+else
+   sudo mount "$preBuildCacheUrl" "$mountFolder"
+   sudo mount "$testSuiteUrl" "$testSuiteLocal"
+fi
+echo "Create $installFolder if needed"
+if [ !  -d "$installFolder" ]; then
+    sudo mkdir "$installFolder"
+fi
+
+VerifyHash "$targetFileMount" "$sha1"
+
+echo "Uncompress $compressedFolder"
+sudo tar -xzf "$targetFileMount" --directory "$installFolder"
+
+if uname -a |grep -q Darwin; then
+    sudo xattr -r -c "$squishFolder"
+fi
+
+echo "Download Squish license"
+DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/$licenseFile"
+
+echo "Changing ownerships"
+sudo chown -R qt:$usersGroup "$squishFolder"
+sudo chown qt:$usersGroup "$HOME/$licenseFile"
+
+
+echo "Verifying Squish, available installations:"
+ls -la $squishFolder
+cd $squishFolder
+
+for squishInstallation in */ ; do
+  if "$squishInstallation/bin/squishrunner" --testsuite "$testSuiteLocal" | grep "Squish test run successfully" ; then
+    echo "Squish in $squishInstallation tested successfully"
+  else
+    echo "Testing Squish in $squishInstallation failed! Squish wasn't installed correctly."
+    exit 1
+  fi
+done
+
+echo "Clean up installation temp dirs"
+echo "- Unmounting $mountFolder"
+sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder" || true
+
+echo "- Unmounting $testSuiteLocal"
+sudo diskutil unmount force "$testSuiteLocal" || sudo umount -f "$testSuiteLocal" || true

coin/provisioning/common/windows/android.ps1

@@ -38,14 +38,14 @@ $ndkCachedUrlNightly2 = "\\ci-files01-hki.ci.qt.io\provisioning\android\android-
 $ndkOfficialUrlNightly2 = "https://dl.google.com/android/repository/android-ndk-$ndkVersionNightly2-windows.zip"
 
 # SDK
-$toolsVersion = "19.0"
-$toolsFile = "commandlinetools-win-13114758_latest.zip"
+$toolsVersion = "2.1"
+$toolsFile = "commandlinetools-win-6609375_latest.zip"
 $sdkApi = "ANDROID_API_VERSION"
-$sdkApiLevel = "android-36"
-$sdkBuildToolsVersion = "36.0.0"
+$sdkApiLevel = "android-35"
+$sdkBuildToolsVersion = "35.0.1"
 $toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile"
 $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
-$toolsChecksum = "54a582f3bf73e04253602f2d1c80bd5868aac115"
+$toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
 $cmdFolder = "c:\Utils\Android\cmdline-tools"
 
 $sdkZip = "c:\Windows\Temp\$toolsFile"
@@ -96,13 +96,9 @@ if ($ndkVersionNightly2 -ne $ndkVersionLatest) {
     Write-Output "Android NDK = $ndkVersionNightly2" >> ~/versions.txt
 }
 
-# Android Command-Line Tools unpacks a directory 'cmdline-tools'. Due
-# to existing code, weed to move it into 'cmdline-tools/tools'
-Write-Host "Downloading Android Command-Line Tools"
 $toolsFolder = Install $toolsCachedUrl $sdkZip $toolsChecksum $toolsOfficialUrl
-Rename-Item -Path "$toolsFolder" -NewName "c:\Utils\Android\tools"
 New-Item -ItemType directory -Path $cmdFolder
-Move-Item -Path "c:\Utils\Android\tools" -Destination "$cmdFolder\tools"
+Move-Item -Path $toolsFolder -Destination $cmdFolder\
 Set-EnvironmentVariable "ANDROID_SDK_ROOT" "C:\Utils\Android"
 Set-EnvironmentVariable "ANDROID_API_VERSION" $sdkApiLevel
 

coin/provisioning/common/windows/install-nuget.ps1

@@ -1,20 +0,0 @@
-# Copyright (C) 2025 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
-
-. "$PSScriptRoot\helpers.ps1"
-
-$script:nugetVersion = "v6.11.0"
-$script:nugetPackage = "nuget_$nugetVersion.exe"
-$script:packageRoot = "C:\Utils\NuGet\"
-
-$script:cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\nuget\$nugetPackage"
-$script:officialUrl = "https://dist.nuget.org/win-x86-commandline/$nugetVersion/nuget.exe"
-$script:sdkChecksumSha1 = "5443887cfb5283da5021388d146ebb5febdc82e9"
-$script:package_path = "$packageRoot\\$nugetPackage"
-
-New-Item -ItemType Directory -Path "$packageRoot"
-Download $officialUrl $cachedUrl $package_path
-Verify-Checksum $package_path $sdkChecksumSha1 sha1
-Write-Host "Installing Nuget"
-
-Set-EnvironmentVariable "NUGET_EXE_PATH" "$package_path"

coin/provisioning/common/windows/install-sccache.ps1

@@ -3,34 +3,14 @@
 
 # Install mozilla sccache
 
+param(
+    [string]$arch="x86_64-pc-windows-msvc",
+    [string]$version="0.2.14",
+    [string]$sha1="bbdceb59d6fd7b6a3af02fb36f65c8bf324757b0"
+)
 
 . "$PSScriptRoot\helpers.ps1"
 
-$version="v0.11.0-jimis3"
-$cpu_arch = Get-CpuArchitecture
-switch ($cpu_arch) {
-    arm64 {
-        $arch="aarch64-pc-windows-msvc"
-        $sha1="be429b6c33da9408bba827815d04fceeadf6dbd1"
-        break
-    }
-    x64 {
-        $arch="x86_64-pc-windows-msvc"
-        $sha1="bcce35f6b39e2d1d0829f2277fd749767e057486"
-        break
-    }
-    x86 {
-        $arch="x86-pc-windows-gnu"
-        $sha1="287f4c3b7db21b72138704b8fe96827e6b1643a8"
-        $version="0.2.13-alpha-0"
-        break
-    }
-
-    default {
-        throw "Unknown architecture $cpu_arch"
-    }
-}
-
 $basename = "sccache-" + $version + "-" + $arch
 $zipfile = $basename + ".tar.gz"
 $tempfile = "C:\Windows\Temp\" + $zipfile
@@ -48,9 +28,6 @@ Remove-Item -Path $tempfile
 # Turnoff idle timeout to avoid sccache shutting down
 Set-EnvironmentVariable "SCCACHE_IDLE_TIMEOUT" "0"
 
-# Prevents build job dying from random network I/O errors
-Set-EnvironmentVariable "SCCACHE_IGNORE_SERVER_IO_ERROR" "1"
-
 # add sccache to PATH
 Set-EnvironmentVariable "PATH" "C:\Program Files\$basename\;$([Environment]::GetEnvironmentVariable('PATH', 'Machine'))"
 

coin/provisioning/common/windows/install-vcpkg-ports-android.ps1

@@ -7,7 +7,9 @@ $vcpkgExe = "$env:VCPKG_ROOT\vcpkg.exe"
 $vcpkgRoot = "$env:VCPKG_ROOT"
 $vcpkgInstallRoot = "armeabi-v7a-android-qt-tmp"
 
-Set-Location -Path "$PSScriptRoot\..\shared\vcpkg"
+Set-Location -Path "$PSScriptRoot\vcpkg"
+Copy-Item "$PSScriptRoot\..\shared\vcpkg-configuration.json" -Destination "$PSScriptRoot\vcpkg"
+
 Run-Executable "$vcpkgExe" "install --triplet armeabi-v7a-android-qt --x-install-root $vcpkgInstallRoot --debug"
 
 New-Item -Path "$vcpkgRoot" -Name "installed" -ItemType "directory" -Force

coin/provisioning/common/windows/install-vcpkg-ports.ps1

@@ -10,7 +10,9 @@ $vcpkgExe = "$env:VCPKG_ROOT\vcpkg.exe"
 $vcpkgRoot = "$env:VCPKG_ROOT"
 $vcpkgInstallRoot = "$arch-windows-qt-tmp"
 
-Set-Location -Path "$PSScriptRoot\..\shared\vcpkg"
+Set-Location -Path "$PSScriptRoot\vcpkg"
+Copy-Item "$PSScriptRoot\..\shared\vcpkg-configuration.json" -Destination "$PSScriptRoot\vcpkg"
+
 Run-Executable "$vcpkgExe" "install --triplet $arch-windows-qt --x-install-root $vcpkginstallroot --debug"
 
 New-Item -Path "$vcpkgRoot" -Name "installed" -ItemType "directory" -Force

coin/provisioning/common/windows/squishInstall.ps1

@@ -0,0 +1,52 @@
+# 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
+
+. "$PSScriptRoot\helpers.ps1"
+
+# This script will pre-installed squish package for Windows.
+# Squish is need by Release Test Automation (RTA)
+
+$version = "8.1.0"
+$qtBranch = "68x"
+$targetDir = "C:\Utils\squish"
+$squishPackage = "C:\Utils\rta_squish"
+$squishUrl = "\\ci-files01-hki.ci.qt.io\provisioning\squish\jenkins_build\stable"
+$licenseBranch="squish_license"
+$licenseUrl = "\\ci-files01-hki.ci.qt.io\provisioning\squish\coin\$licenseBranch"
+$testSuiteUrl="\\ci-files01-hki.ci.qt.io\provisioning\squish\coin\suite_test_squish"
+
+# Squish license
+$licensePackage = ".squish-license"
+
+Write-Host "Installing Squish license to home directory"
+Copy-Item $licenseUrl\$licensePackage ~\$licensePackage
+
+if (Is64BitWinHost) {
+    $arch = "x64"
+} else {
+    $arch = "x86"
+}
+
+$OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName
+
+if (($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 10 Pro")) {
+    # In Windows 11 case $OSVersion is 'Windows 10 Pro'
+    $winVersion = "win10"
+    if (Is64BitWinHost) {
+        $sha1 = "e7497b925b9a0aa17628344dbdacd6b3acd41c3b"
+    }
+} else {
+    $winVersion = "n/a"
+}
+$squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip"
+
+Copy-Item "$squishUrl\$squishArchive" "C:\Utils"
+Copy-Item -Recurse "$testSuiteUrl" "C:\Utils"
+Verify-Checksum "C:\Utils\$squishArchive" $sha1
+Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils"
+
+Remove-Item "C:\Utils\prebuild*"
+
+Write-Host "Verifying Squish Installation for following targets:"
+get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { $_.FullName }
+get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { if (cmd /c $_.FullName --testsuite "C:\Utils\suite_test_squish" |Select-String -Pattern "Squish test run successfully") { Write-Host "Squish tested successfully"} else { [Environment]::Exit(1) } }

coin/provisioning/common/windows/vcpkg/vcpkg.json

@@ -0,0 +1,14 @@
+{
+  "overrides": [
+    {
+      "name": "openssl",
+      "version": "3.0.7",
+      "port-version": 2
+    }
+  ],
+  "dependencies": [
+    "openssl",
+    "protobuf",
+    "grpc"
+  ]
+}

coin/provisioning/common/windows/winappsdk.ps1

@@ -1,14 +1,20 @@
-# Copyright (C) 2025 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
-
 . "$PSScriptRoot\helpers.ps1"
 
 # This script installs Windows App SDK
 
+$script:nugetVersion = "v6.11.0"
+$script:nugetPackage = "nuget_$nugetVersion.exe"
 $script:packageRoot = "C:\Utils\WindowsAppSdk\"
 
-$script:package_path = [System.Environment]::GetEnvironmentVariable('NUGET_EXE_PATH', [System.EnvironmentVariableTarget]::Machine)
+$script:cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\nuget\$nugetPackage"
+$script:officialUrl = "https://dist.nuget.org/win-x86-commandline/$nugetVersion/nuget.exe"
+$script:sdkChecksumSha1 = "5443887cfb5283da5021388d146ebb5febdc82e9"
+$script:package_path = "$packageRoot\\$nugetPackage"
 
+New-Item -ItemType Directory -Path "$packageRoot"
+Download $officialUrl $cachedUrl $package_path
+Verify-Checksum $package_path $sdkChecksumSha1 sha1
+Write-Host "Installing Nuget"
 Run-Executable "$package_path" "install Microsoft.WindowsAppSDK -OutputDirectory $packageRoot"
 
 $script:cpuarch = Get-CpuArchitecture

coin/provisioning/qtci-linux-RHEL-8.10-x86_64/03-enable-repos.sh

@@ -14,7 +14,7 @@ while sudo fuser /usr/libexec/packagekitd >/dev/null 2>&1; do
 done
 sudo yum -y remove PackageKit gnome-software
 
-sudo subscription-manager config --rhsm.manage_repos=0
+sudo subscription-manager config --rhsm.manage_repos=1
 sudo subscription-manager refresh
 
 # List available RHEL versions and bind with correct one
@@ -22,35 +22,10 @@ sudo subscription-manager release --list
 sudo subscription-manager release --set=8.10
 sudo yum clean all
 
-sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC
-[rhel-8-for-x86_64-baseos-rpms]
-metadata_expire = 86400
-baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-baseos-rpms
-ui_repoid_vars = releasever basearch
-name = Qt Red Hat Enterprise Linux 8 Base OS (RPMs)
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-enabled = 1
-gpgcheck = 1
-
-[rhel-8-for-x86_64-appstream-rpms]
-metadata_expire = 86400
-baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-appstream-rpms
-ui_repoid_vars = releasever basearch
-name = Qt Red Hat Enterprise Linux 8 Appstream (RPMs)
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-enabled = 1
-gpgcheck = 1
-
-[codeready-builder-for-rhel-8-x86_64-rpms]
-metadata_expire = 86400
-baseurl = http://repo-clones.ci.qt.io/repos/codeready-builder-for-rhel-8-x86_64-rpms
-ui_repoid_vars = releasever basearch
-name = Qt Red Hat Enterprise Linux Codeready Builder (RPMs)
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-enabled = 1
-gpgcheck = 1
-EOC
-
+# sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms'
+sudo yum config-manager --enable 'codeready-builder-for-rhel-8-x86_64-rpms'
+sudo yum config-manager --enable 'rhel-8-for-x86_64-baseos-rpms'
+sudo yum config-manager --enable 'rhel-8-for-x86_64-appstream-rpms'
 # Epel is required for 'double-conversion-devel', 'libsqlite3x' and 'p7zip'
 sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 

coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh

@@ -160,7 +160,7 @@ installPackages+=(perl-JSON)
 
 sudo yum -y install "${installPackages[@]}"
 
-sudo dnf -y module install nodejs:20
+sudo dnf -y module install nodejs:16
 
 # We shouldn't use yum to install virtualenv. The one found from package repo is not
 # working, but we can use installed pip

coin/provisioning/qtci-linux-RHEL-8.10-x86_64/41-install-vcpkg.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-vcpkg.sh"
+"$BASEDIR/../common/linux/install-vcpkg.sh"

coin/provisioning/qtci-linux-RHEL-8.10-x86_64/42-install-vcpkg-ports.sh

@@ -8,7 +8,7 @@ echo "ANDOID_NDK_HOME: ${ANDROID_NDK_HOME}"
 
 # Installing common ports
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
+"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
 
 # Installing platform specific ports
 "$BASEDIR/../common/linux/install-vcpkg-ports-android.sh"

coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-squish.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 #Copyright (C) 2023 The Qt Company Ltd
 #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-set -ex
-
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/java.sh"
+"$BASEDIR/../common/unix/squishInstall.sh"
+

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/90-squish.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 #Copyright (C) 2023 The Qt Company Ltd
 #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-set -ex
-
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/macos/nodejs.sh"
+"$BASEDIR/../common/unix/squishInstall.sh"
+

coin/provisioning/qtci-linux-RHEL-8.4-x86_64/03-enable-repos.sh

@@ -9,7 +9,7 @@ sudo systemctl stop packagekit
 sudo systemctl disable packagekit
 sudo yum -y remove PackageKit gnome-software
 
-sudo subscription-manager config --rhsm.manage_repos=0
+sudo subscription-manager config --rhsm.manage_repos=1
 sudo subscription-manager refresh
 
 # List available RHEL versions and bind with correct one
@@ -17,35 +17,10 @@ sudo subscription-manager release --list
 sudo subscription-manager release --set=8.4
 sudo yum clean all
 
-sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC
-[rhel-8-for-x86_64-baseos-rpms]
-metadata_expire = 86400
-baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-baseos-rpms
-ui_repoid_vars = releasever basearch
-name = Qt Red Hat Enterprise Linux 8 Base OS (RPMs)
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-enabled = 1
-gpgcheck = 1
-
-[rhel-8-for-x86_64-appstream-rpms]
-metadata_expire = 86400
-baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-appstream-rpms
-ui_repoid_vars = releasever basearch
-name = Qt Red Hat Enterprise Linux 8 Appstream (RPMs)
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-enabled = 1
-gpgcheck = 1
-
-[codeready-builder-for-rhel-8-x86_64-rpms]
-metadata_expire = 86400
-baseurl = http://repo-clones.ci.qt.io/repos/codeready-builder-for-rhel-8-x86_64-rpms
-ui_repoid_vars = releasever basearch
-name = Qt Red Hat Enterprise Linux Codeready Builder (RPMs)
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-enabled = 1
-gpgcheck = 1
-EOC
-
+# sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms'
+sudo yum config-manager --enable 'codeready-builder-for-rhel-8-x86_64-rpms'
+sudo yum config-manager --enable 'rhel-8-for-x86_64-baseos-rpms'
+sudo yum config-manager --enable 'rhel-8-for-x86_64-appstream-rpms'
 # Epel is required for 'double-conversion-devel', 'libsqlite3x' and 'p7zip'
 sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 

coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-squish.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/unix/squishInstall.sh"
+

coin/provisioning/qtci-linux-RHEL-8.6-x86_64/90-squish.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/unix/squishInstall.sh"
+

coin/provisioning/qtci-linux-RHEL-8.8-x86_64/03-enable-repos.sh

@@ -14,7 +14,7 @@ while sudo fuser /usr/libexec/packagekitd >/dev/null 2>&1; do
 done
 sudo yum -y remove PackageKit gnome-software
 
-sudo subscription-manager config --rhsm.manage_repos=0
+sudo subscription-manager config --rhsm.manage_repos=1
 sudo subscription-manager refresh
 
 # List available RHEL versions and bind with correct one
@@ -22,35 +22,10 @@ sudo subscription-manager release --list
 sudo subscription-manager release --set=8.8
 sudo yum clean all
 
-sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC
-[rhel-8-for-x86_64-baseos-rpms]
-metadata_expire = 86400
-baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-baseos-rpms
-ui_repoid_vars = releasever basearch
-name = Qt Red Hat Enterprise Linux 8 Base OS (RPMs)
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-enabled = 1
-gpgcheck = 1
-
-[rhel-8-for-x86_64-appstream-rpms]
-metadata_expire = 86400
-baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-appstream-rpms
-ui_repoid_vars = releasever basearch
-name = Qt Red Hat Enterprise Linux 8 Appstream (RPMs)
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-enabled = 1
-gpgcheck = 1
-
-[codeready-builder-for-rhel-8-x86_64-rpms]
-metadata_expire = 86400
-baseurl = http://repo-clones.ci.qt.io/repos/codeready-builder-for-rhel-8-x86_64-rpms
-ui_repoid_vars = releasever basearch
-name = Qt Red Hat Enterprise Linux Codeready Builder (RPMs)
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-enabled = 1
-gpgcheck = 1
-EOC
-
+# sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms'
+sudo yum config-manager --enable 'codeready-builder-for-rhel-8-x86_64-rpms'
+sudo yum config-manager --enable 'rhel-8-for-x86_64-baseos-rpms'
+sudo yum config-manager --enable 'rhel-8-for-x86_64-appstream-rpms'
 # Epel is required for 'double-conversion-devel', 'libsqlite3x' and 'p7zip'
 sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 

coin/provisioning/qtci-linux-RHEL-8.8-x86_64/41-install-vcpkg.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-vcpkg.sh"
+"$BASEDIR/../common/linux/install-vcpkg.sh"

coin/provisioning/qtci-linux-RHEL-8.8-x86_64/42-install-vcpkg-ports.sh

@@ -8,7 +8,7 @@ echo "ANDOID_NDK_HOME: ${ANDROID_NDK_HOME}"
 
 # Installing common ports
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
+"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
 
 # Installing platform specific ports
 "$BASEDIR/../common/linux/install-vcpkg-ports-android.sh"

coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-squish.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/unix/squishInstall.sh"
+

coin/provisioning/qtci-linux-RHEL-9.0-x86_64/90-squish.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/unix/squishInstall.sh"
+

coin/provisioning/qtci-linux-RHEL-9.2-x86_64/41-install-vcpkg.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-vcpkg.sh"
+"$BASEDIR/../common/linux/install-vcpkg.sh"

coin/provisioning/qtci-linux-RHEL-9.2-x86_64/42-install-vcpkg-ports.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
+"$BASEDIR/../common/linux/install-vcpkg-ports.sh"

coin/provisioning/qtci-linux-RHEL-9.2-x86_64/90-squish.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/unix/squishInstall.sh"
+

coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh

@@ -176,7 +176,7 @@ installPackages+=(perl-JSON)
 
 sudo yum -y install "${installPackages[@]}"
 
-sudo dnf -y module install nodejs:20
+sudo dnf install nodejs-16.14.0-4.el9_0 -y
 # Required by QtCore
 sudo dnf install 'perl(English)' -y
 

coin/provisioning/qtci-linux-RHEL-9.4-x86_64/41-install-vcpkg.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-vcpkg.sh"
+"$BASEDIR/../common/linux/install-vcpkg.sh"

coin/provisioning/qtci-linux-RHEL-9.4-x86_64/42-install-vcpkg-ports.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
+"$BASEDIR/../common/linux/install-vcpkg-ports.sh"

coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-squish.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/unix/squishInstall.sh"
+

coin/provisioning/qtci-linux-RHEL-9.6-x86_64/04-install-packages.sh

@@ -168,8 +168,6 @@ installPackages+=(zip)
 installPackages+=(perl-IPC-Cmd)
 # password management support for Qt Creator
 installPackages+=(libsecret-devel)
-# for license-service library
-installPackages+=(libuuid-devel)
 # For Firebird in RTA
 installPackages+=(libtommath-devel)
 # For tst_license.pl with all the machines generating SBOM
@@ -177,7 +175,7 @@ installPackages+=(perl-JSON)
 
 sudo yum -y install "${installPackages[@]}"
 
-sudo dnf -y module install nodejs:22
+sudo dnf install nodejs-16.14.0-4.el9_0 -y
 # Required by QtCore
 sudo dnf install 'perl(English)' -y
 

coin/provisioning/qtci-linux-RHEL-9.6-x86_64/41-install-vcpkg.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-vcpkg.sh"
+"$BASEDIR/../common/linux/install-vcpkg.sh"

coin/provisioning/qtci-linux-RHEL-9.6-x86_64/42-install-vcpkg-ports.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
+"$BASEDIR/../common/linux/install-vcpkg-ports.sh"

coin/provisioning/qtci-linux-RHEL-9.6-x86_64/90-squish.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/unix/squishInstall.sh"
+

coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/90-squish.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/unix/squishInstall.sh"
+

coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/41-install-vcpkg.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-vcpkg.sh"
+"$BASEDIR/../common/linux/install-vcpkg.sh"

coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/42-install-vcpkg-ports.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
+"$BASEDIR/../common/linux/install-vcpkg-ports.sh"

coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/90-squish.sh

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
-# Copyright (C) 2025 The Qt Company Ltd.
+# Copyright (C) 2023 The Qt Company Ltd
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
-set -ex
-source "${BASH_SOURCE%/*}/../common/macos/set_tcc_permissions.sh"
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/unix/squishInstall.sh"
+

coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/41-install-vcpkg.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-vcpkg.sh"
+"$BASEDIR/../common/linux/install-vcpkg.sh"

coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/42-install-vcpkg-ports.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
+"$BASEDIR/../common/linux/install-vcpkg-ports.sh"

coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/90-squish.sh

@@ -0,0 +1,7 @@
+#!/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
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/unix/squishInstall.sh"
+

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-squish.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/unix/squishInstall.sh"
+

coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/90-squish.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#Copyright (C) 2023 The Qt Company Ltd
+#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/unix/squishInstall.sh"
+