Update submodules on '6.10.1 in qt/qt5'

Change-Id: I3e166e17bf2103c7758afdbfa5c82aa0a97e2007 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Revert "COIN: Remove 'Packaging' feature from rhel 8.10"
2026-01-09 00:16:55 +08:00 · 2025-11-16 13:43:30 +00:00 · 2025-11-14 10:17:06 +00:00 · 2025-11-14 02:46:29 +00:00 · 2025-11-13 07:42:40 +00:00 · 2025-11-07 07:21:38 +00:00
161 changed files with 763 additions and 745 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,40 +1,40 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.10
+	branch = 6.10.1
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.10
+	branch = 6.10.1
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
 	recommends = qtdeclarative qtquick3d
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.10
+	branch = 6.10.1
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.10
+	branch = 6.10.1
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtshadertools qtwebengine
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.10
+	branch = 6.10.1
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,7 +68,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = 6.10
+	branch = 6.10.1
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.10
+	branch = 6.10.1
 	status = preview
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools qtmultimedia
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.10
+	branch = 6.10.1
 	status = deprecated
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.10
+	branch = 6.10.1
 	status = deprecated
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.10
+	branch = 6.10.1
 	status = deprecated
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase qtmultimedia
 	recommends = qtdeclarative
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,88 +252,88 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.10
+	branch = 6.10.1
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	recommends = qtwebsockets
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.10
+	branch = 6.10.1
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtgrpc"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgrpc
 	url = ../qtgrpc.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtquickeffectmaker"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquick3d
 	path = qtquickeffectmaker
 	url = ../qtquickeffectmaker.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
 [submodule "qtgraphs"]
 	depends = qtbase qtdeclarative qtquick3d
 	path = qtgraphs
 	url = ../qtgraphs.git
-	branch = 6.10
+	branch = 6.10.1
 	status = addon
--- a/3
+++ b/3
@@ -104,6 +104,9 @@ AlignEscapedNewlines: Left
 # initializer list in list-initialization.
 SpaceBeforeCpp11BracedList: false

+# Do not reflow any comment
+ReflowComments: false
+
 ---
 # Use the Google-based style for .proto files.
 Language: Proto
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -183,7 +183,7 @@ Configurations:
    Id: 'windows-11_23h2-arm64-msvc2022'
    Template: 'qtci-windows-11_23H2-aarch64-53'
    Compiler: 'MSVC2022'
-    Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
    Environment variables: [
        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
@@ -196,35 +196,17 @@ Configurations:
    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'MSVC2022'
    Target arch: 'arm64'
-    Features: ['Sccache', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Platform dependency: 'windows-10_22h2-mingw13'
+    Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
+    Platform dependency: 'windows-11_24h2-mingw13'
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer -no-feature-run-opengl-tests',
+        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}} -DQT_FORCE_BUILD_TOOLS=ON',
        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
        'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
        'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-        'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
-    ]
-
-    Id: 'windows-11_24H2-msvc2022-arm64-23H2'
-    Template: 'qtci-windows-11_24H2-x86_64-71'
-    Compiler: 'MSVC2022'
-    Target arch: 'arm64'
-    Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    Platform dependency: 'windows-10_22h2-mingw13'
-    Environment variables: [
-        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
-        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
-        'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
-        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
        'VCPKG_HOST_TRIPLET=x64-windows-qt',
        'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
@@ -232,18 +214,11 @@ Configurations:
    ]
 -
    Id: 'windows-11-x86_64-arm64-tests'
-    Template: 'qtci-windows-11_22H2-aarch64-55'
-    Compiler: 'MSVC2022'
-    Features: ['TestOnly']
-    Configure arguments: '-no-opengl -cross-compiled'
-    Platform dependency: 'windows-11_24H2-msvc2022-arm64'
-
-    Id: 'windows-11-x86_64-arm64-tests-23H2'
    Template: 'qtci-windows-11_23H2-aarch64-53'
    Compiler: 'MSVC2022'
-    Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
+    Features: ['TestOnly']
    Configure arguments: '-cross-compiled'
-    Platform dependency: 'windows-11_24H2-msvc2022-arm64-23H2'
+    Platform dependency: 'windows-11_24H2-msvc2022-arm64'
 -
    Id: 'windows-11_24H2-msvc2022-developer-build'
    Template: 'qtci-windows-11_24H2-x86_64-71'
@@ -302,8 +277,8 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-developer-build -no-warnings-are-errors -nomake examples -nomake tests -platform macx-visionos-clang',
    ]
 -
-    Id: 'windows-10_22h2-mingw13'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Id: 'windows-11_24h2-mingw13'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Compiler: 'Mingw'
    Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
--- a/coin/platform_configs/cmake_platforms_target_android.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android.yaml
@@ -17,12 +17,12 @@ Configurations:
    ]
 -
    Id: 'android-armv7-on-windows'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Target os: 'Android_ANY'
    Target arch: 'armv7'
    Compiler: 'Mingw'
    Target compiler: 'Clang'
-    Platform dependency: 'windows-10_22h2-mingw13'
+    Platform dependency: 'windows-11_24h2-mingw13'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
@@ -48,7 +48,7 @@ Configurations:
        'ANDROID_EMULATOR=emulator_x86_api_28'
    ]
 -
-    Id: 'android-15-x86_64-on-linux'
+    Id: 'android-16-x86_64-on-linux'
    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
    Target os: 'Android_ANY'
    Target arch: 'x86_64'
@@ -56,22 +56,6 @@ Configurations:
    Target compiler: 'Clang'
    Platform dependency: 'rhel-8.10'
    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',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_35'
-    ]
-
-    Id: 'android-16-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: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
    Environment variables: [
        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
--- a/coin/platform_configs/cmake_platforms_wasm.yaml
+++ b/coin/platform_configs/cmake_platforms_wasm.yaml
@@ -15,11 +15,11 @@ Configurations:
    ]
 -
    Id: 'webassembly-windows'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Target os: 'WebAssembly'
    Compiler: 'Mingw'
    Target compiler: 'Clang'
-    Platform dependency: 'windows-10_22h2-mingw13'
+    Platform dependency: 'windows-11_24h2-mingw13'
    Features: ['Packaging','DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
    Environment variables: [
        'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
--- a/coin/platform_configs/linux_android_tests_multi_abi.yaml
+++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml
@@ -10,7 +10,7 @@ Configurations:
    Platform dependency: [
        'rhel-8.10',
        'android-9-x86-on-linux',
-        'android-15-x86_64-on-linux'
+        'android-16-x86_64-on-linux'
    ]
    Features: [
        'Sccache',
@@ -22,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-15-x86_64-on-linux',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-16-x86_64-on-linux',
        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
        'ANDROID_EMULATOR=emulator_x86_api_28'
    ]
--- a/coin/platform_configs/nightly_android_ndk1.yaml
+++ b/coin/platform_configs/nightly_android_ndk1.yaml
@@ -2,7 +2,7 @@ Version: 2
 Include: [
    cmake_platforms.yaml: [
        'rhel-8.10',
-        'windows-10_22h2-mingw13'
+        'windows-11_24h2-mingw13'
    ],
    cmake_platforms_target_android.yaml: [
        'android-15-x86_64-on-linux',
--- a/coin/platform_configs/nightly_android_ndk2.yaml
+++ b/coin/platform_configs/nightly_android_ndk2.yaml
@@ -2,7 +2,7 @@ Version: 2
 Include: [
    cmake_platforms.yaml: [
        'rhel-8.10',
-        'windows-10_22h2-mingw13'
+        'windows-11_24h2-mingw13'
    ],
    cmake_platforms_target_android.yaml: [
        'android-15-x86_64-on-linux',
--- a/coin/platform_configs/nightly_qnx710_host_windows.yaml
+++ b/coin/platform_configs/nightly_qnx710_host_windows.yaml
@@ -1,18 +1,18 @@
 Version: 2
 Include: [
    cmake_platforms.yaml: [
-        windows-10_22h2-mingw13
+        'windows-11_24h2-mingw13'
    ]
 ]
 Configurations:
 -
    Id: 'qnx-710-arm64-on-windows'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
    Target os: 'QNX_710'
    Target arch: 'arm64'
    Compiler: 'Mingw'
    Target compiler: 'QCC'
-    Platform dependency: 'windows-10_22h2-mingw13'
+    Platform dependency: 'windows-11_24h2-mingw13'
    Features: ['DisableTests', 'UseConfigure']
    Environment variables: [
        'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -10,7 +10,8 @@ Include: [
    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
    cmake_platforms_qemu_vxworks_tests_static.yaml,
    qtlite.yaml,
-    qtbase-new-compiler-testing.yaml
+    qtbase-new-compiler-testing.yaml,
+    quick-bridges.yaml
 ]
 Configurations: []
 Overrides:
--- a/coin/platform_configs/qtdeclarative.yaml
+++ b/coin/platform_configs/qtdeclarative.yaml
@@ -7,7 +7,8 @@ Include: [
    cmake_platforms_static_tests.yaml,
    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
    cmake_platforms_qemu_vxworks_tests_static.yaml,
-    qtlite.yaml
+    qtlite.yaml,
+    quick-bridges.yaml
 ]
 Configurations: []
 Overrides:
--- a/coin/platform_configs/qtimageformats.yaml
+++ b/coin/platform_configs/qtimageformats.yaml
@@ -4,7 +4,8 @@ Include: [
    address_sanitizer_platforms.yaml,
    integrity.yaml,
    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml
+    cmake_platforms_qemu_vxworks_tests_static.yaml,
+    quick-bridges.yaml
 ]
 Configurations: []
 Overrides:
--- a/coin/platform_configs/qtlanguageserver.yaml
+++ b/coin/platform_configs/qtlanguageserver.yaml
@@ -4,6 +4,7 @@ Include: [
    address_sanitizer_platforms.yaml,
    integrity.yaml,
    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml
+    cmake_platforms_qemu_vxworks_tests_static.yaml,
+    quick-bridges.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtsaferenderer-runtime.yaml
+++ b/coin/platform_configs/qtsaferenderer-runtime.yaml
@@ -12,11 +12,11 @@ Include: [
    "sles-15_sp6-static",
    "windows-10_22h2-msvc2022",
    "rhel-8.10",
-    "windows-10_22h2-mingw13",
+    "windows-11_24h2-mingw13",
    "windows-11_24H2-mingw13-developer-build",
    "windows-11_24H2-llvm",
    "windows-11_24H2-msvc2022",
-    "windows-11_22h2-arm64-msvc2022"
+    "windows-11_23h2-arm64-msvc2022"
  ],
  cmake_platforms_qemu_qnx710.yaml: [
    "qnx-710-x86_64-developer-build-on-linux",
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -13,11 +13,11 @@ Include: [
    "sles-15_sp6-static",
    "windows-10_22h2-msvc2022",
    "rhel-8.10",
-    "windows-10_22h2-mingw13",
+    "windows-11_24h2-mingw13",
    "windows-11_24H2-mingw13-developer-build",
    "windows-11_24H2-llvm",
    "windows-11_24H2-msvc2022",
-    "windows-11_22h2-arm64-msvc2022"
+    "windows-11_23h2-arm64-msvc2022"
  ],
  cmake_platforms_qemu_qnx710.yaml: [
    "qnx-710-x86_64-developer-build-on-linux",
@@ -61,17 +61,6 @@ Configurations:
    ]
 -
    Id: 'Windows-MSVC2022-arm64_Static'
-    Template: 'qtci-windows-11_22H2-aarch64-54'
-    Compiler: 'MSVC2022'
-    Features: ['Packaging', 'UseConfigure', 'MinimalStaticTests']
-    Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-psql -no-opengl'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
-        'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
-        'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
-    ]
-
-    Id: 'Windows-MSVC2022-arm64_Static-23H2'
    Template: 'qtci-windows-11_23H2-aarch64-53'
    Compiler: 'MSVC2022'
    Features: ['Packaging', 'UseConfigure', 'MinimalStaticTests']
--- a/coin/platform_configs/qtshadertools.yaml
+++ b/coin/platform_configs/qtshadertools.yaml
@@ -4,6 +4,7 @@ Include: [
    address_sanitizer_platforms.yaml,
    integrity.yaml,
    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml
+    cmake_platforms_qemu_vxworks_tests_static.yaml,
+    quick-bridges.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtsvg.yaml
+++ b/coin/platform_configs/qtsvg.yaml
@@ -4,6 +4,7 @@ Include: [
    address_sanitizer_platforms.yaml,
    integrity.yaml,
    cmake_platforms_qemu_vxworks_buildtest_static.yaml,
-    cmake_platforms_qemu_vxworks_tests_static.yaml
+    cmake_platforms_qemu_vxworks_tests_static.yaml,
+    quick-bridges.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/quick-bridges.yaml
+++ b/coin/platform_configs/quick-bridges.yaml
@@ -0,0 +1,70 @@
+Version: 2
+Configurations:
+-
+    Id: 'macos-quick-bridges'
+    Template: 'qtci-macos-15-arm-104'
+    Compiler: 'Clang'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'Insignificant']
+    Configure arguments: >
+        -nomake examples
+        -nomake tests
+        -release
+        -force-debug-info
+        -separate-debug-info
+        -optimize-size
+        -shared
+        -disable-deprecated-up-to 0x070000
+        -no-feature-widgets
+        -no-feature-sql
+        -no-feature-printsupport
+        -no-feature-dbus
+        -no-feature-vnc
+        -no-feature-picture
+        -no-feature-pdf
+        -no-feature-network
+    Environment variables: []
+-
+    Id: 'linux-quick-bridges'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'Insignificant']
+    Configure arguments: >
+        -nomake examples
+        -nomake tests
+        -release
+        -force-debug-info
+        -separate-debug-info
+        -optimize-size
+        -shared
+        -disable-deprecated-up-to 0x070000
+        -no-feature-widgets
+        -no-feature-sql
+        -no-feature-printsupport
+        -no-feature-dbus
+        -no-feature-vnc
+        -no-feature-picture
+        -no-feature-pdf
+    Environment variables: []
+-
+    Id: 'windows-quick-bridges'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'MSVC2022'
+    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'Insignificant']
+    Configure arguments: >
+        -nomake examples
+        -nomake tests
+        -debug-and-release
+        -force-debug-info
+        -optimize-size
+        -shared
+        -disable-deprecated-up-to 0x070000
+        -no-feature-widgets
+        -no-feature-sql
+        -no-feature-printsupport
+        -no-feature-dbus
+        -no-feature-vnc
+        -no-feature-picture
+        -no-feature-pdf
+    Environment variables: [
+        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
+    ]
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -3,7 +3,7 @@ Include: [
    cmake_platforms.yaml: [
        "documentation-warnings",
        "rhel-8.10",
-        'windows-10_22h2-mingw13',
+        'windows-11_24h2-mingw13',
    ],
    macos.yaml: [
        'macos-universal-on-arm64'
@@ -12,7 +12,7 @@ Include: [
        'android-arm64-on-macos',
        'android-armv7-on-windows',
        'android-9-x86-on-linux',
-        'android-15-x86_64-on-linux'
+        'android-16-x86_64-on-linux'
    ],
    offline_documentation.yaml
 ]
--- a/coin/platform_configs/tqtc-qtbridges.yaml
+++ b/coin/platform_configs/tqtc-qtbridges.yaml
@@ -0,0 +1,64 @@
+Version: 2
+Include: [
+  quick-bridges.yaml: [
+     "macos-quick-bridges",
+     "linux-quick-bridges",
+     "windows-quick-bridges"
+  ]
+]
+Configurations:
+-
+    Id: 'windows-quick-bridges-dotnet'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'MSVC2022'
+    Platform dependency: 'windows-quick-bridges'
+    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesDotnet']
+
+-
+    Id: 'windows-quick-bridges-rust'
+    Template: 'qtci-windows-11_24H2-x86_64-71'
+    Compiler: 'MSVC2022'
+    Platform dependency: 'windows-quick-bridges'
+    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesRust']
+
+-
+    Id: 'linux-quick-bridges-python'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Compiler: 'GCC'
+    Platform dependency: 'linux-quick-bridges'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
+
+-
+    Id: 'linux-quick-bridges-java'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Compiler: 'GCC'
+    Platform dependency: 'linux-quick-bridges'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesJava']
+
+-
+    Id: 'linux-quick-bridges-rust'
+    Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
+    Compiler: 'GCC'
+    Platform dependency: 'linux-quick-bridges'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesRust']
+
+-
+    Id: 'macos-quick-bridges-java'
+    Template: 'qtci-macos-15-arm-104'
+    Compiler: 'Clang'
+    Platform dependency: 'macos-quick-bridges'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesJava']
+
+-
+    Id: 'macos-quick-bridges-python'
+    Template: 'qtci-macos-15-arm-104'
+    Compiler: 'Clang'
+    Platform dependency: 'macos-quick-bridges'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
+
+-
+    Id: 'macos-quick-bridges-swift'
+    Template: 'qtci-macos-15-arm-104'
+    Compiler: 'Clang'
+    Platform dependency: 'macos-quick-bridges'
+    Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesSwift']
--- a/coin/provisioning/common/linux/android/gradle_project/app/build.gradle
+++ b/coin/provisioning/common/linux/android/gradle_project/app/build.gradle
@@ -4,12 +4,12 @@ plugins {

 android {
    namespace 'com.example.gradle_project'
-    compileSdk 35
+    compileSdk 36

    defaultConfig {
        applicationId "com.example.gradle_project"
        minSdk 28
-        targetSdk 35
+        targetSdk 36
        versionCode 1
        versionName "1.0"
    }
--- a/coin/provisioning/common/linux/android/gradle_project/app/src/main/AndroidManifest.xml
+++ b/coin/provisioning/common/linux/android/gradle_project/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
        android:allowBackup="true"
        android:label="gradle_project"
        android:supportsRtl="true"
-        tools:targetApi="34">
+        tools:targetApi="35">
        <activity
            android:name=".MainActivity"
            android:exported="true">
--- a/coin/provisioning/common/linux/android/gradle_project/gradle/libs.versions.toml
+++ b/coin/provisioning/common/linux/android/gradle_project/gradle/libs.versions.toml
@@ -1,9 +1,9 @@
 [versions]
-agp = "8.8.0"
-core = "1.13.1"
-appcompat = "1.6.1"
-material = "1.11.0"
-constraintlayout = "2.1.4"
+agp = "8.10.1"
+core = "1.16.0"
+appcompat = "1.7.1"
+material = "1.12.0"
+constraintlayout = "2.2.1"

 [libraries]
 core = { group = 'androidx.core', name = "core", version.ref = "core" }
--- a/coin/provisioning/common/linux/android_emulator_launcher.sh
+++ b/coin/provisioning/common/linux/android_emulator_launcher.sh
@@ -7,15 +7,65 @@

 set -e

+function print_help {
+    echo "Usage: [ANDROID_EMULATOR=<name>] $0 [--avd <name>] [--window] [--help]"
+    echo ""
+    echo "This script launches the Android emulator on Qt CI."
+    echo ""
+    echo "Options:"
+    echo "  --avd <name>  Set the AVD name to launch (overrides ANDROID_EMULATOR env var)"
+    echo "  --window      Show the emulator window (default is headless via -no-window)"
+    echo "  --help        Show this help message"
+    echo ""
+}
+
+WINDOW_ARG="-no-window"
+AVD_NAME_ARG=""
+while [ $# -gt 0 ]; do
+    arg="$1"
+    case "$arg" in
+        --help)
+            print_help
+            exit 0
+            ;;
+        --window)
+            WINDOW_ARG=""
+            shift
+            ;;
+        --avd)
+            if [ -n "$2" ]; then
+                AVD_NAME_ARG="$2"
+                shift 2
+            else
+                echo "Error: --avd requires an argument"
+                exit 1
+            fi
+            ;;
+    esac
+done
+
 EMULATOR_MAX_RETRIES=3
 ADB_MAX_TIMEOUT=180
 EMULATOR_EXEC="$ANDROID_SDK_ROOT/emulator/emulator"
 ADB_EXEC="$ANDROID_SDK_ROOT/platform-tools/adb"
+
+if [ -z "$COIN_CTEST_RESULTSDIR" ]; then
+    COIN_CTEST_RESULTSDIR="$(pwd)"
+fi
+
 LOGCAT_PATH="$COIN_CTEST_RESULTSDIR/emulator_logcat_%iter.txt"
 EMULATOR_RUN_LOG_PATH="$COIN_CTEST_RESULTSDIR/emulator_run_log_%iter.txt"

-if [ -z "${ANDROID_EMULATOR}" ]; then
-    echo "No AVD name provided via ANDROID_EMULATOR env variable. Aborting!"
+if [ -n "$AVD_NAME_ARG" ]; then
+    AVD_NAME="$AVD_NAME_ARG"
+else
+    AVD_NAME="$ANDROID_EMULATOR"
+fi
+
+if [ -z "${AVD_NAME}" ]; then
+    echo "No AVD name provided via --avd option or ANDROID_EMULATOR env variable. Aborting!"
+    echo "Available AVDs names:"
+    $EMULATOR_EXEC -list-avds | sed 's/^/    /'
    exit 1
 fi

@@ -25,13 +75,12 @@ function check_for_android_device
 }

 # WARNING: On the very first boot of the emulator it happens that the device
-# "finishes" booting and getprop shows bootanim=stopped and
-# boot_completed=1. But sometimes not all packages have been installed (`pm
-# list packages` shows only 16 packages installed), and after around half a
-# minute the boot animation starts spinning (bootanim=running) again despite
-# boot_completed=1 all the time. After some minutes the boot animation stops
-# again and the list of packages contains 80 packages. Only then the device is
-# fully booted, and only then is dev.bootcomplete=1.
+# "finishes" booting and getprop shows boot_completed=1. But sometimes not all
+# packages have been installed (`pm list packages` shows only 16 packages
+# installed), and after around half a minute the boot animation starts spinning
+# again despite boot_completed=1 all the time. After some minutes the boot
+# animation stops again and the list of packages contains 80 packages.
+# Only then the device is fully booted, and only then is dev.bootcomplete=1.
 #
 # To reproduce the emulator booting as the first time, you have to delete the
 # cached images found inside $HOME/.android/avd/{avd_name}.avd/ especially the
@@ -39,11 +88,10 @@ function check_for_android_device
 function check_if_fully_booted
 {
    # The "getprop" command separates lines with \r\n so we trim them
-    bootanim=$(      timeout 1 "$ADB_EXEC" shell getprop init.svc.bootanim  | tr -d '\r\n')
    boot_completed=$(timeout 1 "$ADB_EXEC" shell getprop sys.boot_completed | tr -d '\r\n')
    bootcomplete=$(  timeout 1 "$ADB_EXEC" shell getprop dev.bootcomplete   | tr -d '\r\n')
-    echo "bootanim=$bootanim boot_completed=$boot_completed bootcomplete=$bootcomplete"
-    [ "$bootanim" = stopped ] && [ "$boot_completed" = 1 ] && [ "$bootcomplete" = 1 ]
+    echo "boot_completed=$boot_completed bootcomplete=$bootcomplete"
+    [ "$boot_completed" = 1 ] && [ "$bootcomplete" = 1 ]
 }

 for counter in $(seq ${EMULATOR_MAX_RETRIES})
@@ -61,10 +109,10 @@ do
    LOGCAT_PATH=${LOGCAT_PATH//%iter/${counter}}
    EMULATOR_RUN_LOG_PATH=${EMULATOR_RUN_LOG_PATH//%iter/${counter}}

-    echo "Starting emulator ${ANDROID_EMULATOR}, try ${counter}/${EMULATOR_MAX_RETRIES}" \
+    echo "Starting emulator ${AVD_NAME}, try ${counter}/${EMULATOR_MAX_RETRIES}" \
        | tee "${EMULATOR_RUN_LOG_PATH}"
-    $EMULATOR_EXEC -avd "$ANDROID_EMULATOR" \
-        -gpu swiftshader_indirect -no-audio -no-window -no-boot-anim \
+    $EMULATOR_EXEC -avd "$AVD_NAME" \
+        -gpu swiftshader_indirect -no-audio $WINDOW_ARG -no-boot-anim \
        -cores 4 -memory 16000 -partition-size 4096 \
        -detect-image-hang -restart-when-stalled -no-snapshot-save \
        -no-nested-warnings -logcat '*:v' -logcat-output "${LOGCAT_PATH}" \
@@ -72,7 +120,7 @@ do
    emulator_pid=$!
    disown $emulator_pid

-    echo "Waiting ${ADB_MAX_TIMEOUT} seconds for emulated device to appear..."
+    echo "Waiting ${ADB_MAX_TIMEOUT} seconds for emulated device to start..."
    timeout ${ADB_MAX_TIMEOUT} "$ADB_EXEC" wait-for-device

    # Due to some bug in Coin/Go, we can't have the emulator command stream
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -24,8 +24,8 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android"

 toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
-sdkBuildToolsVersion="35.0.1"
-sdkApiLevel="android-35"
+sdkBuildToolsVersion="36.0.0"
+sdkApiLevel="android-36"
 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"

 ndkVersionLatest="r27c"
@@ -158,7 +158,7 @@ echo "Download and unzip Android 9 System Image"
 minVersionFileName="x86-28_r08.zip"
 minVersionDestination="$sdkTargetFolder/system-images/android-28/google_apis/"
 minVersionFilePath="$minVersionDestination/$minVersionFileName"
-minVersionCiUrl="$basePath/system-images/google_apis/$minVersionFileName"
+minVersionCiUrl="$basePath/system_images/google_apis/$minVersionFileName"
 minVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$minVersionFileName"
 minVersionSha1="41e3b854d7987a3d8b7500631dae1f1d32d3db4e"

@@ -169,45 +169,27 @@ echo "Unzipping the Android 9 to $minVersionDestination"
 sudo unzip -o -q "$minVersionFilePath" -d "$minVersionDestination"
 rm "$minVersionFilePath"

-echo "Download and unzip Android 15 System Image"
-maxVersionFileName="x86_64-35_r08.zip"
-maxVersionDestination="$sdkTargetFolder/system-images/android-35/google_apis/"
+echo "Download and unzip Android 16 System Image"
+maxVersionFileName="x86_64-36_r07.zip"
+maxVersionDestination="$sdkTargetFolder/system-images/android-36/google_apis/"
 maxVersionFilePath="$maxVersionDestination/$maxVersionFileName"
-maxVersionCiUrl="$basePath/system-images/google_apis/$maxVersionFileName"
+maxVersionCiUrl="$basePath/system_images/google_apis/$maxVersionFileName"
 maxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$maxVersionFileName"
-maxVersionSha1="d79169884cabc6680cb29d32c2112ad46c858c1b"
+maxVersionSha1="c6bf44bdcd885bb902b4ba752d111a073ad7a817"

 mkdir -p "$maxVersionDestination"
 DownloadURL "$maxVersionCiUrl" "$maxVersionUrl" "$maxVersionSha1" "$maxVersionFilePath"

-echo "Unzipping the Android 15 to $maxVersionDestination"
+echo "Unzipping the Android 16 to $maxVersionDestination"
 sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination"
 rm "$maxVersionFilePath"

-echo "Download and unzip Android 16 System Image for insignificant"
-insignificantMaxVersionFileName="x86_64-36_r06.zip"
-insignificantMaxVersionDestination="$sdkTargetFolder/system-images/android-36/google_apis/"
-insignificantMaxVersionFilePath="$insignificantMaxVersionDestination/$insignificantMaxVersionFileName"
-insignificantMaxVersionCiUrl="$basePath/system-images/google_apis/$insignificantMaxVersionFileName"
-insignificantMaxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$insignificantMaxVersionFileName"
-insignificantMaxVersionSha1="a9b0b4a0488e0c6c380f5485507950f011388511"
-
-mkdir -p "$insignificantMaxVersionDestination"
-DownloadURL "$insignificantMaxVersionCiUrl" "$insignificantMaxVersionUrl" "$insignificantMaxVersionSha1" "$insignificantMaxVersionFilePath"
-
-echo "Unzipping the Android 16 insignicant to $insignificantMaxVersionDestination"
-sudo unzip -o -q "$insignificantMaxVersionFilePath" -d "$insignificantMaxVersionDestination"
-rm "$insignificantMaxVersionFilePath"
-
 echo "Checking the contents of Android SDK again..."
 ls -l "$sdkTargetFolder"

 echo "no" | ./avdmanager create avd -n emulator_x86_api_28 -c 2048M -f \
    -k "system-images;android-28;google_apis;x86"

-echo "no" | ./avdmanager create avd -n emulator_x86_64_api_35 -c 2048M -f \
-    -k "system-images;android-35;google_apis;x86_64"
-
 echo "no" | ./avdmanager create avd -n emulator_x86_64_api_36 -c 2048M -f \
    -k "system-images;android-36;google_apis;x86_64"

@@ -240,7 +222,7 @@ cp -r "${scripts_dir_name}/android/gradle_project" /tmp/gradle_project
 cd /tmp/gradle_project
 # Get Gradle files from qtbase
 qtbaseGradleUrl="https://code.qt.io/cgit/qt/qtbase.git/plain/src/3rdparty/gradle"
-commit_sha="e5f79573fe2f21cf7bea8f63386f39bb18b351f0"
+commit_sha="5bc160bc8385f6a2e590ffb964d1d390c1ab4ce6"
 curl "$qtbaseGradleUrl/gradle.properties?h=$commit_sha" > gradle.properties
 curl "$qtbaseGradleUrl/gradlew?h=$commit_sha" > gradlew
 curl "$qtbaseGradleUrl/gradlew.bat?h=$commit_sha" > gradlew.bat
--- a/coin/provisioning/common/linux/axivion/rule_config.json
+++ b/coin/provisioning/common/linux/axivion/rule_config.json
@@ -1,5 +1,23 @@
 {
    "Analysis": {
+        "CWE-119": {
+            "_active": true
+        },
+        "CWE-125": {
+            "_active": true
+        },
+        "CWE-190": {
+            "_active": true
+        },
+        "CWE-416": {
+            "_active": true
+        },
+        "CWE-476": {
+            "_active": true
+        },
+        "CWE-787": {
+            "_active": true
+        },
        "CloneDetection": {
            "_active": true,
            "excludes": [
@@ -203,8 +221,8 @@
    "_Format": "1.0",
    "_VersionNum": [
        7,
-        8,
-        0,
-        15004
+        10,
+        4,
+        17655
    ]
 }
--- a/coin/provisioning/common/macos/android.sh
+++ b/coin/provisioning/common/macos/android.sh
@@ -27,9 +27,9 @@ ndkVersionLatest="r27c"
 ndkVersionNightly1="$ndkVersionLatest"  # If same version as latest = skip NDK install for nightly
 ndkVersionNightly2="$ndkVersionLatest"

-sdkBuildToolsVersion="35.0.1"
+sdkBuildToolsVersion="36.0.0"
 # this is compile sdk version
-sdkApiLevel="android-35"
+sdkApiLevel="android-36"

 toolsSourceFile="$basePath/$toolsFile"

--- a/coin/provisioning/common/macos/clean_gca_keys.sh
+++ b/coin/provisioning/common/macos/clean_gca_keys.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+# 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
+
+# Delete GCA plists and leases plist to force their regeneration after next reboot
+# This avoids IPv6 link-local address collision that would happen with
+# multiple VMs from same image.
+
+sudo rm -rf /var/db/dhcpclient
--- a/coin/provisioning/common/macos/disable_spotlight.sh
+++ b/coin/provisioning/common/macos/disable_spotlight.sh
@@ -15,6 +15,13 @@ disableSpotlight() {
    sudo mdutil -E / || return 1
 }

+fixUnknownIndexingState() {
+    echo "Fix unknown indexing state by enabling indexing back one by one"
+    sudo mdutil -i on / || return 1
+    sudo mdutil -i on /System/Volumes/Preboot || return 1
+    sudo mdutil -i on /System/Volumes/Data || return 1
+}
+
 # Disabling spotlight tends to be flaky, add some retry
 for i in $(seq 1 5)
 do
@@ -25,7 +32,8 @@ do
        echo "Spotlight disabled"
        break
    else
-        echo "Failed to disable spotlight, $i retry..."
+        echo "Failed to disable spotlight, $i run fix and retry..."
+        fixUnknownIndexingState
        sleep 2
    fi
 done
--- a/coin/provisioning/common/macos/homebrew.sh
+++ b/coin/provisioning/common/macos/homebrew.sh
@@ -12,10 +12,10 @@ INSTALLTYPE="$1"
 VERSION="$2"
 CHECKSUM="$3"

-DEFAULT_PKG_VERSION="4.4.21"
-DEFAULT_PKG_VERSION_CHECKSUM="cd83c4123d5db7d07eb3042f1c785ed7f599183c5c542040bc6abfa722583861"
-DEFAULT_GIT_VERSION="deb02e27d99fd2cb27ae16760e3a5272b612fded"
-DEFAULT_GIT_VERSION_CHECKSUM="a30b9fbf0d5c2cff3eb1d0643cceee30d8ba6ea1bb7bcabf60d3188bd62e6ba6"
+DEFAULT_PKG_VERSION="4.6.8"
+DEFAULT_PKG_VERSION_CHECKSUM="91157b34fcc58eeaf4149f2f2b3063f2904a3d5e5cc3bf84d3c79627ba26afd9"
+DEFAULT_GIT_VERSION="bce07c53def3dbe54aa14a88adfc63eb7ba91f48"
+DEFAULT_GIT_VERSION_CHECKSUM="c95d3a95a38f9c2cb122335a2101d49af196a1c5"

 source "$(dirname "$0")"/../../common/unix/DownloadURL.sh
 source "$(dirname "$0")"/../../common/unix/SetEnvVar.sh
@@ -53,7 +53,7 @@ installGit() {
    DownloadURL "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" "/Users/qt/pw"
    { pw=$(cat "/Users/qt/pw"); } 2> /dev/null
    sudo chmod 755 /tmp/homebrew_install.sh
-    { (echo "$pw" | /tmp/homebrew_install.sh); } 2> /dev/null
+    { (echo "$pw" | CI=1 /tmp/homebrew_install.sh); } 2> /dev/null
    rm -f "/Users/qt/pw"
 }

--- a/coin/provisioning/common/macos/install-pyenv.sh
+++ b/coin/provisioning/common/macos/install-pyenv.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+#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
+
+set -ex
+
+# shellcheck source=../common/unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+# shellcheck source=./DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+
+installerFile="pyenv-installer"
+sha="1c2f20c26dc8bb7409a6031e8777c0c1b2aae9da"
+cacheUrl="https://ci-files01-hki.ci.qt.io/input/python/pyenv/${installerFile}"
+target="${installerFile}"
+
+DownloadURL "$cacheUrl" "" "$sha" "$target"
+chmod +x "$target"
+"./$target"
+SetEnvVar "PYENV_ROOT" "/Users/qt/.pyenv"
+SetEnvVar "PATH" "\$PYENV_ROOT/bin:\$PATH"
+rm -f "$target"
--- a/coin/provisioning/common/macos/p7zip.sh
+++ b/coin/provisioning/common/macos/p7zip.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+#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 7z to be used from command line
+
+set -ex
+
+brew install p7zip
--- a/coin/provisioning/common/macos/set_tcc_permissions.sh
+++ b/coin/provisioning/common/macos/set_tcc_permissions.sh
@@ -41,6 +41,9 @@ SERVICES+=("kTCCServiceBluetoothAlways|$HOME")
 # a test fails.
 SERVICES+=("kTCCServiceScreenCapture|/")

+# Squish requires kTCCServiceAccessibility
+SERVICES+=("kTCCServiceAccessibility|/")
+
 # ------ Implementation ------

 function add_permission_for_client() {
--- a/coin/provisioning/common/shared/sbom_requirements.txt
+++ b/coin/provisioning/common/shared/sbom_requirements.txt
@@ -3,5 +3,5 @@ spdx-tools>=0.8.0 ; python_version >= '3.9'
 ntia-conformance-checker ; python_version >= '3.9'
 sbomaudit ; python_version >= '3.9'
 sbom2doc ; python_version >= '3.9'
-reuse ; python_version >= '3.9'
+reuse<=5.1.1 ; python_version >= '3.9'
 cyclonedx-python-lib==11.0.0 ; python_version >= '3.9'
--- a/coin/provisioning/common/unix/ffmpeg-installation-utils.sh
+++ b/coin/provisioning/common/unix/ffmpeg-installation-utils.sh
@@ -2,9 +2,13 @@
 # Copyright (C) 2024 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

+ffmpeg_version_default() {
+    echo "n7.1.2"
+}
+
 download_ffmpeg() {
-    local version="${1:-n7.1.1}"
-    local sha1="${2:-479291e8555fe036ca760f95cea829a21e9b8365}"
+    local version="${1:-$(ffmpeg_version_default)}"
+    local sha1="${2:-1e4e937facdbde15943dd093121836bf69f27c7c}"

    local ffmpeg_name="FFmpeg-$version"
    local target_dir="$HOME"
@@ -65,3 +69,11 @@ set_ffmpeg_dir_env_var() {
    source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
    SetEnvVar "$envvar" "$dir"
 }
+
+set_ffmpeg_env_var() {
+    local envvar="$1"
+    local value="$2"
+
+    source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+    SetEnvVar "$envvar" "$value"
+}
--- a/coin/provisioning/common/unix/install-ffmpeg-android.sh
+++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh
@@ -9,7 +9,8 @@ source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh"

 os="$1"
 # Optional parameter to set output installation directory. Useful for local builds.
-target_install_dir_param="$2"
+page_size="$2"
+target_install_dir_param="$3"
 build_type=$(get_ffmpeg_build_type)
 ffmpeg_source_dir=$(download_ffmpeg)

@@ -88,7 +89,15 @@ build_ffmpeg_android() {
    ffmpeg_config_options+=" --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/"
    ffmpeg_config_options+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}"
    ffmpeg_config_options+=" --extra-cflags=-I${openssl_include} --extra-ldflags=-L${openssl_libs}"
-
+    if [ $page_size == "use_16kb_page_size" ]; then
+        ffmpeg_config_options+=" --extra-ldflags=-Wl,-z,max-page-size=16384"
+        echo "FFmpeg Android using 16KB page sizes"
+    elif [ $page_size == "use_4kb_page_size" ]; then
+        echo "FFmpeg Android using 4KB page sizes"
+    else
+        echo "Error: FFmpeg Android page_size must be: use_16kb_page_size or: use_4kb_page_size got: $page_size" >&2
+        exit 1
+    fi
    local build_dir="$ffmpeg_source_dir/build_android/$target_arch"
    mkdir -p "$build_dir"
    pushd "$build_dir"
--- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh
+++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh
@@ -12,6 +12,7 @@ readonly MINIMUM_IOS_VERSION="16.0"

 source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh"

+ffmpeg_version=$(ffmpeg_version_default)
 ffmpeg_source_dir=$(download_ffmpeg)
 ffmpeg_config_options=$(get_ffmpeg_config_options "shared")
 default_prefix="/usr/local/ios/ffmpeg"
@@ -67,11 +68,23 @@ build_info_plist() {
    local framework_name="$2"
    local framework_id="$3"

+    # Apple plist format has a strict requirement that the version string
+    # contains up to 3 numerics separated by a dot. Meanwhile, FFmpeg versioning
+    # tends to use an 'n' prefix in their versioning. We use a regex to convert
+    # and verify the version string.
+    #
+    # https://developer.apple.com/documentation/bundleresources/information-property-list/cfbundleversion
+    local formatted_ffmpeg_version
+    if [[ $ffmpeg_version =~ ([0-9]+(\.[0-9]+){0,2}) ]]; then
+        formatted_ffmpeg_version="${BASH_REMATCH[1]}"
+    else
+        echo "Unable to format FFmpeg version string '$ffmpeg_version' into corresponding Apple Info.plist format"
+        exit 1
+    fi
+
    local minimum_version_key="MinimumOSVersion"
    local supported_platforms="iPhoneOS"

-    # TODO: This should be filled out with the actual version of FFmpeg that we are
-    # deploying.
    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\">
@@ -89,9 +102,9 @@ build_info_plist() {
    <key>CFBundlePackageType</key>
    <string>FMWK</string>
    <key>CFBundleShortVersionString</key>
-    <string>7.0.2</string>
+    <string>${formatted_ffmpeg_version}</string>
    <key>CFBundleVersion</key>
-    <string>7.0.2</string>
+    <string>${formatted_ffmpeg_version}</string>
    <key>CFBundleSignature</key>
    <string>????</string>
    <key>${minimum_version_key}</key>
@@ -111,7 +124,7 @@ build_info_plist() {
 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 platform="$2" # For now it's either arm64, x86_64-simulator, see below.
    local ffmpeg_library_path="$ffmpeg_source_dir/build_ios/${platform}/installed$prefix"
    local framework_complete_path="${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"

--- a/coin/provisioning/common/unix/openssl_for_android.sh
+++ b/coin/provisioning/common/unix/openssl_for_android.sh
@@ -13,7 +13,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

 sslVersionForLatest="3.0.7"
 ndkVersionLatest="r27c"
-prebuiltOpensslShaLatest="733cff853b6ee7738e78b90f46b5f028c8490e1e"
+prebuiltOpensslShaLatest="2cc15dd990460c2c7157ab257a47071fbd9e0ac8"

 ndkVersionNightly1=$ndkVersionLatest
 sslVersionForNightly1=$sslVersionForLatest
@@ -61,10 +61,10 @@ function InstallPrebuiltOpenssl() {
    sha=$2
    sslVersion=$3

-    opensslHome="${HOME}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}"
+    opensslHome="${HOME}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}_16kb"
    if [[ ! -d ${opensslHome} ]]; then
-        prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}.zip"
-        targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}.zip"
+        prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}_16kb.zip"
+        targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}_16kb.zip"

        DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
        unzip -o "$targetFile" -d "${HOME}"
--- a/coin/provisioning/common/windows/android.ps1
+++ b/coin/provisioning/common/windows/android.ps1
@@ -34,8 +34,8 @@ $ndkOfficialUrlNightly2 = "https://dl.google.com/android/repository/android-ndk-
 $toolsVersion = "2.1"
 $toolsFile = "commandlinetools-win-6609375_latest.zip"
 $sdkApi = "ANDROID_API_VERSION"
-$sdkApiLevel = "android-35"
-$sdkBuildToolsVersion = "35.0.1"
+$sdkApiLevel = "android-36"
+$sdkBuildToolsVersion = "36.0.0"
 $toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile"
 $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
 $toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
--- a/coin/provisioning/common/windows/drivers_versions.ps1
+++ b/coin/provisioning/common/windows/drivers_versions.ps1
@@ -0,0 +1,21 @@
+# 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
+
+# This script will output usable drivers' versions in provision log
+
+function LogDriverVersion
+{
+    Param (
+        [string]$Name = $(BadParam("a name of the driver"))
+    )
+
+    $version = (Get-WmiObject Win32_PnPSignedDriver -Filter "DeviceName = '$Name'" | Format-Table Driverversion -HideTableHeaders | Out-String).Trim()
+    if ([string]::IsNullOrEmpty($version) -eq $true) {
+        Write-Host "No driver version found: '$Name'"
+        return
+    }
+
+    Write-Host "$Name = $version"
+}
+
+LogDriverVersion "VirtIO Serial Driver"
--- a/coin/provisioning/common/windows/helpers.ps1
+++ b/coin/provisioning/common/windows/helpers.ps1
@@ -382,3 +382,22 @@ function Invoke-MtCommand {
  & $Env:SystemRoot\system32\cmd.exe /c $cmdLine | Write-Output
  Remove-Item $tempFile
 }
+
+function Invoke-NMake {
+    param([string[]]$NmakeArgs)
+    # Temporarily remove MAKE flags for NMAKE process
+    $old = @{
+        MAKEFLAGS  = (Get-Item Env:MAKEFLAGS  -ErrorAction Ignore).Value
+        MFLAGS     = (Get-Item Env:MFLAGS     -ErrorAction Ignore).Value
+        MAKE       = (Get-Item Env:MAKE       -ErrorAction Ignore).Value
+        NMAKEFLAGS = (Get-Item Env:NMAKEFLAGS -ErrorAction Ignore).Value
+    }
+    foreach ($n in $old.Keys) {Remove-Item "Env:$n" -ErrorAction SilentlyContinue}
+    try   {& nmake @NmakeArgs}
+    finally {
+        foreach ($n in $old.Keys) {
+            if ($old[$n]) {Set-EnvironmentVariable -Key "$n" -Value $old[$n]}
+            else {Remove-Item "Env:$n" -ErrorAction SilentlyContinue}
+        }
+    }
+}
--- a/coin/provisioning/common/windows/install-ffmpeg.ps1
+++ b/coin/provisioning/common/windows/install-ffmpeg.ps1
@@ -7,9 +7,9 @@
 # This script will install FFmpeg
 $msys = "C:\Utils\msys64\usr\bin\bash"

-$version="n7.1.1"
+$version="n7.1.2"
 $url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-$sha1="479291e8555fe036ca760f95cea829a21e9b8365"
+$sha1="1e4e937facdbde15943dd093121836bf69f27c7c"
 $url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
 $ffmpeg_name="FFmpeg-$version"

@@ -205,7 +205,8 @@ function InstallAndroidArmv7 {
        [string]$ndk_root,
        [string]$ffmpeg_dir_android_envvar_name,
        [string]$ndk_version,
-        [string]$android_openssl_path  # OpenSSL is built for Android using NDK, NDK versions for OpenSSL+FFmpeg should match
+        [string]$android_openssl_path,  # OpenSSL is built for Android using NDK, NDK versions for OpenSSL+FFmpeg should match
+        [string]$android_page_size
    )
    $shared=$true
    $target_toolchain_arch="armv7a-linux-androideabi"
@@ -227,8 +228,10 @@ function InstallAndroidArmv7 {
    $strip="${toolchain_bin}/llvm-strip.exe"
    $openssl_path = $android_openssl_path.Replace("\", "/")

-    New-Item -ItemType SymbolicLink -Path ${openssl_path}/armeabi-v7a/libcrypto.so -Target ${openssl_path}/armeabi-v7a/libcrypto_3.so
-    New-Item -ItemType SymbolicLink -Path ${openssl_path}/armeabi-v7a/libssl.so -Target ${openssl_path}/armeabi-v7a/libssl_3.so
+    Write-Host "Copying _3.so's to .so's"
+    Copy-Item -Path ${openssl_path}/armeabi-v7a/libcrypto_3.so -Destination ${openssl_path}/armeabi-v7a/libcrypto.so
+    Copy-Item -Path ${openssl_path}/armeabi-v7a/libssl_3.so -Destination ${openssl_path}/armeabi-v7a/libssl.so
+

    $config = GetFfmpegDefaultConfiguration
    $config += " --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-openssl --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera"
@@ -236,6 +239,16 @@ function InstallAndroidArmv7 {
    $config += " --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}"
    $config += " --extra-cflags=-I${android_openssl_path}/include --extra-ldflags=-L${android_openssl_path}/armeabi-v7a"
    $config += " --extra-cflags=-I${openssl_path}/include --extra-ldflags=-L${openssl_path}/armeabi-v7a"
+    if ($android_page_size -eq "use_16kb_page_size"){
+        $config += " --extra-ldflags=-Wl,-z,max-page-size=16384"
+        Write-Host "FFmpeg Android using 16KB page sizes"
+    } elseif ($android_page_size -eq "use_4kb_page_size") {
+        Write-Host "FFmpeg Android using 4KB page sizes"
+    } else {
+        Write-Host "Error: FFmpeg Android page_size must be: use_16kb_page_size or: use_16kb_page_size got: $android_page_size"
+        return false
+    }
+
    $config += " --strip=$strip"

    $buildSystem = "android-arm"
@@ -283,7 +296,7 @@ function InstallFfmpegsAMD64 {
    $llvmMingwRes = InstallLlvmMingwFfmpeg
    if ($env:ANDROID_NDK_ROOT_LATEST) {
        Write-Host "Install ffmpeg using latest supported Android NDK"
-        $androidArmV7Res = InstallAndroidArmv7 -ndk_root $env:ANDROID_NDK_ROOT_LATEST -ffmpeg_dir_android_envvar_name "FFMPEG_DIR_ANDROID_ARMV7_NDK_LATEST" -ndk_version "latest" -android_openssl_path $env:OPENSSL_ANDROID_HOME_LATEST
+        $androidArmV7Res = InstallAndroidArmv7 -ndk_root $env:ANDROID_NDK_ROOT_LATEST -ffmpeg_dir_android_envvar_name "FFMPEG_DIR_ANDROID_ARMV7_NDK_LATEST" -ndk_version "latest" -android_openssl_path $env:OPENSSL_ANDROID_HOME_LATEST -android_page_size "use_4kb_page_size"
    } else {
        throw "Error: env.var ANDROID_NDK_ROOT_LATEST is not set for FFmpeg"
    }
--- a/coin/provisioning/common/windows/winappsdk.ps1
+++ b/coin/provisioning/common/windows/winappsdk.ps1
@@ -2,11 +2,12 @@

 # This script installs Windows App SDK

-$script:nugetPackage = "nuget.exe"
+$script:nugetVersion = "v6.11.0"
+$script:nugetPackage = "nuget_$nugetVersion.exe"
 $script:packageRoot = "C:\Utils\WindowsAppSdk\"

 $script:cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\nuget\$nugetPackage"
-$script:officialUrl = "https://dist.nuget.org/win-x86-commandline/v6.11.0/nuget.exe"
+$script:officialUrl = "https://dist.nuget.org/win-x86-commandline/$nugetVersion/nuget.exe"
 $script:sdkChecksumSha1 = "5443887cfb5283da5021388d146ebb5febdc82e9"
 $script:package_path = "$packageRoot\\$nugetPackage"

--- a/coin/provisioning/common/windows/zlib.ps1
+++ b/coin/provisioning/common/windows/zlib.ps1
@@ -42,8 +42,7 @@ function BuildZlib {
    )

    PrepareBuildEnvironment -HostArchitecture $HostArchitecture -TargetArchitecture $TargetArchitecture
-
-    nmake /f $MAKEFILE
+    Invoke-NMake -NmakeArgs @('/f', "$MAKEFILE")
 }

 function CopySource {
--- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh
@@ -249,6 +249,8 @@ installPackages+=(zlib1g-dev)
 installPackages+=(libusb-1.0-0-dev)
 # password management support for Qt Creator
 installPackages+=(libsecret-1-dev)
+installPackages+=(debian-archive-keyring)
+

 echo "Running update for apt"
 waitLoop
--- a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-install-ffmpeg.sh
@@ -3,5 +3,5 @@
 #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

 source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64"
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86"
+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-RHEL-8.4-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh
@@ -3,5 +3,5 @@
 #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

 source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86"
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64"
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86" "use_4kb_page_size"
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64" "use_16kb_page_size"
--- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/90-install-ffmpeg.sh
@@ -3,4 +3,4 @@
 #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

 source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64"
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64" "use_16kb_page_size"
--- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh
@@ -3,5 +3,5 @@
 #SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

 source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64"
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86"
+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-22.04-aarch64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2022 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,15 +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=aarch64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ jammy main restricted universe multiverse
-    deb [arch=aarch64 http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ jammy-updates main restricted universe multiverse
-    deb [arch=aarch64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ jammy-backports main restricted universe
-    deb [arch=aarch64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ jammy-security main restricted universe multiverse
+    deb [trusted=yes] http://repo-clones-apt.ci.qt.io:8080 jammy-arm64 main restricted universe multiverse
+    deb [trusted=yes] http://repo-clones-apt.ci.qt.io:8080 jammy-updates-arm64 main restricted universe multiverse
+    deb [trusted=yes] http://repo-clones-apt.ci.qt.io:8080 jammy-backports-arm64 main restricted universe multiverse
+    deb [trusted=yes] http://repo-clones-apt.ci.qt.io:8080 jammy-security-arm64 main restricted universe multiverse
 EOC
 }

-#repo-clones not set up for aarch64 yet
-#(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
 installPackages+=(ca-certificates)
--- 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
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2022 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/ jammy main restricted universe multiverse
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ jammy-updates main restricted universe multiverse
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ jammy-backports main restricted universe
-    deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ jammy-security main restricted universe multiverse
-    deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ jammy main restricted
-    deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ jammy-updates main restricted
-    deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ jammy universe
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 jammy-amd64 main restricted universe multiverse
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 jammy-updates-amd64 main restricted universe multiverse
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 jammy-backports-amd64 main restricted universe multiverse
+    deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 jammy-security-amd64 main restricted universe multiverse
+    deb [arch=i386 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 jammy-i386 main restricted universe multiverse
+    deb [arch=i386 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 jammy-updates-i386 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."

 # Make sure needed ca-certificates are available
 sudo apt-get install --reinstall ca-certificates
--- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh
@@ -39,8 +39,13 @@ EOF
 sudo sbuild-adduser "$LOGNAME"
 newgrp sbuild

+# For debian repo we need to update the bookworm release pgp key
+mkdir -p /home/qt/.debian_key_ring
+wget https://ftp-master.debian.org/keys/archive-key-12.asc -O /home/qt/.debian_key_ring/archive-key-12.asc
+gpg --no-default-keyring --keyring=/home/qt/.debian_key_ring/debian_chroot.gpg --import /home/qt/.debian_key_ring/archive-key-12.asc
+
 # Create chroot
-sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates bookworm /srv/chroot/stable-amd64 http://deb.debian.org/debian
+sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates bookworm /srv/chroot/stable-amd64 http://deb.debian.org/debian --keyring=/home/qt/.debian_key_ring/debian_chroot.gpg

 # For ubuntu 22.04
 echo "Create chroot for Ubuntu Jammy"
--- 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,19 @@ DownloadAndExtract () {


 # Axivion Bauhaus Suite
-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"
+version="7.10.5"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-$version-x86_64-gnu_linux.tar.gz"
+targetFile="bauhaus-suite.tar.gz"
+sha1="59d996b3f66c928eb7063a8f66ec12eaf4e21318"
 cd "$HOME"
-DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$HOME"
+DownloadAndExtract "$sourceFile" "$sha1" "$targetFile"

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

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

-echo "Axivion Bauhaus Suite = 7.9.1" >> ~/versions.txt
+echo "Axivion Bauhaus Suite = $version" >> ~/versions.txt
--- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-bootstrap-autostart.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-bootstrap-autostart.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source "${BASH_SOURCE%/*}/../common/linux/bootstrap-autostart.sh"
--- a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-axivion-bauhaus-suite.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-axivion-bauhaus-suite.sh
@@ -22,18 +22,19 @@ DownloadAndExtract () {


 # Axivion Bauhaus Suite
-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"
+version="7.10.5"
+sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-$version-x86_64-gnu_linux.tar.gz"
+targetFile="bauhaus-suite.tar.gz"
+sha1="59d996b3f66c928eb7063a8f66ec12eaf4e21318"
 cd "$HOME"
-DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$HOME"
+DownloadAndExtract "$sourceFile" "$sha1" "$targetFile"

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

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

-echo "Axivion Bauhaus Suite = 7.9.1" >> ~/versions.txt
+echo "Axivion Bauhaus Suite = $version" >> ~/versions.txt
--- a/coin/provisioning/qtci-macos-10.15-x86_64/26-p7zip.sh
+++ b/coin/provisioning/qtci-macos-10.15-x86_64/26-p7zip.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
-#Copyright (C) 2023 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 7z to be used from command line
-
 set -ex

-brew update
-brew install p7zip
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/p7zip.sh"
--- a/coin/provisioning/qtci-macos-10.15-x86_64/99-clean_gca_keys.sh
+++ b/coin/provisioning/qtci-macos-10.15-x86_64/99-clean_gca_keys.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+"$(dirname "$0")"/../common/macos/clean_gca_keys.sh
--- a/coin/provisioning/qtci-macos-11-arm/24-pyenv.sh
+++ b/coin/provisioning/qtci-macos-11-arm/24-pyenv.sh
@@ -1,49 +1,8 @@
 #!/usr/bin/env bash
+#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

-#############################################################################
-##
-## Copyright (C) 2021 The Qt Company Ltd.
-## Copyright (C) 2017 Pelagicore AG
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
+set -ex

-# This script installs python3
-
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-
-# Try with default
-/opt/homebrew/bin/brew install pyenv
+# shellcheck source=../common/macos/install-pyenv.sh
+source "${BASH_SOURCE%/*}/../common/macos/install-pyenv.sh"
--- a/coin/provisioning/qtci-macos-11-arm/26-p7zip.sh
+++ b/coin/provisioning/qtci-macos-11-arm/26-p7zip.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
-#Copyright (C) 2023 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 7z to be used from command line
-
 set -ex

-brew update
-brew install p7zip
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/p7zip.sh"
--- a/coin/provisioning/qtci-macos-11-arm/30-nodejs.sh
+++ b/coin/provisioning/qtci-macos-11-arm/30-nodejs.sh
@@ -1,8 +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 nodejs
-
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/nodejs.sh"
--- a/coin/provisioning/qtci-macos-11-arm/40-qnx700.sh
+++ b/coin/provisioning/qtci-macos-11-arm/40-qnx700.sh
@@ -1,25 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2020 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# This script installs QNX 7.
-
-targetFolder="/opt/"
-sourceFile="/net/ci-files01-hki.ci.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
-folderName="qnx700"
-
-sudo mkdir -p "$targetFolder"
-
-echo "Extracting QNX 7"
-sudo tar -C "$targetFolder" -Jxf $sourceFile
-
-sudo chown -R qt:wheel "$targetFolder"/"$folderName"
-
-# Verify that we have last file in zip
-if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
-    exit 1
-fi
-
-# Set env variables
-echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc
-echo "QNX SDP = 7.0.0" >> ~/versions.txt
--- a/coin/provisioning/qtci-macos-11-arm/99-clean_gca_keys.sh
+++ b/coin/provisioning/qtci-macos-11-arm/99-clean_gca_keys.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+"$(dirname "$0")"/../common/macos/clean_gca_keys.sh
--- a/coin/provisioning/qtci-macos-11-x86_64/26-p7zip.sh
+++ b/coin/provisioning/qtci-macos-11-x86_64/26-p7zip.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
-#Copyright (C) 2023 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 7z to be used from command line
-
 set -ex

-brew update
-brew install p7zip
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/p7zip.sh"
--- a/coin/provisioning/qtci-macos-11-x86_64/99-clean_gca_keys.sh
+++ b/coin/provisioning/qtci-macos-11-x86_64/99-clean_gca_keys.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+"$(dirname "$0")"/../common/macos/clean_gca_keys.sh
--- a/coin/provisioning/qtci-macos-12-arm/24-pyenv.sh
+++ b/coin/provisioning/qtci-macos-12-arm/24-pyenv.sh
@@ -1,49 +1,8 @@
 #!/usr/bin/env bash
+#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

-#############################################################################
-##
-## Copyright (C) 2021 The Qt Company Ltd.
-## Copyright (C) 2017 Pelagicore AG
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
+set -ex

-# This script installs python3
-
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-
-# Try with default
-/opt/homebrew/bin/brew install pyenv
+# shellcheck source=../common/macos/install-pyenv.sh
+source "${BASH_SOURCE%/*}/../common/macos/install-pyenv.sh"
--- a/coin/provisioning/qtci-macos-12-arm/25-python.sh
+++ b/coin/provisioning/qtci-macos-12-arm/25-python.sh
@@ -23,9 +23,4 @@ SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
 # hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
 SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin"

-# QtWebengine still requires python2
-pyenv install 2.7.18
-SetEnvVar "PYTHON2_PATH" "/Users/qt/.pyenv/versions/2.7.18/bin/"
-
 echo "python3 = 3.9.7" >> ~/versions.txt
-echo "python2 = 2.7.18" >> ~/versions.txt
--- a/coin/provisioning/qtci-macos-12-arm/26-p7zip.sh
+++ b/coin/provisioning/qtci-macos-12-arm/26-p7zip.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
-#Copyright (C) 2023 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 7z to be used from command line
-
 set -ex

-brew update
-brew install p7zip
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/p7zip.sh"
--- a/coin/provisioning/qtci-macos-12-arm/30-nodejs.sh
+++ b/coin/provisioning/qtci-macos-12-arm/30-nodejs.sh
@@ -1,8 +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 nodejs
-
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/nodejs.sh"
--- a/coin/provisioning/qtci-macos-12-arm/40-qnx700.sh
+++ b/coin/provisioning/qtci-macos-12-arm/40-qnx700.sh
@@ -1,25 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2020 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# This script installs QNX 7.
-
-targetFolder="/opt/"
-sourceFile="/net/ci-files01-hki.ci.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
-folderName="qnx700"
-
-sudo mkdir -p "$targetFolder"
-
-echo "Extracting QNX 7"
-sudo tar -C "$targetFolder" -Jxf $sourceFile
-
-sudo chown -R qt:wheel "$targetFolder"/"$folderName"
-
-# Verify that we have last file in zip
-if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
-    exit 1
-fi
-
-# Set env variables
-echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc
-echo "QNX SDP = 7.0.0" >> ~/versions.txt
--- a/coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh
@@ -5,5 +5,5 @@
 set -ex

 source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
-#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
+#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
--- a/coin/provisioning/qtci-macos-12-arm/99-clean_gca_keys.sh
+++ b/coin/provisioning/qtci-macos-12-arm/99-clean_gca_keys.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+"$(dirname "$0")"/../common/macos/clean_gca_keys.sh
--- a/coin/provisioning/qtci-macos-12-x86_64/26-p7zip.sh
+++ b/coin/provisioning/qtci-macos-12-x86_64/26-p7zip.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
-#Copyright (C) 2023 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 7z to be used from command line
-
 set -ex

-brew update
-brew install p7zip
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/p7zip.sh"
--- a/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh
@@ -5,5 +5,5 @@
 set -ex

 source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
--- a/coin/provisioning/qtci-macos-12-x86_64/99-clean_gca_keys.sh
+++ b/coin/provisioning/qtci-macos-12-x86_64/99-clean_gca_keys.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+"$(dirname "$0")"/../common/macos/clean_gca_keys.sh
--- a/coin/provisioning/qtci-macos-13-arm/24-pyenv.sh
+++ b/coin/provisioning/qtci-macos-13-arm/24-pyenv.sh
@@ -1,49 +1,8 @@
 #!/usr/bin/env bash
+#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

-#############################################################################
-##
-## Copyright (C) 2021 The Qt Company Ltd.
-## Copyright (C) 2017 Pelagicore AG
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
+set -ex

-# This script installs python3
-
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-
-# Try with default
-/opt/homebrew/bin/brew install pyenv
+# shellcheck source=../common/macos/install-pyenv.sh
+source "${BASH_SOURCE%/*}/../common/macos/install-pyenv.sh"
--- a/coin/provisioning/qtci-macos-13-arm/25-python.sh
+++ b/coin/provisioning/qtci-macos-13-arm/25-python.sh
@@ -23,9 +23,4 @@ SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
 # hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
 SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin"

-# QtWebengine still requires python2
-pyenv install 2.7.18
-SetEnvVar "PYTHON2_PATH" "/Users/qt/.pyenv/versions/2.7.18/bin/"
-
 echo "python3 = 3.9.7" >> ~/versions.txt
-echo "python2 = 2.7.18" >> ~/versions.txt
--- a/coin/provisioning/qtci-macos-13-arm/26-p7zip.sh
+++ b/coin/provisioning/qtci-macos-13-arm/26-p7zip.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
-#Copyright (C) 2023 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 7z to be used from command line
-
 set -ex

-brew update
-brew install p7zip
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/p7zip.sh"
--- a/coin/provisioning/qtci-macos-13-arm/30-nodejs.sh
+++ b/coin/provisioning/qtci-macos-13-arm/30-nodejs.sh
@@ -1,8 +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 nodejs
-
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/nodejs.sh"
--- a/coin/provisioning/qtci-macos-13-arm/40-qnx700.sh
+++ b/coin/provisioning/qtci-macos-13-arm/40-qnx700.sh
@@ -1,25 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2020 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# This script installs QNX 7.
-
-targetFolder="/opt/"
-sourceFile="/net/ci-files01-hki.ci.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
-folderName="qnx700"
-
-sudo mkdir -p "$targetFolder"
-
-echo "Extracting QNX 7"
-sudo tar -C "$targetFolder" -Jxf $sourceFile
-
-sudo chown -R qt:wheel "$targetFolder"/"$folderName"
-
-# Verify that we have last file in zip
-if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
-    exit 1
-fi
-
-# Set env variables
-echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc
-echo "QNX SDP = 7.0.0" >> ~/versions.txt
--- a/coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh
@@ -5,5 +5,5 @@
 set -ex

 source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
-#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
+#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
--- a/coin/provisioning/qtci-macos-13-arm/99-clean_gca_keys.sh
+++ b/coin/provisioning/qtci-macos-13-arm/99-clean_gca_keys.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+"$(dirname "$0")"/../common/macos/clean_gca_keys.sh
--- a/coin/provisioning/qtci-macos-13-x86_64/26-p7zip.sh
+++ b/coin/provisioning/qtci-macos-13-x86_64/26-p7zip.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
-#Copyright (C) 2023 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 7z to be used from command line
-
 set -ex

-brew update
-brew install p7zip
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/p7zip.sh"
--- a/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh
@@ -5,5 +5,5 @@
 set -ex

 source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
--- a/coin/provisioning/qtci-macos-13-x86_64/99-clean_gca_keys.sh
+++ b/coin/provisioning/qtci-macos-13-x86_64/99-clean_gca_keys.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+"$(dirname "$0")"/../common/macos/clean_gca_keys.sh
--- a/coin/provisioning/qtci-macos-14-arm/24-pyenv.sh
+++ b/coin/provisioning/qtci-macos-14-arm/24-pyenv.sh
@@ -1,49 +1,8 @@
 #!/usr/bin/env bash
+#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

-#############################################################################
-##
-## Copyright (C) 2021 The Qt Company Ltd.
-## Copyright (C) 2017 Pelagicore AG
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
+set -ex

-# This script installs python3
-
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-
-# Try with default
-/opt/homebrew/bin/brew install pyenv
+# shellcheck source=../common/macos/install-pyenv.sh
+source "${BASH_SOURCE%/*}/../common/macos/install-pyenv.sh"
--- a/coin/provisioning/qtci-macos-14-arm/26-p7zip.sh
+++ b/coin/provisioning/qtci-macos-14-arm/26-p7zip.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
-#Copyright (C) 2023 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 7z to be used from command line
-
 set -ex

-brew update
-brew install p7zip
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/p7zip.sh"
--- a/coin/provisioning/qtci-macos-14-arm/30-nodejs.sh
+++ b/coin/provisioning/qtci-macos-14-arm/30-nodejs.sh
@@ -1,8 +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 nodejs
-
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/nodejs.sh"
--- a/coin/provisioning/qtci-macos-14-arm/40-qnx700.sh
+++ b/coin/provisioning/qtci-macos-14-arm/40-qnx700.sh
@@ -1,25 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2020 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# This script installs QNX 7.
-
-targetFolder="/opt/"
-sourceFile="/net/ci-files01-hki.ci.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
-folderName="qnx700"
-
-sudo mkdir -p "$targetFolder"
-
-echo "Extracting QNX 7"
-sudo tar -C "$targetFolder" -Jxf $sourceFile
-
-sudo chown -R qt:wheel "$targetFolder"/"$folderName"
-
-# Verify that we have last file in zip
-if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
-    exit 1
-fi
-
-# Set env variables
-echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc
-echo "QNX SDP = 7.0.0" >> ~/versions.txt
--- a/coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh
@@ -5,5 +5,5 @@
 set -ex

 source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
--- a/coin/provisioning/qtci-macos-14-arm/99-clean_gca_keys.sh
+++ b/coin/provisioning/qtci-macos-14-arm/99-clean_gca_keys.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+"$(dirname "$0")"/../common/macos/clean_gca_keys.sh
--- a/coin/provisioning/qtci-macos-14-x86_64/26-p7zip.sh
+++ b/coin/provisioning/qtci-macos-14-x86_64/26-p7zip.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
-#Copyright (C) 2023 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 7z to be used from command line
-
 set -ex

-brew update
-brew install p7zip
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/p7zip.sh"
--- a/coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh
@@ -5,5 +5,5 @@
 set -ex

 source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
-source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
--- a/coin/provisioning/qtci-macos-14-x86_64/99-clean_gca_keys.sh
+++ b/coin/provisioning/qtci-macos-14-x86_64/99-clean_gca_keys.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+"$(dirname "$0")"/../common/macos/clean_gca_keys.sh
--- a/coin/provisioning/qtci-macos-15-arm/24-pyenv.sh
+++ b/coin/provisioning/qtci-macos-15-arm/24-pyenv.sh
@@ -1,49 +1,8 @@
 #!/usr/bin/env bash
+#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

-#############################################################################
-##
-## Copyright (C) 2021 The Qt Company Ltd.
-## Copyright (C) 2017 Pelagicore AG
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
+set -ex

-# This script installs python3
-
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-
-# Try with default
-/opt/homebrew/bin/brew install pyenv
+# shellcheck source=../common/macos/install-pyenv.sh
+source "${BASH_SOURCE%/*}/../common/macos/install-pyenv.sh"
--- a/coin/provisioning/qtci-macos-15-arm/25-python.sh
+++ b/coin/provisioning/qtci-macos-15-arm/25-python.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2021 The Qt Company Ltd.
+# Copyright (C) 2025 The Qt Company Ltd.
 # Copyright (C) 2017 Pelagicore AG
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

@@ -8,13 +8,13 @@
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"

-pyenv install 3.9.7
+pyenv install 3.12.11

-/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib
-/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt
+/Users/qt/.pyenv/versions/3.12.11/bin/pip3 install --user virtualenv wheel html5lib
+/Users/qt/.pyenv/versions/3.12.11/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt

-SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
-SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
+SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.12.11/bin/"
+SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.12.11/bin/"
 # Use 3.9 as a default python
 SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"

@@ -23,4 +23,4 @@ SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH"
 # hence the explicit assignment to SBOM_PYTHON_APPS_PATH.
 SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin"

-echo "python3 = 3.9.7" >> ~/versions.txt
+echo "python3 = 3.12.11" >> ~/versions.txt
--- a/coin/provisioning/qtci-macos-15-arm/26-p7zip.sh
+++ b/coin/provisioning/qtci-macos-15-arm/26-p7zip.sh
@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
-#Copyright (C) 2023 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 7z to be used from command line
-
 set -ex

-brew update
-brew install p7zip
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/p7zip.sh"
--- a/coin/provisioning/qtci-macos-15-arm/30-nodejs.sh
+++ b/coin/provisioning/qtci-macos-15-arm/30-nodejs.sh
@@ -1,8 +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 nodejs
-
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/nodejs.sh"
--- a/coin/provisioning/qtci-macos-15-arm/40-qnx700.sh
+++ b/coin/provisioning/qtci-macos-15-arm/40-qnx700.sh
@@ -1,25 +0,0 @@
-#!/bin/bash
-# Copyright (C) 2020 The Qt Company Ltd.
-# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
-
-# This script installs QNX 7.
-
-targetFolder="/opt/"
-sourceFile="/net/ci-files01-hki.ci.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
-folderName="qnx700"
-
-sudo mkdir -p "$targetFolder"
-
-echo "Extracting QNX 7"
-sudo tar -C "$targetFolder" -Jxf $sourceFile
-
-sudo chown -R qt:wheel "$targetFolder"/"$folderName"
-
-# Verify that we have last file in zip
-if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
-    exit 1
-fi
-
-# Set env variables
-echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc
-echo "QNX SDP = 7.0.0" >> ~/versions.txt
--- a/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh
+++ b/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh
@@ -5,5 +5,5 @@
 set -ex

 source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal"
-#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64"
+#source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" "use_16kb_page_size"
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh"
--- a/coin/provisioning/qtci-macos-15-arm/99-clean_gca_keys.sh
+++ b/coin/provisioning/qtci-macos-15-arm/99-clean_gca_keys.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+"$(dirname "$0")"/../common/macos/clean_gca_keys.sh
--- a/Show More
+++ b/Show More