Update submodules on '6.10 in qt/qt5'

Change-Id: I9c9d3594ba1433c8a44c99cc26cfa2ccb84c0090 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-12-26 18:05:59 +08:00 · 2025-12-22 12:30:48 +00:00 · 2025-12-20 09:11:19 +00:00 · 2025-12-19 19:46:22 +00:00 · 2025-12-19 19:46:22 +00:00 · 2025-12-18 20:01:34 +00:00
67 changed files with 186 additions and 126 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.10.1
+	branch = 6.10
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.10.1
+	branch = 6.10
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.10.1
+	branch = 6.10
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.10.1
+	branch = 6.10
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.10.1
+	branch = 6.10
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,7 +68,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = 6.10.1
+	branch = 6.10
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.10.1
+	branch = 6.10
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.10.1
+	branch = 6.10
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.10.1
+	branch = 6.10
 	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.10.1
+	branch = 6.10
 	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,88 +252,88 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.10.1
+	branch = 6.10
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.10.1
+	branch = 6.10
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.10.1
+	branch = 6.10
 	status = addon
--- a/cmake/QtIRCommandLineHelpers.cmake
+++ b/cmake/QtIRCommandLineHelpers.cmake
@@ -421,3 +421,19 @@ function(qt_ir_get_option_as_cmake_flag_option cli_name cmake_option_name out_va
    endif()
    set(${out_var} "${cmake_option}" PARENT_SCOPE)
 endfunction()
+
+# Get the value of a command line option as existing absolute path.
+# Yield error if the path does not exist.
+# Convert to absolute path if necessary.
+function(qt_ir_get_option_as_existing_absolute_path name value)
+    qt_ir_get_option_value("${name}" path)
+    if(NOT "${path}" STREQUAL "")
+        if(NOT EXISTS "${path}")
+            qt_ir_add_error("The path '${path}' passed with -${name} does not exist.")
+        endif()
+        if(NOT IS_ABSOLUTE "${path}")
+            get_filename_component(path "${path}" ABSOLUTE)
+        endif()
+    endif()
+    set("${value}" "${path}" PARENT_SCOPE)
+endfunction()
--- a/cmake/QtIRHelpers.cmake
+++ b/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_value(alternates alternates)
+    qt_ir_get_option_as_existing_absolute_path(alternates alternates)
    qt_ir_get_option_as_cmake_flag_option(branch "CHECKOUT_BRANCH" checkout_branch_option)

    # The prefix for the cmake-style 'dictionary' that will be used by various functions.
--- a/coin/platform_configs/cmake_platforms_target_android.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android.yaml
@@ -33,12 +33,12 @@ Configurations:
    ]
 -
    Id: 'android-9-x86-on-linux'
-    Template: 'qtci-linux-RHEL-8.10-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-8.10'
+    Platform dependency: 'rhel-9.4'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
@@ -49,12 +49,12 @@ Configurations:
    ]
 -
    Id: 'android-16-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    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-8.10'
+    Platform dependency: 'rhel-9.4'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
--- a/coin/platform_configs/linux_android_tests_developer.yaml
+++ b/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-8.10-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-8.10'
+    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',
--- a/coin/platform_configs/linux_android_tests_multi_abi.yaml
+++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml
@@ -2,13 +2,13 @@ Version: 2
 Configurations:
 -
    Id: 'android-9-multi-abi'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
    Target os: 'Android_ANY'
    Target arch: 'multi'
    Compiler: 'GCC'
    Target compiler: 'Clang'
    Platform dependency: [
-        'rhel-8.10',
+        'rhel-9.4',
        'android-9-x86-on-linux',
        'android-16-x86_64-on-linux'
    ]
@@ -20,7 +20,7 @@ Configurations:
        'InstallDepsPerPlatformSubdir'
    ]
    Environment variables: [
-        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.10',
+        '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-16-x86_64-on-linux',
        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
--- a/coin/platform_configs/nightly_android_namespace.yaml
+++ b/coin/platform_configs/nightly_android_namespace.yaml
@@ -1,7 +1,7 @@
 Version: 2
 Include: [
    cmake_platforms.yaml: [
-        'rhel-8.10'
+        'rhel-9.4'
    ],
    cmake_platforms_target_android.yaml: [
        'android-15-x86_64-on-linux',
--- a/coin/platform_configs/nightly_android_ndk1.yaml
+++ b/coin/platform_configs/nightly_android_ndk1.yaml
@@ -1,7 +1,7 @@
 Version: 2
 Include: [
    cmake_platforms.yaml: [
-        'rhel-8.10',
+        'rhel-9.4',
        'windows-11_24h2-mingw13'
    ],
    cmake_platforms_target_android.yaml: [
--- a/coin/platform_configs/nightly_android_ndk2.yaml
+++ b/coin/platform_configs/nightly_android_ndk2.yaml
@@ -1,7 +1,7 @@
 Version: 2
 Include: [
    cmake_platforms.yaml: [
-        'rhel-8.10',
+        'rhel-9.4',
        'windows-11_24h2-mingw13'
    ],
    cmake_platforms_target_android.yaml: [
--- a/coin/platform_configs/qt-creator.yaml
+++ b/coin/platform_configs/qt-creator.yaml
@@ -9,7 +9,7 @@ Configurations:
    Environment variables: []
    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 -
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'DebugAndRelease']
    Configure arguments: ''
@@ -21,7 +21,7 @@ Configurations:
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-macos-14-arm-106'
+    Template: 'qtci-macos-15-arm-104'
    Compiler: 'Clang'
    Features: ['Sccache', 'DebugAndRelease']
    Configure arguments: ''
@@ -43,17 +43,30 @@ Configurations:
    Environment variables: []
    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 -
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-macos-14-arm-106'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'DebugAndRelease', 'OldestQt', 'QtC18AndEarlier']
+    Configure arguments: ''
+    Environment variables: []
+-
+    Template: 'qtci-macos-15-arm-104'
    Compiler: 'Clang'
    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
    Configure arguments: ''
    Environment variables: []
+# Tests GCC 11
+-
+    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
+    Configure arguments: ''
+    Environment variables: []
 # license check
 -
    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -2,7 +2,7 @@ Version: 2
 Include: [
    cmake_platforms.yaml: [
        "documentation-warnings",
-        "rhel-8.10",
+        "rhel-9.4",
        'windows-11_24h2-mingw13',
    ],
    macos.yaml: [
@@ -19,12 +19,12 @@ Include: [
 Configurations:
 -
    Id: "automotive-android-14-x86_64-on-linux"
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    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-8.10'
+    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',
@@ -35,12 +35,12 @@ Configurations:
    ]
 -
    Id: "automotive-android-10-x86_64-on-linux"
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
+    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-8.10'
+    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',
--- a/coin/provisioning/common/unix/install-patchelf.sh
+++ b/coin/provisioning/common/unix/install-patchelf.sh
@@ -15,14 +15,21 @@ sha1="ddd46a2e2a16a308245c008721d877455b23bba8"
 target_source_dir="$HOME/patchelf-$patchelf_version"

 if [ ! -d "$target_source_dir" ]; then
-   InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$HOME" ""
+    InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$HOME" ""
 fi

-pushd "$target_source_dir"
+pushd "$target_source_dir" || exit

 ./bootstrap.sh
 ./configure
 make
 sudo make install

-popd
+popd || exit
+
+if [[ "$(uname -s)" = "Linux" && -f /etc/redhat-release ]]; then
+    # RHEL-9 with sudo or non-interactive shells do not include /usr/local/bin/ in PATH
+    # Add a symlink so patchelf is found in later scripts
+    echo "Creating symlink for patchelf in /usr/bin"
+    sudo ln -sf /usr/local/bin/patchelf /usr/bin/patchelf
+fi
--- a/coin/provisioning/common/windows/install-jdk.ps1
+++ b/coin/provisioning/common/windows/install-jdk.ps1
@@ -6,7 +6,6 @@
 # This script will install Java SE
 # https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html
 $version_major = "17"
-$installdir = "C:\Program Files\Java\jdk-$version_major"

 $cpu_arch = Get-CpuArchitecture
 switch ($cpu_arch) {
@@ -19,6 +18,9 @@ switch ($cpu_arch) {
        $url_official = "https://aka.ms/download-jdk/microsoft-jdk-${version}-windows-${arch}.msi"
        $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\microsoft-jdk-${version}-windows-${arch}.msi"
        $javaPackage = "C:\Windows\Temp\jdk-$version.msi"
+        # Microsoft installer does not allow to override the installation path using the regular
+        # TARGETDIR or INSTALLDIR properties, so just hardcode the path that it uses
+        $installdir = "C:\Program Files\Microsoft\jdk-17.0.11.9-hotspot"
        Break
    }
    x64 {
@@ -28,6 +30,7 @@ switch ($cpu_arch) {
        $url_official = "https://download.oracle.com/java/17/archive/jdk-${version}_windows-${arch}_bin.exe"
        $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\jdk-$version-windows-$arch.exe"
        $javaPackage = "C:\Windows\Temp\jdk-$version.exe"
+        $installdir = "C:\Program Files\Java\jdk-$version_major"
        Break
    }
    default {
--- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh
@@ -166,6 +166,8 @@ 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)

--- a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh
@@ -167,6 +167,8 @@ 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
--- a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-install-ffmpeg.sh
@@ -1,3 +1,5 @@
 #!/usr/bin/env bash

 source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64" "use_16kb_page_size"
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86" "use_4kb_page_size"
--- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2017 The Qt Company Ltd.
+# 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

 # Install required packages with APT
@@ -20,14 +20,14 @@ function set_internal_repo {
    sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled}

    sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic main restricted universe multiverse
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-backports main restricted universe
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-security main restricted universe multiverse
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-amd64 main restricted universe multiverse
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-updates-amd64 main restricted universe multiverse
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-backports-amd64 main restricted universe
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-security-amd64 main restricted universe multiverse
 EOC
 }

-(ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."
+(ping -c 3 repo-clones-apt.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."

 # Git is not needed by builds themselves, but is nice to have
 # immediately as one starts debugging
--- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2021 The Qt Company Ltd.
+# 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

 # Install required packages with APT
@@ -20,17 +20,16 @@ function set_internal_repo {
    sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled}

    sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal main restricted universe multiverse
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal-updates main restricted universe multiverse
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal-backports main restricted universe
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal-security main restricted universe multiverse
-    deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal main restricted
-    deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal-updates main restricted
-    deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal universe
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 focal-amd64 main restricted universe multiverse
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 focal-updates-amd64 main restricted universe multiverse
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 focal-backports-amd64 main restricted universe
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 focal-security-amd64 main restricted universe multiverse
+    deb [arch=i386 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 focal-i386 main restricted universe
+    deb [arch=i386 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 focal-updates-i386 main restricted
 EOC
 }

-(ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."
+(ping -c 3 repo-clones-apt.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."

 # Make sure needed ca-certificates are available
 sudo apt-get install --reinstall ca-certificates
--- a/coin/provisioning/qtci-macos-15-arm/31-golang.sh
+++ b/coin/provisioning/qtci-macos-15-arm/31-golang.sh
@@ -0,0 +1,7 @@
+#!/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
+
+brew install go
--- a/coin/provisioning/qtci-macos-15-arm/31-upx.sh
+++ b/coin/provisioning/qtci-macos-15-arm/31-upx.sh
@@ -0,0 +1,8 @@
+#!/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
+
+# The package was disabled in brew
+#brew install upx
--- a/coin/provisioning/qtci-windows-10_22H2-x86_64/100-winappsdk.ps1
+++ b/coin/provisioning/qtci-windows-10_22H2-x86_64/100-winappsdk.ps1
--- a/coin/provisioning/qtci-windows-11_22H2-aarch64/100-winappsdk.ps1
+++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/100-winappsdk.ps1
--- a/coin/provisioning/qtci-windows-11_23H2-aarch64/100-winappsdk.ps1
+++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/100-winappsdk.ps1
--- a/coin/provisioning/qtci-windows-11_24H2-x86_64/100-winappsdk.ps1
+++ b/coin/provisioning/qtci-windows-11_24H2-x86_64/100-winappsdk.ps1
--- a/coin/provisioning/qtci-windows-11_24H2-x86_64/10-winappsdk.ps1
+++ b/coin/provisioning/qtci-windows-11_24H2-x86_64/10-winappsdk.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\windows\winappsdk.ps1"
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Qt Submodule Update Bot	3f94a4775b	Update submodules on '6.10 in qt/qt5' Change-Id: I9c9d3594ba1433c8a44c99cc26cfa2ccb84c0090 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-12-22 12:30:48 +00:00
Qt Submodule Update Bot	8cfbb3a8ce	Update submodules on '6.10 in qt/qt5' Change-Id: I2fff0108cab5436d0ca626d6610e6a040bbfdd2e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-12-20 09:11:19 +00:00
Joerg Bornemann	ca679e98de	init-repository: Fix passing no --alternates option Commit `d6918d7ac5` broke init-repository if you did not pass an --alternates option. Pick-to: 6.8 Task-number: QTBUG-142712 Fixes: QTBUG-142744 Change-Id: Ia727b420a34a46e52f0f05e549aabe2c975c6d7e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `6bd3b23b6c`) (cherry picked from commit `f1d54f955c`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-12-19 19:46:22 +00:00
Joerg Bornemann	30ee3ee4b2	init-repository: Fix passing relative path to --alternates When using --alternates with a relative path, nested submodules (e.g., qtdeclarative/tests/auto/qml/ecmascripttests/test262) failed because the alternates path wasn't adjusted for the changed working directory depth. The --alternates option worked correctly with absolute paths. Fix by converting the passed alternates path to an absolute path. Pick-to: 6.8 Fixes: QTBUG-142712 Change-Id: Ief7a87768d9ff17bb2832ae363f573ecae58d5ee Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `d6918d7ac5`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit `ec20fd6cab`)	2025-12-19 19:46:22 +00:00
Oleksii Zbykovskyi	5da5123c58	Rename 100... to 10... in Windows provisioning scripts Renamed files since it leads to misunderstanding due to their index. Our CI system sees only two first digits, so 100 is seen as 10 and executed with other 10s which is misleading. Pick-to: 6.8 Change-Id: Iabb548c622d71df8a3593cc171b7e0c2e2ae0287 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> (cherry picked from commit `b276b549f7`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit `6e69c9f7a7`)	2025-12-18 20:01:34 +00:00
Qt Submodule Update Bot	f4184f1888	Update submodules on '6.10 in qt/qt5' Change-Id: I4748fc6efb020cb6e7d400b44daa3427951bec2d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-12-18 13:31:08 +00:00
Qt Submodule Update Bot	65c4187e6e	Update submodules on '6.10 in qt/qt5' Change-Id: I82b5bbf818ea4552056177aa5d4b63bc9768b359 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-12-17 13:09:15 +00:00
Qt Submodule Update Bot	c7ce79946a	Update submodules on '6.10 in qt/qt5' Change-Id: Ibb508322a8103a3ca787c8cafcac61871e16a674 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-12-15 13:30:44 +00:00
Qt Submodule Update Bot	5f7dbc28d3	Update submodules on '6.10 in qt/qt5' Change-Id: I90135af9c97b584b6884649c524cd3ab45ee6ef4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-12-12 18:09:41 +00:00
Qt Submodule Update Bot	4cac599ed2	Update submodules on '6.10 in qt/qt5' Change-Id: I47ca7d57275a45667725c7ca057387287f98a315 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-12-11 19:34:30 +00:00
Qt Submodule Update Bot	285e7741cc	Update submodules on '6.10 in qt/qt5' Change-Id: Ia7b52b557236b1f9a9ad6168a9602ac8d92f70c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-12-10 17:33:46 +00:00
Eike Ziller	91ef9fed9f	COIN/QtCreator: Move to RHEL 9 and macOS 15 for QtC 19+ Updating for raising the compiler requirements. Also adds Ubuntu 22 to test with GCC 11 Since Qt Creator branches can use the same Qt branches that define these platforms, keep one RHEL 8 job for Qt Creator 18. Mark it in the features, so the Qt Creator 19+ configuration can filter these out. Change-Id: Ib771f473b6ed3ce42c6191647da7d473b64c2316 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> (cherry picked from commit `dcd07cc2ab`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit `69a8b1abfe`)	2025-12-09 17:53:18 +00:00
Qt Submodule Update Bot	905c3daac7	Update submodules on '6.10 in qt/qt5' Change-Id: I68bde889e84a194ce9d077ce46eed488bbfb6796 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-12-09 12:45:47 +00:00
Qt Submodule Update Bot	0741ab2895	Update submodules on '6.10 in qt/qt5' Change-Id: Ia23014087aa3767008e40b49c10eed264766b50b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-12-08 14:01:00 +00:00
Qt Submodule Update Bot	b210a2bf9a	Update submodules on '6.10 in qt/qt5' Change-Id: Ifd1cac24b2a6c0263761b4935836488cd7a47f2f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-12-05 19:14:12 +00:00
Ivan Solovev	de1524f320	Fix java provisioning on Windows ARM The installer from Microsoft which is used for ARM machines has a different default installation path compared to the installer from Oracle that is used for x64 machines, but the provisioning script did not take it into consideration. As a result, the JAVA_HOME variable was pointing to a non-existing dir on Windows ARM machines. An attempt to adjust the installation path using TARGETDIR or INSTALLDIR properties did not work, so this patch simply hardcodes the path that is used by the current ARM installer. Amends `b3f5b4fd64` that added Java provisioning to Windows ARM. Task-number: QTBUG-138968 Pick-to: 6.8 Change-Id: I2abdc07195a9c633340c2d7b21deaa80762aee67 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `6044f4fd12`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-12-04 09:28:23 +00:00
Qt Submodule Update Bot	a705215d0a	Update submodules on '6.10 in qt/qt5' Change-Id: I44296c1ef0bb8b25074e230b5ee5a1c40771f6d4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-11-28 19:38:06 +00:00
Ville-Pekka Karhu	8371d14e9d	Provisioning: Ubuntu 20.04 to use new repo-clones Task-number: QTQAINFRA-7546 Pick-to: 6.8 6.5 5.15 Change-Id: I70e87800049d8d3eb8466b90c9fc9974749e801a Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `540d6a546c`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-11-23 10:20:22 +00:00
Ville-Pekka Karhu	971f164d80	Provisioning: Ubuntu 18.04 to use new repo-clones Task-number: QTQAINFRA-7563 Pick-to: 6.8 6.5 5.15 Change-Id: I965297a0d2442e7e3e45f4c68038b7950e0c8da0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `73eecc44e3`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-11-22 22:12:47 +00:00
Eike Ziller	75ccca3662	COIN: Add missing package for license-service library libuuid is needed for it. RHEL 9.0 already has it in its package list, but it was missing for the later RHEL 9 versions Change-Id: Ibd052438c534e5811d2f0b0ee848808227e795f9 Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io> (cherry picked from commit `d534aedb32`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-11-22 22:12:47 +00:00
Qt Submodule Update Bot	925db9e3a3	Update submodules on '6.10 in qt/qt5' Change-Id: If07a74ec5a067c8cc6d3f6fe5c7ca45833a55308 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-11-20 22:26:07 +00:00
Elias Toivola	d587092f57	Android: move platform dependency from RHEL 8 to RHEL 9 Pick-to: 6.8 6.5 Task-number: QTQAINFRA-7498 Change-Id: I48a72860fe9d06cde1f014298e68fa28caff730d Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io> (cherry picked from commit `4dcaf6ec01`)	2025-11-20 14:45:26 +02:00
Eike Ziller	f7a9d1d907	COIN: Add missing golang/upx provisioning on macOS 15 Needed for Qt Creator, see the macOS 14 provisioning `493a11caee` added golang for macos-15-arm in the dev branch, but it is missing for 6.10 Change-Id: Ib037dbe2817a678cda4945a1044b9c55e2ad49cb Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>	2025-11-20 07:58:32 +00:00
Qt Submodule Update Bot	883d4c2c62	Update submodules on '6.10 in qt/qt5' Change-Id: I4fbe19347333be0ddf06c1440a8859855e52d639 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-11-18 17:48:36 +00:00
Eike Ziller	22960e9c23	Revert "COIN: Remove 'Packaging' feature from rhel 8.10" This reverts commit `d7a082f08d`. Reason for revert: Since that configuration was exported for Qt 6.10.0, we released Qt Creator 18.0.0 on this. If this becomes unavailable for Qt 6.10.1 we'd need to drop a platform in a patch release of Qt Creator, which would be ugly. Change-Id: Ida56410c44a908a2fa8c0b6bada21be7cad8d390 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2025-11-11 13:05:27 +00:00
				`@@ -0,0 +1 @@`
				`. "$PSScriptRoot\..\common\windows\winappsdk.ps1"`