Update submodules on '6.9 in qt/qt5'

Change-Id: Iab5b7d7e49e13195b8e726778f2e35346164ff58 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Add .gitreview file
2026-01-28 09:26:49 +08:00 · 2025-02-21 20:17:48 +00:00 · 2025-02-20 09:06:07 +00:00 · 2025-02-17 14:59:09 +00:00 · 2025-02-14 15:11:16 +00:00 · 2025-02-11 16:41:39 +02:00
82 changed files with 297 additions and 206 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -0,0 +1,4 @@
+[gerrit]
+host=codereview.qt-project.org
+project=qt/qt5
+defaultbranch=dev
--- a/coin/platform_configs/address_sanitizer_platforms.yaml
+++ b/coin/platform_configs/address_sanitizer_platforms.yaml
@@ -4,7 +4,7 @@ Configurations:
    Id: 'opensuse-15.6-host-asan'
    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
    Compiler: 'GCC'
-    Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer']
+    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer']
    Configure arguments: '-nomake examples -developer-build'
    Environment variables: [
        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -30,13 +30,13 @@ Configurations:
    Id: 'ubuntu-22.04-developer-build-x11-tests'
    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
-    Features: ['PinCores', 'Sccache', 'TestOnly']
+    Features: ['Sccache', 'TestOnly']
    Platform dependency: 'ubuntu-22.04-developer-build'
 -
    Id: 'ubuntu-22.04-x11-tests'
    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
-    Features: ['PinCores', 'Sccache', 'TestOnly']
+    Features: ['Sccache', 'TestOnly']
    Platform dependency: 'ubuntu-22.04'
 # Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later
 -
@@ -65,7 +65,7 @@ Configurations:
    Id: 'ubuntu-24.04-arm64-offscreen-tests'
    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
    Compiler: 'GCC'
-    Features: ['PinCores', 'TestOnly']
+    Features: ['TestOnly']
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
        'QT_QPA_OFFSCREEN_NO_GLX=1',
@@ -99,19 +99,19 @@ Configurations:
    Id: 'ubuntu-24.04-x64-developer-build-x11-tests'
    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
    Compiler: 'GCC'
-    Features: ['PinCores', 'Sccache', 'TestOnly', 'InsignificantTests']
+    Features: ['Sccache', 'TestOnly', 'InsignificantTests']
    Platform dependency: 'ubuntu-24.04-x64-developer-build'
 -
    Id: 'ubuntu-24.04-x64-x11-tests'
    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
    Compiler: 'GCC'
-    Features: ['PinCores', 'Sccache', 'TestOnly', 'InsignificantTests']
+    Features: ['Sccache', 'TestOnly', 'InsignificantTests']
    Platform dependency: 'ubuntu-24.04-x64'
 -
    Id: 'opensuse-15.6-developer-build'
    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
    Compiler: 'GCC'
-    Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure']
+    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
    Configure arguments: '-nomake examples -developer-build'
    Environment variables: [
        'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
@@ -120,7 +120,7 @@ Configurations:
    ]
 -
    Id: 'sles-15_sp5-static'
-    Template: 'qtci-linux-SLES-15_SP5-x86_64-50'
+    Template: 'qtci-linux-SLES-15_SP5-x86_64-51'
    Compiler: 'GCC'
    Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
@@ -142,7 +142,7 @@ Configurations:
    Id: 'windows-10_22h2-msvc2022'
    Template: 'qtci-windows-10_22H2-x86_64-53'
    Compiler: 'MSVC2022'
-    Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
@@ -154,7 +154,7 @@ Configurations:
    Id: 'windows-11_23H2-msvc2022'
    Template: 'qtci-windows-11_23H2-x86_64-54'
    Compiler: 'MSVC2022'
-    Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
@@ -166,7 +166,7 @@ Configurations:
    Id: 'windows-11_22h2-arm64-msvc2022'
    Template: 'qtci-windows-11_22H2-aarch64-55'
    Compiler: 'MSVC2022'
-    Features: ['PinCores', '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-opengl -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}}\..',
@@ -193,7 +193,7 @@ Configurations:
    Id: 'windows-11_23H2-msvc2022-developer-build'
    Template: 'qtci-windows-11_23H2-x86_64-54'
    Compiler: 'MSVC2022'
-    Features: ['PinCores', 'Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
+    Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
    Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
@@ -205,7 +205,7 @@ Configurations:
    Id: 'rhel-8.10'
    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
    Compiler: 'GCC'
-    Features: ['PinCores', 'Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
    Environment variables: [
        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
@@ -215,7 +215,7 @@ Configurations:
    Id: 'rhel-9.4'
    Template: 'qtci-linux-RHEL-9.4-x86_64-50'
    Compiler: 'GCC'
-    Features: ['PinCores', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
+    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',
@@ -238,7 +238,7 @@ Configurations:
    Id: 'windows-10_22h2-mingw13'
    Template: 'qtci-windows-10_22H2-x86_64-53'
    Compiler: 'Mingw'
-    Features: ['PinCores', 'Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
@@ -251,7 +251,7 @@ Configurations:
    Id: 'windows-11_23H2-llvm'
    Template: 'qtci-windows-11_23H2-x86_64-54'
    Compiler: 'Clang'
-    Features: ['PinCores', 'Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
    Environment variables: [
        'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
@@ -264,7 +264,7 @@ Configurations:
    Id: 'windows-11_23H2-mingw13-developer-build'
    Template: 'qtci-windows-11_23H2-x86_64-54'
    Compiler: 'Mingw'
-    Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
+    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
    Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
@@ -309,6 +309,6 @@ Configurations:
    Id: 'documentation-warnings'
    Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
    Compiler: 'GCC'
-    Features: ['PinCores', 'Sccache', 'TestOnly', 'TestDocs', 'DoNotRunTestsButCreateTestWorkItem', 'DocsGenerationV2']
+    Features: ['Sccache', 'TestOnly', 'TestDocs', 'DoNotRunTestsButCreateTestWorkItem', 'DocsGenerationV2']
    Platform dependency: 'ubuntu-22.04'

--- a/coin/platform_configs/cmake_platforms_qemu.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu.yaml
@@ -7,7 +7,7 @@ Configurations:
    Target arch: 'armv7'
    Compiler: 'GCC'
    Platform dependency: 'ubuntu-22.04'
-    Features: ['PinCores', 'Sccache', 'UseConfigure', 'InsignificantTests', 'StandaloneExamples']
+    Features: ['Sccache', 'UseConfigure', 'InsignificantTests', 'StandaloneExamples']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
@@ -24,7 +24,7 @@ Configurations:
    Target arch: 'arm64'
    Compiler: 'GCC'
    Platform dependency: 'ubuntu-22.04'
-    Features: ['PinCores', 'Sccache', 'UseConfigure', 'InsignificantTests']
+    Features: ['Sccache', 'UseConfigure', 'InsignificantTests']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
--- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
@@ -8,7 +8,7 @@ Configurations:
    Compiler: 'GCC'
    Target compiler: 'QCC'
    Platform dependency: 'ubuntu-22.04'
-    Features: ['PinCores', 'Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
--- a/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml
@@ -8,7 +8,7 @@ Configurations:
    Compiler: 'Clang'
    Target compiler: 'Clang'
    Platform dependency: 'vxworks-imx6-buildtest'
-    Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly']
    Environment variables: [
        'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_2_VSB',
        'VXWORKS_TEST_LIBS_PATH=/opt/fsl_imx6_2_0_6_2_VSB/usr/lib/common;/opt/fsl_imx6_2_0_6_2_VSB/usr/root/llvm/bin;/opt/fsl_imx6_2_0_6_2_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib',
@@ -23,7 +23,7 @@ Configurations:
    Compiler: 'Clang'
    Target compiler: 'Clang'
    Platform dependency: 'vxworks-x86_64-buildtest'
-    Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly']
    Environment variables: [
        'WIND_CC_SYSROOT=/opt/itl_generic_skylake_VSB',
        'VXWORKS_TEST_LIBS_PATH=/opt/itl_generic_skylake_VSB/usr/lib/common;/opt/itl_generic_skylake_VSB/usr/root/llvm/bin;/opt/itl_generic_skylake_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib',
--- a/coin/platform_configs/cmake_platforms_static_release.yaml
+++ b/coin/platform_configs/cmake_platforms_static_release.yaml
@@ -53,9 +53,8 @@ Configurations:
    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'MinimalStaticTests']
    Configure arguments: '-static -nomake examples -release -no-framework -no-icu -qt-doubleconversion -no-feature-sql-psql'
    Environment variables: [
-        'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
+        'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
        'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF',
-        'Protobuf_ROOT=/usr/local/lib/cmake/protobuf'
    ]

 -
--- a/coin/platform_configs/cmake_platforms_static_tests.yaml
+++ b/coin/platform_configs/cmake_platforms_static_tests.yaml
@@ -2,9 +2,9 @@ Version: 2
 Configurations:
 -
    Id: 'sles-15_sp5-minimal-static'
-    Template: 'qtci-linux-SLES-15_SP5-x86_64-50'
+    Template: 'qtci-linux-SLES-15_SP5-x86_64-51'
    Compiler: 'GCC'
-    Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure']
+    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
    Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
    Environment variables: [
        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
@@ -13,7 +13,7 @@ Configurations:
    Id: 'sles-15_sp6-minimal-static'
    Template: 'qtci-linux-SLES-15_SP6-x86_64-51'
    Compiler: 'GCC'
-    Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure', 'InsignificantTests']
+    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure', 'InsignificantTests']
    Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
    Environment variables: [
        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
@@ -22,7 +22,7 @@ Configurations:
    Id: 'windows-11_23H2-minimal-static'
    Template: 'qtci-windows-11_23H2-x86_64-54'
    Compiler: 'MSVC2022'
-    Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure']
+    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
    Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
@@ -34,5 +34,5 @@ Configurations:
    Id: 'macos-minimal-static'
    Template: 'qtci-macos-14-arm-106'
    Compiler: 'Clang'
-    Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure']
+    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
    Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework'
--- a/coin/platform_configs/cmake_platforms_target_android.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android.yaml
@@ -39,7 +39,7 @@ Configurations:
    Compiler: 'GCC'
    Target compiler: 'Clang'
    Platform dependency: 'rhel-8.10'
-    Features: ['PinCores', 'Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    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_DEFAULT}} -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_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
@@ -47,22 +47,6 @@ Configurations:
        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
        'ANDROID_EMULATOR=emulator_x86_api_28'
    ]
-
-    Id: 'android-14-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.10'
-    Features: ['PinCores', '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_DEFAULT}} -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_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_34'
-    ]
 -
    Id: 'android-15-x86_64-on-linux'
    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
@@ -71,7 +55,7 @@ Configurations:
    Compiler: 'GCC'
    Target compiler: 'Clang'
    Platform dependency: 'rhel-8.10'
-    Features: ['PinCores', 'Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
+    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_DEFAULT}} -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_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
--- a/coin/platform_configs/cmake_platforms_wasm.yaml
+++ b/coin/platform_configs/cmake_platforms_wasm.yaml
@@ -6,11 +6,12 @@ Configurations:
    Target os: 'WebAssembly'
    Compiler: 'GCC'
    Platform dependency: 'opensuse-15.6-developer-build'
-    Features: ['Sccache', 'DoNotRunTests', 'UseConfigure']
+    Features: ['DoNotRunTests', 'UseConfigure']
    Environment variables: [
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
        "TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \
-         -feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\""
+         -feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\"",
+        'HEADLESS_CHROME_FOR_TESTING=true'
    ]
 -
    Id: 'webassembly-windows'
@@ -19,7 +20,7 @@ Configurations:
    Compiler: 'Mingw'
    Target compiler: 'Clang'
    Platform dependency: 'windows-10_22h2-mingw13'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Packaging','DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
@@ -33,7 +34,7 @@ Configurations:
    Target os: 'WebAssembly'
    Compiler: 'GCC'
    Platform dependency: 'opensuse-15.6-developer-build'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread',
@@ -46,7 +47,7 @@ Configurations:
    Target os: 'WebAssembly'
    Compiler: 'GCC'
    Platform dependency: 'opensuse-15.6-developer-build'
-    Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Features: ['DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -no-feature-thread -nomake tests -nomake examples -shared',
--- a/coin/platform_configs/ios-tests.yaml
+++ b/coin/platform_configs/ios-tests.yaml
@@ -8,7 +8,7 @@ Configurations:
    Compiler: 'Clang'
    Target compiler: 'Clang'
    Platform dependency: 'macos-universal-on-x86_64'
-    Features: ['PinCores', 'Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
+    Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'
    ]
--- a/coin/platform_configs/linux_android_tests_multi_abi.yaml
+++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml
@@ -10,10 +10,9 @@ Configurations:
    Platform dependency: [
        'rhel-8.10',
        'android-9-x86-on-linux',
-        'android-14-x86_64-on-linux'
+        'android-15-x86_64-on-linux'
    ]
    Features: [
-        'PinCores',
        'Sccache',
        'WarningsAreErrors',
        'AndroidTestRun',
@@ -23,7 +22,7 @@ Configurations:
    Environment variables: [
        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.10',
        '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-14-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'
    ]
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -15,9 +15,8 @@ Configurations:
        Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
        Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
        Environment variables: [
-            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
+            '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',
-            'Protobuf_ROOT=/usr/local/lib/cmake/protobuf'
        ]

    -
@@ -29,7 +28,6 @@ Configurations:
        Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
        Environment variables: [
            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"',
-            'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
        ]

@@ -119,7 +117,6 @@ Configurations:
        Environment variables: [
            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
-            'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
        ]
    -
        Id: 'macos-14-arm64-developer-build'
@@ -129,7 +126,6 @@ Configurations:
        Configure arguments: '-developer-build -nomake examples -debug -framework'
        Environment variables: [
            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-            'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
        ]

--- a/coin/platform_configs/nightly_unity_builds.yaml
+++ b/coin/platform_configs/nightly_unity_builds.yaml
@@ -53,6 +53,5 @@ Configurations:
    Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -headersclean -framework'
    Environment variables: [
        'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"',
-        'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_UNITY_BUILD=ON',
    ]
--- a/coin/platform_configs/qt-creator.yaml
+++ b/coin/platform_configs/qt-creator.yaml
@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-11_23H2-x86_64-53'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease']
    Configure arguments: ''
@@ -15,7 +15,7 @@ Configurations:
    Configure arguments: ''
    Environment variables: []
 -
-    Template: 'qtci-linux-Debian-11.6-aarch64-50'
+    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'DebugAndRelease']
    Configure arguments: ''
@@ -28,7 +28,7 @@ Configurations:
    Environment variables: []
 # without tests
 -
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-11_23H2-x86_64-53'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease', 'DisableTests']
    Configure arguments: ''
@@ -36,7 +36,7 @@ Configurations:
    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 # oldest Qt version
 -
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-11_23H2-x86_64-53'
    Compiler: 'MSVC2022'
    Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
    Configure arguments: ''
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -17,4 +17,4 @@ Overrides:
 # Make VxWorks tests insignificant.
 -
    Id: 'vxworks-x86_64-tests'
-    Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
--- a/coin/platform_configs/qtcharts.yaml
+++ b/coin/platform_configs/qtcharts.yaml
@@ -10,7 +10,7 @@ Overrides:
 # Make VxWorks tests insignificant.
 -
    Id: 'vxworks-imx6-tests'
-    Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
 -
    Id: 'vxworks-x86_64-tests'
-    Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
--- a/coin/platform_configs/qtdeclarative.yaml
+++ b/coin/platform_configs/qtdeclarative.yaml
@@ -14,7 +14,7 @@ Overrides:
 # Make VxWorks tests insignificant.
 -
    Id: 'vxworks-imx6-tests'
-    Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
 -
    Id: 'vxworks-x86_64-tests'
-    Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
--- a/coin/platform_configs/qtimageformats.yaml
+++ b/coin/platform_configs/qtimageformats.yaml
@@ -11,4 +11,4 @@ Overrides:
 # Make VxWorks x86_64 tests insignificant.
 -
    Id: 'vxworks-x86_64-tests'
-    Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
--- a/coin/platform_configs/qtquick3d.yaml
+++ b/coin/platform_configs/qtquick3d.yaml
@@ -11,4 +11,4 @@ Overrides:
 # Make VxWorks x86_64 tests insignificant.
 -
    Id: 'vxworks-x86_64-tests'
-    Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
--- a/coin/platform_configs/qtvirtualkeyboard.yaml
+++ b/coin/platform_configs/qtvirtualkeyboard.yaml
@@ -10,7 +10,7 @@ Overrides:
 # Make VxWorks tests insignificant.
 -
    Id: 'vxworks-imx6-tests'
-    Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
 -
    Id: 'vxworks-x86_64-tests'
-    Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
+    Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -13,7 +13,7 @@ Include: [
        'android-arm64-on-macos',
        'android-armv7-on-windows',
        'android-9-x86-on-linux',
-        'android-14-x86_64-on-linux'
+        'android-15-x86_64-on-linux'
    ],
    offline_documentation.yaml
 ]
--- a/coin/platform_configs/wasm_qtbase_tests.yaml
+++ b/coin/platform_configs/wasm_qtbase_tests.yaml
@@ -5,5 +5,5 @@ Configurations:
    Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
    Target os: 'WebAssembly'
    Compiler: 'GCC'
-    Features: ['PinCores', 'Sccache', 'TestOnly']
+    Features: ['Sccache', 'TestOnly']
    Platform dependency: 'webassembly-linux-thread-asyncify'
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -33,11 +33,6 @@ toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
 ndkSha1Latest="fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4"
 ndkSha1Default=$ndkSha1Latest

-# Android 14 avd zip
-android14SystemZipName="android14system_UE1A_230829_036.tar.gz"
-android14SystemZipSha="ede80c6901e8fad1895c97a86542b8e072bb1ee5"
-android14SystemPath="$basePath/$android14SystemZipName"
-
 # Android Automotive max SDK level image
 sdkApiLevelAutomotiveMax="android-34"
 androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
@@ -162,13 +157,20 @@ echo "Unzipping the Android 9 to $minVersionDestination"
 sudo unzip -o -q "$minVersionFilePath" -d "$minVersionDestination"
 rm "$minVersionFilePath"

-echo "y" | ./sdkmanager --install "system-images;android-35;google_apis;x86_64" \
-    | eval "$sdkmanager_no_progress_bar_cmd"
+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="d79169884cabc6680cb29d32c2112ad46c858c1b"

-echo "Extract stored Android 14 Beta $android14SystemZipName"
-DownloadURL "$android14SystemPath" "$android14SystemPath" "$android14SystemZipSha" \
-    "/tmp/$android14SystemZipName"
-sudo tar -xzf "/tmp/$android14SystemZipName" -C "$sdkTargetFolder/system-images"
+mkdir -p "$maxVersionDestination"
+DownloadURL "$maxVersionCiUrl" "$maxVersionUrl" "$maxVersionSha1" "$maxVersionFilePath"
+
+echo "Unzipping the Android 15 to $maxVersionDestination"
+sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination"
+rm "$maxVersionFilePath"

 echo "Checking the contents of Android SDK again..."
 ls -l "$sdkTargetFolder"
@@ -176,9 +178,6 @@ 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_34 -c 2048M -f \
-    -k "system-images;android-34;google_apis;x86_64"
-
 echo "no" | ./avdmanager create avd -n emulator_x86_64_api_35 -c 2048M -f \
    -k "system-images;android-35;google_apis;x86_64"

--- a/coin/provisioning/common/macos/libiodbc.sh
+++ b/coin/provisioning/common/macos/libiodbc.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2018 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 libiodbc
@@ -11,12 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

 brew install --formula "${BASH_SOURCE%/*}/libiodbc.rb" "$@"

-# CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc
-
 read -r -a arr <<< "$(brew list --versions libiodbc)"
 version=${arr[1]}

-SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include${CPLUS_INCLUDE_PATH:+:}${CPLUS_INCLUDE_PATH}"
-SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib${LIBRARY_PATH:+:}${LIBRARY_PATH}"
+SetEnvVar "ODBC_ROOT" "$(brew --prefix libiodbc)"

 echo "libiodbc = $version" >> ~/versions.txt
--- a/coin/provisioning/common/macos/postgresql.sh
+++ b/coin/provisioning/common/macos/postgresql.sh
@@ -37,5 +37,5 @@ umount "$mountpoint"
 echo "Removing $packageName"
 rm "/tmp/$packageName"

-SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/$psqlVersion/bin"
+SetEnvVar "PostgreSQL_ROOT" "/Applications/Postgres.app/Contents/Versions/$psqlVersion"
 echo "PostgreSQL = $psqlVersion ($psqlAppVersion)" >> ~/versions.txt
--- a/coin/provisioning/common/unix/emsdk.sh
+++ b/coin/provisioning/common/unix/emsdk.sh
@@ -8,15 +8,15 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"

-version="3.1.56"
+version="3.1.70"
 versionNode="v16.20.0"
 tarBallVersion="${version//./_}"
 if uname -a | grep -q Darwin; then
    tarBallPackage="emsdk_macos_${tarBallVersion}.tar.gz"
-    sha="24c49db971da4fd7c68f6b71984c3d7775fdfb84"
+    sha="eafd7b96ab12d84183d2eaa62e8d39bb12c252bf"
 else
    tarBallPackage="emsdk_linux_${tarBallVersion}.tar.gz"
-    sha="410c93bb2ab3b244190c2cb5f0ff1ce5d6ac4eb5"
+    sha="047a3da9048edc71fb56af544c4bb2448d6c0644"
 fi
 cacheUrl="https://ci-files01-hki.ci.qt.io/input/emsdk/${tarBallPackage}"
 target="/tmp/${tarBallPackage}"
--- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh
+++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh
@@ -28,48 +28,49 @@ fi
 ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")

 build_ffmpeg_ios() {
-  local target_arch=$1
+    local target_platform=$1
+    if [ "$target_platform" == "arm64-simulator" ]; then
+        target_sdk="iphonesimulator"
+        target_platform="arm64"
+        minos="-mios-simulator-version-min=16.0"
+    else
+        target_sdk="iphoneos"
+        target_platform="arm64"
+        minos="-miphoneos-version-min=16.0"
+    # TODO: consider non-arm simulator?
+    fi

-  if [ "$target_arch" == "x86_64" ]; then
-     target_sdk="iphonesimulator"
-     target_arch="x86_64"
-     minos="-mios-simulator-version-min=13.0"
-  else
-     target_sdk="iphoneos"
-     target_arch="arm64"
-     minos="-miphoneos-version-min=13.0"
-  fi
+    # Note: unlike similar install-ffmpeg scripts, not $target_platform,
+    # but $1 (which can be arm64-simulator with arm64 target_platform).
+    local build_dir="$ffmpeg_source_dir/build_ios/$1"
+    sudo mkdir -p "$build_dir"
+    pushd "$build_dir"

-  local build_dir="$ffmpeg_source_dir/build_ios/$target_arch"
-  sudo mkdir -p "$build_dir"
-  pushd "$build_dir"
-
-  # shellcheck disable=SC2086
-  sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \
+    # shellcheck disable=SC2086
+    sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \
    --sysroot="$(xcrun --sdk "$target_sdk" --show-sdk-path)" \
-  --enable-cross-compile \
-  --enable-optimizations \
-  --prefix=$prefix \
-  --arch=$target_arch \
-  --cc="xcrun --sdk ${target_sdk} clang -arch $target_arch" \
-  --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_arch" \
-  --ar="$(xcrun --sdk ${target_sdk} --find ar)" \
-  --ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \
-  --strip="$(xcrun --sdk ${target_sdk} --find strip)" \
-  --nm="$(xcrun --sdk ${target_sdk} --find nm)" \
-  --target-os=darwin \
-  --extra-cflags="$minos" \
-  --extra-cxxflags="$minos" \
-  --enable-cross-compile \
-  --enable-shared \
-  --disable-static \
-  --install-name-dir='@rpath/Frameworks' \
-  --enable-swscale \
-  --enable-pthreads \
-  --disable-audiotoolbox
+    --enable-cross-compile \
+    --enable-optimizations \
+    --prefix=$prefix \
+    --arch=$target_platform \
+    --cc="xcrun --sdk ${target_sdk} clang -arch $target_platform" \
+    --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_platform" \
+    --ar="$(xcrun --sdk ${target_sdk} --find ar)" \
+    --ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \
+    --strip="$(xcrun --sdk ${target_sdk} --find strip)" \
+    --nm="$(xcrun --sdk ${target_sdk} --find nm)" \
+    --target-os=darwin \
+    --extra-ldflags="$minos" \
+    --enable-cross-compile \
+    --enable-shared \
+    --disable-static \
+    --install-name-dir='@rpath' \
+    --enable-swscale \
+    --enable-pthreads \
+    --disable-audiotoolbox

-  sudo make install DESTDIR="$build_dir/installed" -j4
-  popd
+    sudo make install DESTDIR="$build_dir/installed" -j4
+    popd
 }

 install_ffmpeg() {
@@ -98,11 +99,106 @@ install_ffmpeg() {
        popd >/dev/null
    done
    sudo cp -r $1$prefix/include $prefix
-    echo "LS done."
 }

-build_ffmpeg_ios "x86_64"
+build_info_plist() {
+    local file_path="$1"
+    local framework_name="$2"
+    local framework_id="$3"
+
+    local minimum_version_key="MinimumOSVersion"
+    local minimum_os_version="16.0"
+    local supported_platforms="iPhoneOS"
+
+    info_plist="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
+<plist version=\"1.0\">
+<dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>en</string>
+    <key>CFBundleExecutable</key>
+    <string>${framework_name}</string>
+    <key>CFBundleIdentifier</key>
+    <string>${framework_id}</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>${framework_name}</string>
+    <key>CFBundlePackageType</key>
+    <string>FMWK</string>
+    <key>CFBundleShortVersionString</key>
+    <string>7.0.2</string>
+    <key>CFBundleVersion</key>
+    <string>7.0.2</string>
+    <key>CFBundleSignature</key>
+    <string>????</string>
+    <key>${minimum_version_key}</key>
+    <string>${minimum_os_version}</string>
+    <key>CFBundleSupportedPlatforms</key>
+    <array>
+        <string>${supported_platforms}</string>
+    </array>
+    <key>NSPrincipalClass</key>
+    <string></string>
+</dict>
+</plist>"
+    echo $info_plist | sudo tee ${file_path} 1>/dev/null
+}
+
+create_framework() {
+    # Create a 'traditional' framework from the corresponding dylib.
+    local framework_name="$1"
+    local platform="$2" # For now it's either arm64 or arm64-simulator, see below.
+    local ffmpeg_library_path="$ffmpeg_source_dir/build_ios/${platform}/installed/usr/local/ios/ffmpeg"
+    local framework_complete_path="${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
+
+    sudo mkdir -p "${ffmpeg_library_path}/framework/${framework_name}.framework"
+    sudo cp "${ffmpeg_library_path}/lib/${framework_name}.dylib" "${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
+
+    # Fix LC_ID_DYLIB (to be libavcodec.framework/libavcodec instead of @rpath/libavcodec.xx.yy.dylib
+    sudo install_name_tool -id @rpath/${framework_name}.framework/${framework_name} "${framework_complete_path}"
+
+    build_info_plist "${ffmpeg_library_path}/framework/${framework_name}.framework/Info.plist" "${framework_name}" "io.qt.ffmpegkit."${framework_name}
+
+    # Fix all FFmpeg-related LC_LOAD_DYLIB, similar to how we fixed LC_ID_DYLIB above:
+    otool -L "$framework_complete_path" | awk '/\t/ {print $1}' | egrep "$dylib_regex" | while read -r dependency_path; do
+        found_name=$(tmp=${dependency_path/*\/}; echo ${tmp/\.*})
+        if [ "$found_name" != "$framework_name" ]
+        then
+            sudo install_name_tool -change "$dependency_path" @rpath/${found_name}.framework/${found_name} "${framework_complete_path}"
+        fi
+    done
+    #sudo mkdir -p "$prefix/framework/"
+    #sudo cp -r "${ffmpeg_library_path}/framework/${framework_name}.framework" "$prefix/framework/"
+}
+
+create_xcframework() {
+    # Create 'traditional' framework from the corresponding dylib,
+    # also creating
+    local framework_name="$1"
+
+    local fw1="$ffmpeg_source_dir/build_ios/arm64/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework"
+    local fw2="$ffmpeg_source_dir/build_ios/arm64-simulator/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework"
+
+    sudo mkdir -p "$prefix/framework/"
+    sudo xcodebuild -create-xcframework -framework $fw1 -framework $fw2 -output "${prefix}/framework/${framework_name}.xcframework"
+}
+
+build_ffmpeg_ios "arm64-simulator"
 build_ffmpeg_ios "arm64"

-install_ffmpeg "$ffmpeg_source_dir/build_ios/x86_64/installed" "$ffmpeg_source_dir/build_ios/arm64/installed"
+ffmpeg_libs="libavcodec libavdevice libavfilter libavformat libavutil libswresample libswscale"
+
+for name in $ffmpeg_libs; do
+    create_framework $name "arm64"
+    create_framework $name "arm64-simulator"
+done
+
+# Create corresponding (xc)frameworks containing both arm64 and arm64-simulator frameworks:
+for name in $ffmpeg_libs; do
+    create_xcframework $name
+done
+
+install_ffmpeg "$ffmpeg_source_dir/build_ios/arm64/installed"
+
 SetEnvVar "FFMPEG_DIR_IOS" $prefix
--- a/coin/provisioning/common/unix/install_protobuf.sh
+++ b/coin/provisioning/common/unix/install_protobuf.sh
@@ -92,6 +92,8 @@ cmake "$targetDir" -G"Ninja Multi-Config" \
 ninja all:all
 sudo env "PATH=$PATH" ninja install:all

+SetEnvVar "Protobuf_ROOT" "$installPrefix/lib/cmake/protobuf"
+
 # Refresh shared library cache if OS isn't macOS
 if uname -a |grep -qv "Darwin"; then
    sudo ldconfig
--- a/coin/provisioning/common/windows/emsdk.ps1
+++ b/coin/provisioning/common/windows/emsdk.ps1
@@ -5,11 +5,11 @@

 # This script will install emscripten needed by WebAssembly

-$version = "3.1.56"
+$version = "3.1.70"
 $zipVersion = $version -replace '\.', "_"
 $temp = "$env:tmp"
 $cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_${zipVersion}.zip"
-$sha = "ab376d218f1a66302c36770977948f74f0576a42"
+$sha = "4d05e378575cb3d74e2740b121730ba1f5822f27"

 # Python used for '.\emsdk install'
 $pythonPath = [System.Environment]::GetEnvironmentVariable("PYTHON3_PATH", "Machine")
--- a/coin/provisioning/common/windows/install-sevenzip.ps1
+++ b/coin/provisioning/common/windows/install-sevenzip.ps1
@@ -5,24 +5,24 @@

 # This script installs 7-Zip

-$version = "23.01"
-$nonDottedVersion = "2301"
+$version = "24.09"
+$nonDottedVersion = "2409"

 $cpu_arch = Get-CpuArchitecture
 switch ($cpu_arch) {
    arm64 {
        $arch = "-arm64"
-        $sha1 = "be65c2ea6119c04945c66b13413892f2bb03d9a7"
+        $sha1 = "2f5aaa22a4a591b01a1b06c17565233f0cd70429"
        Break
    }
    x64 {
        $arch = "-x64"
-        $sha1 = "7DF28D340D7084647921CC25A8C2068BB192BDBB"
+        $sha1 = "28b53835fe92c3fa6e0c422fc3b17c6bc1cb27e0"
        Break
    }
    x86 {
        $arch = ""
-        $sha1 = "D5D00E6EA8B8E68CE7A704FD478DC950E543C25C"
+        $sha1 = "2135a90a9f6c3202c32a87b1c5cf805ce294a497"
        Break
    }
    default {
--- a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh
@@ -153,6 +153,8 @@ installPackages+=(zip)
 installPackages+=(perl-IPC-Cmd)
 # password management support for Qt Creator
 installPackages+=(libsecret-devel)
+# For tst_license.pl with all the machines generating SBOM
+installPackages+=(perl-JSON)

 sudo yum -y install "${installPackages[@]}"

--- 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+=(perl-IPC-Cmd)
 installPackages+=(libsecret-devel)
 # For Firebird in RTA
 installPackages+=(libtommath-devel)
+# For tst_license.pl with all the machines generating SBOM
+installPackages+=(perl-JSON)

 sudo yum -y install "${installPackages[@]}"

--- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh
@@ -110,6 +110,9 @@ sudo zypper -nq install cifs-utils
 # For Firebird in RTA
 sudo zypper -nq install libtommath-devel

+# For tst_license.pl with all the machines generating SBOM
+sudo zypper -nq install perl-JSON
+
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt

--- a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh
@@ -113,6 +113,9 @@ sudo zypper -nq install cifs-utils
 # For Firebird in RTA
 sudo zypper -nq install libtommath-devel

+# For tst_license.pl with all the machines generating SBOM
+sudo zypper -nq install perl-JSON
+
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt

--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh
@@ -242,6 +242,8 @@ installPackages+=(patchelf)

 # For Firebird in RTA
 installPackages+=(libtommath-dev)
+# For tst_license.pl with all the machines generating SBOM
+installPackages+=(libjson-perl)

 echo "Running update for apt"
 waitLoop
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-axivion-bauhaus-suite.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-axivion-bauhaus-suite.sh
@@ -22,18 +22,18 @@ DownloadAndExtract () {


 # Axivion Bauhaus Suite
-sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_8_4-x86_64-gnu_linux.tar.gz"
-targetFile="bauhaus-suite-7_8_4-x86_64-gnu_linux.tar.gz"
-sha1="519f84237a4f55700dfb34767ba5bb342f142012"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_9_1-x86_64-gnu_linux.tar.gz"
+targetFile="bauhaus-suite-7_9_1-x86_64-gnu_linux.tar.gz"
+sha1="43d18d55087ce02009b850553405af55ba4e37e2"
 cd "$HOME"
 DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$HOME"

 mkdir "$HOME/.bauhaus"
 cd "$HOME/.bauhaus"
-wget http://ci-files01-hki.ci.qt.io/input/axivion/Qt_Evaluation_QSR_INTERN_20250118.key
+wget http://ci-files01-hki.ci.qt.io/input/axivion/QT_11427439_2025-10-07.key
 cd "$HOME"

 #Axivion configuration
 cp -r "${BASH_SOURCE%/*}/../common/linux/axivion/"  "$HOME/"

-echo "Axivion Bauhaus Suite = 7.8.4" >> ~/versions.txt
+echo "Axivion Bauhaus Suite = 7.9.1" >> ~/versions.txt
--- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh
@@ -87,6 +87,9 @@ sudo zypper -nq install libtommath-devel
 # Java
 sudo zypper -nq install java-17-openjdk

+# For tst_license.pl with all the machines generating SBOM
+sudo zypper -nq install perl-JSON
+
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt

--- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/80-install-chrome.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/80-install-chrome.sh
@@ -10,14 +10,14 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 # shellcheck source=../common/unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"

-chromeVersion="chrome-for-testing-115"
-sha="7242ece1055bdbf503527f8e87c4b5da37c3c60e"
-chromeUrl="https://ci-files01-hki.ci.qt.io/input/wasm/chrome/${chromeVersion}.tar.gz"
-target="/tmp/chrome-for-testing-115.tar.gz"
+chromeVersion="chrome-for-testing-131"
+sha="006d8e0438980d5ca8809af6f036e2b802b13cc8"
+cachedChromeUrl="https://ci-files01-hki.ci.qt.io/input/wasm/chrome/${chromeVersion}.zip"
+officialChromeUrl="https://storage.googleapis.com/chrome-for-testing-public/131.0.6778.204/linux64/chrome-linux64.zip"
+target="/tmp/${chromeVersion}.zip"

-DownloadURL "$chromeUrl" "" "$sha" "$target"
-sudo tar -xzf "$target" -C "${HOME}"
+DownloadURL "$cachedChromeUrl" "$officialChromeUrl" "$sha" "$target"
+sudo unzip -q "$target" -d "${HOME}"
 sudo rm -f "$target"
-
-SetEnvVar "BROWSER_FOR_WASM" "${HOME}/${chromeVersion}/chrome"
-SetEnvVar "CHROMEDRIVER_PATH" "${HOME}/${chromeVersion}/chromedriver"
+chromePath="${HOME}/chrome-linux64/chrome"
+SetEnvVar "BROWSER_FOR_WASM" "${chromePath}"
--- a/coin/provisioning/qtci-macos-10.15-x86_64/25-postgresql.sh
+++ b/coin/provisioning/qtci-macos-10.15-x86_64/25-postgresql.sh
@@ -22,5 +22,5 @@ appPrefix=""

 InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"

-SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/9.6/bin"
+SetEnvVar "PostgreSQL_ROOT" "/Applications/Postgres.app/Contents/Versions/9.6"
 echo "PostgreSQL = $psqlVersion" >> ~/versions.txt
--- 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	6e5ad2a7e8	Update submodules on '6.9 in qt/qt5' Change-Id: Iab5b7d7e49e13195b8e726778f2e35346164ff58 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-02-21 20:17:48 +00:00
Paul Wicking	be88fababd	Add .gitreview file `git-review` is a command line tool for interacting with Gerrit. Some IDEs offer support for this tool, either natively or through plugins. The tool relies on a configuration file, .gitreview. Adding this configuration file to our repositories simplifies initial setup for contributors that use the tool directly or through their IDE of choice. The configuration file adds a remote called 'gerrit'. This is the default for the tool, and also the name set for codereview.qt-project.org by Qt's `init-repository` script. Thus, the configuration should work seamlessly alongside other repository helpers. Task-number: QTBUG-132604 Pick-to: 6.8 Change-Id: Iea428aeaa1b4cdbaabd3477aaf061b8960efc887 Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> (cherry picked from commit `9b8cb71d6b`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-02-20 09:06:07 +00:00
Eike Ziller	626a22cc74	COIN/QtCreator: Move to Ubuntu 24.04 for ARM Debian is no longer supported for Qt 6.8.1 and later Pick-to: 6.8 Change-Id: Ic9ddac3d95451b900f60be6a90efd5fb32985601 Reviewed-by: Patrik Teivonen <patrik.teivonen@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io> (cherry picked from commit `014bdc24ab`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-02-17 14:59:09 +00:00
Eike Ziller	db2d504099	COIN/QtCreator: Update to Windows 11 23H2 That is what we are using for packages too. Pick-to: 6.8 Change-Id: I88ab02f577933292c882ec4633d9087b1bf957ea Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io> (cherry picked from commit `53280b0697`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-02-14 15:11:16 +00:00
Toni Saario	c03c22faae	Remove PinCores features Effect of this experiment was inconclusive. In some isolated cases limited benefit was seen, but in overall metrics no change was observed. Remove the feature to gain the lost computing capacity back. If the removal causes noticeably higher flakiness etc, it can be reevaluated. Task-number: QTQAINFRA-6702 Change-Id: I001fc2d3740a287d4546d0f597e81ded9f5449cb (cherry picked from commit `8d51e875cb`) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>	2025-02-11 16:41:39 +02:00
Jøger Hansegård	3b9008ca75	Update Windows provisioning to use 7z version 24.09 Task-number: QTQAINFRA-6833 Pick-to: 6.8 6.5 5.15 Change-Id: Iebb1a6fe879e3b550479cf109df79199536742e6 Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io> Reviewed-by: Dimitrios Apostolou <jimis@qt.io> (cherry picked from commit `a1c47252fb`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-02-08 02:28:06 +00:00
Timur Pocheptsov	27be5c2f98	Update provisioning script to build FFmpeg for iOS as xcframeworks so that we can provide both arm64 and arm64-simulator versions (the former can be used in App Store, the latter when working with a simulator). Pick-to: 6.8 Task-number: QTBUG-132313 Change-Id: Ic683f58dffcef8a06adb4a915c4e3abc4ab219e5 Reviewed-by: Artem Dyomin <artem.dyomin@qt.io> (cherry picked from commit `1968adc126`) Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>	2025-02-05 17:38:56 +01:00
Tor Arne Vestbø	77a614d592	macOS: Set PostgreSQL_ROOT during provisioning rather than in each config Decouples provisioning from build configurations. Pick-to: 6.8 Change-Id: I53b0983ab8b20c40568c1b5b9a24bfe3c62cf531 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit `7f51bdbd8d`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-02-02 23:32:39 +00:00
Tor Arne Vestbø	55ef82de88	macOS: Set Protobuf_ROOT during provisioning rather than in each config Decouples provisioning from build configurations. Pick-to: 6.8 Change-Id: Ied2b60b360ef5ec5aab1dd4b2e6a0b81032d2938 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> (cherry picked from commit `ac2b15075c`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-02-02 23:32:37 +00:00
Tor Arne Vestbø	1bb142175a	Use correct path for libiodbc and forward via ODBC_ROOT env var The hard-coded path paths added to LIBRARY_PATH and CPLUS_INCLUDE_PATH was not correct on Apple Silicon Macs, where homebrew installs into /opt/homebrew/. There's also no point in passing on the library location via compiler environment variables, when we can use ODBC_ROOT. And we don't need to pass it on as a CMake define, as a environment variable works just fine. This decouples the provisioning of libiodbc from the build configurations. Pick-to: 6.8 Change-Id: I40aa3c1852fb0baf3366fa1a9dab85a66eef95e2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `124957a8cb`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-02-02 23:32:28 +00:00
Piotr Wiercinski	27b0c6daff	wasm tests: Update Chrome to 131 and use headless mode Newer version of Chrome together with healdess mode should provide more stability. Change-Id: Ifb6b326b90067d9e069ebef662356d28e2c9edd7 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> (cherry picked from commit `ae85de3cf8`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-01-28 22:40:59 +00:00
Qt Submodule Update Bot	ffb6de83c9	Update submodules on '6.9 in qt/qt5' Change-Id: I5c2a745c3db8d7de6efa3466c82744eb7138302a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2025-01-28 03:03:18 +00:00
Piotr Wierciński	e732ea40d7	wasm: Update Emscripten to 3.1.70 Change-Id: I2a1250d2744d12f5d3f8122f7931c821c607f71b Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io> (cherry picked from commit `c052b991b0`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-01-23 17:52:19 +00:00
Tero Heikkinen	4eac58fb7c	Add Perl JSON module Needed with all the machines generating SBOM Task-number: QTQAINFRA-6871 Task-number: QTBUG-131434 Change-Id: I15a79c005f530c551f9026e2cbfb465ed1211e98 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `6c6faeefd2`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-01-22 08:14:13 +00:00
Tero Heikkinen	1b6c7cfa17	SLES 15 SP5: Update timezone package Updates: - Timezone package from 2023c to 2024a - qtci-linux-SLES-15_SP5-x86_64-50 --> 51 Task-number: QTQAINFRA-6901 Pick-to: 6.8 Change-Id: I8ae65d0f8729e9dcf9147f45b09279fb805027ef Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> (cherry picked from commit `8d0f126d85`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-01-22 08:14:11 +00:00
Matti Paaso	3579a0c95c	Provisioning: Update Axivion bauhaus suite and license file Task-number: QTQAINFRA-6880 Pick-to: 6.8 6.5 Change-Id: I92a70dcb14bbba0ded889894059f2de849b1f557 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `45491c61fc`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-01-20 07:12:44 +00:00
Rami Potinkara	f537715537	Android: Android 15 as maximum supported version This patch - Replaces Android 14 with Android 15 as a maximum version - Introduces Android 15 system image to CI cache - Sets Android 15 as significant Task-number: QTQAINFRA-6478 Fixes: QTQAINFRA-6652 Pick-to: 6.8 6.5 Change-Id: Icb6de43f3e2c2f7f98f3172c83d66bebf9603d24 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit `2c85a91e07`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2025-01-18 15:31:45 +00:00