Update macOS from 12 to 14 in qtsaferenderer.yaml

Pick-to: 6.8
Change-Id: Ie03a14449e941a71acc58e5de78b980690ce221f
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>

.gitmodules

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

.gitreview

@@ -1,4 +0,0 @@
-[gerrit]
-host=codereview.qt-project.org
-project=qt/qt5
-defaultbranch=dev

coin/platform_configs/cmake_platforms.yaml

@@ -130,7 +130,7 @@ Configurations:
     ]
 -
     Id: 'windows-10_22h2-msvc2022'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'MSVC2022'
     Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -226,7 +226,7 @@ Configurations:
     ]
 -
     Id: 'windows-10_22h2-mingw13'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'Mingw'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
     Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
@@ -289,16 +289,3 @@ Configurations:
         'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse',
         'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
     ]
--
-    Id: 'bookworm-gles-arm64-debian-pkg-packaging'
-    Template: 'qtci-linux-Debian-11.6-aarch64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
-    Environment variables: [
-        'DEBIAN_RULES_REF=6.8_gles',
-        'COIN_TARGET_DIST=tqtc-bookworm',
-        'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
-        'COIN_SBUILD_CHROOT=stable-arm64-sbuild',
-        'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main',
-        'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
-    ]

coin/platform_configs/cmake_platforms_static_release.yaml

@@ -53,7 +53,7 @@ Configurations:
     Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'MinimalStaticTests']
     Configure arguments: '-static -nomake examples -release -no-framework -no-icu -qt-doubleconversion -no-feature-sql-psql'
     Environment variables: [
-        'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
+        'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
         'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF',
         'Protobuf_ROOT=/usr/local/lib/cmake/protobuf'
     ]

coin/platform_configs/cmake_platforms_target_android.yaml

@@ -17,7 +17,7 @@ Configurations:
     ]
 -
     Id: 'android-armv7-on-windows'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Target os: 'Android_ANY'
     Target arch: 'armv7'
     Compiler: 'Mingw'
@@ -48,7 +48,7 @@ Configurations:
         'ANDROID_EMULATOR=emulator_x86_api_28'
     ]
 -
-    Id: 'android-15-x86_64-on-linux'
+    Id: 'android-14-x86_64-on-linux'
     Template: 'qtci-linux-RHEL-8.10-x86_64-51'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
@@ -56,6 +56,22 @@ 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_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
+        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
+        'ANDROID_EMULATOR=emulator_x86_64_api_34'
+    ]
+-
+    Id: 'android-15-x86_64-on-linux'
+    Template: 'qtci-linux-RHEL-8.10-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'rhel-8.10'
+    Features: ['Packaging', '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_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',

coin/platform_configs/cmake_platforms_wasm.yaml

@@ -14,7 +14,7 @@ Configurations:
     ]
 -
     Id: 'webassembly-windows'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Target os: 'WebAssembly'
     Compiler: 'Mingw'
     Target compiler: 'Clang'

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-14-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-14-x86_64-on-linux',
         'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
         'ANDROID_EMULATOR=emulator_x86_api_28'
     ]

coin/platform_configs/macos.yaml

@@ -15,7 +15,7 @@ Configurations:
         Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
         Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
         Environment variables: [
-            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
+            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
             'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_FEATURE_open62541_security=OFF',
             'Protobuf_ROOT=/usr/local/lib/cmake/protobuf'
         ]

coin/platform_configs/nightly_qnx710_host_windows.yaml

@@ -7,7 +7,7 @@ Include: [
 Configurations:
 -
     Id: 'qnx-710-arm64-on-windows'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Target os: 'QNX_710'
     Target arch: 'arm64'
     Compiler: 'MSVC2019'

coin/platform_configs/qmake2cmake.yaml

@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'MSVC2019'
     Features: ['DisableTests']
 -

coin/platform_configs/qt-creator.yaml

@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-11_23H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'DebugAndRelease']
     Configure arguments: ''
@@ -15,7 +15,7 @@ Configurations:
     Configure arguments: ''
     Environment variables: []
 -
-    Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
+    Template: 'qtci-linux-Debian-11.6-aarch64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'DebugAndRelease']
     Configure arguments: ''
@@ -28,7 +28,7 @@ Configurations:
     Environment variables: []
 # without tests
 -
-    Template: 'qtci-windows-11_23H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'DebugAndRelease', 'DisableTests']
     Configure arguments: ''
@@ -36,7 +36,7 @@ Configurations:
     Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
 # oldest Qt version
 -
-    Template: 'qtci-windows-11_23H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'MSVC2022'
     Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
     Configure arguments: ''

coin/platform_configs/qtsaferenderer.yaml

@@ -70,7 +70,7 @@ Configurations:
     ]
 -
     Id: 'Windows-MSVC2022_Static'
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'MSVC2022'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
     Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql'

coin/platform_configs/qtwebkit.yaml

@@ -1,7 +1,7 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-windows-10_22H2-x86_64-53'
+    Template: 'qtci-windows-10_22H2-x86_64-52'
     Compiler: 'Mingw'
     Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH']
     Features: ['Packaging', UseLegacyInstructions']

coin/platform_configs/tqtc-android-automotive.yaml

@@ -13,7 +13,7 @@ Include: [
         'android-arm64-on-macos',
         'android-armv7-on-windows',
         'android-9-x86-on-linux',
-        'android-15-x86_64-on-linux'
+        'android-14-x86_64-on-linux'
     ]
 ]
 Configurations:

coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt

@@ -56,10 +56,6 @@ Windows 10 SDK (10.0.22000.0)
 Windows 10 SDK (10.0.22621.0)
 Windows Universal C Runtime
 
-Windows SDK (10.0.26100.1742) was later downloaded and installed from:
-https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
-# COIN-1206
-
 # NOTE! Work loads were added during installation!
 
 ############################################################

coin/provisioning/common/linux/android_linux.sh

@@ -26,13 +26,18 @@ toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
 ndkVersionLatest="r26b"
 ndkVersionDefault=$ndkVersionLatest
-sdkBuildToolsVersion="35.0.1"
-sdkApiLevel="android-35"
+sdkBuildToolsVersion="34.0.0"
+sdkApiLevel="android-34"
 
 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
 ndkSha1Latest="fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4"
 ndkSha1Default=$ndkSha1Latest
 
+# Android 14 avd zip
+android14SystemZipName="android14system_UE1A_230829_036.tar.gz"
+android14SystemZipSha="ede80c6901e8fad1895c97a86542b8e072bb1ee5"
+android14SystemPath="$basePath/$android14SystemZipName"
+
 # Android Automotive max SDK level image
 sdkApiLevelAutomotiveMax="android-34"
 androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
@@ -157,20 +162,13 @@ 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/"
-maxVersionFilePath="$maxVersionDestination/$maxVersionFileName"
-maxVersionCiUrl="$basePath/system-images/google_apis/$maxVersionFileName"
-maxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$maxVersionFileName"
-maxVersionSha1="d79169884cabc6680cb29d32c2112ad46c858c1b"
+echo "y" | ./sdkmanager --install "system-images;android-35;google_apis;x86_64" \
+    | eval "$sdkmanager_no_progress_bar_cmd"
 
-mkdir -p "$maxVersionDestination"
-DownloadURL "$maxVersionCiUrl" "$maxVersionUrl" "$maxVersionSha1" "$maxVersionFilePath"
-
-echo "Unzipping the Android 15 to $maxVersionDestination"
-sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination"
-rm "$maxVersionFilePath"
+echo "Extract stored Android 14 Beta $android14SystemZipName"
+DownloadURL "$android14SystemPath" "$android14SystemPath" "$android14SystemZipSha" \
+    "/tmp/$android14SystemZipName"
+sudo tar -xzf "/tmp/$android14SystemZipName" -C "$sdkTargetFolder/system-images"
 
 echo "Checking the contents of Android SDK again..."
 ls -l "$sdkTargetFolder"
@@ -178,6 +176,9 @@ ls -l "$sdkTargetFolder"
 echo "no" | ./avdmanager create avd -n emulator_x86_api_28 -c 2048M -f \
     -k "system-images;android-28;google_apis;x86"
 
+echo "no" | ./avdmanager create avd -n emulator_x86_64_api_34 -c 2048M -f \
+    -k "system-images;android-34;google_apis;x86_64"
+
 echo "no" | ./avdmanager create avd -n emulator_x86_64_api_35 -c 2048M -f \
     -k "system-images;android-35;google_apis;x86_64"
 

coin/provisioning/common/macos/android.sh

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersionLatest="r26b"
 ndkVersionDefault="$ndkVersionLatest"
-sdkBuildToolsVersion="35.0.1"
+sdkBuildToolsVersion="34.0.0"
 # this is compile sdk version
-sdkApiLevel="android-35"
+sdkApiLevel="android-34"
 
 toolsSourceFile="$basePath/$toolsFile"
 

coin/provisioning/common/macos/libiodbc.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright (C) 2025 The Qt Company Ltd.
+# Copyright (C) 2018 The Qt Company Ltd.
 # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 # Install libiodbc
@@ -11,9 +11,12 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 brew install --formula "${BASH_SOURCE%/*}/libiodbc.rb" "$@"
 
+# CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc
+
 read -r -a arr <<< "$(brew list --versions libiodbc)"
 version=${arr[1]}
 
-SetEnvVar "ODBC_ROOT" "$(brew --prefix libiodbc)"
+SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include${CPLUS_INCLUDE_PATH:+:}${CPLUS_INCLUDE_PATH}"
+SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib${LIBRARY_PATH:+:}${LIBRARY_PATH}"
 
 echo "libiodbc = $version" >> ~/versions.txt

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

@@ -19,7 +19,6 @@ ffmpeg_name="FFmpeg-$version"
 target_dir="$HOME"
 ffmpeg_source_dir="$target_dir/$ffmpeg_name"
 prefix="/usr/local/ios/ffmpeg"
-dylib_regex="^@rpath/.*\.dylib$"
 
 if [ ! -d "$ffmpeg_source_dir" ];
 then
@@ -29,49 +28,48 @@ fi
 ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
 
 build_ffmpeg_ios() {
-    local target_platform=$1
-    if [ "$target_platform" == "arm64-simulator" ]; then
-        target_sdk="iphonesimulator"
-        target_platform="arm64"
-        minos="-mios-simulator-version-min=16.0"
-    else
-        target_sdk="iphoneos"
-        target_platform="arm64"
-        minos="-miphoneos-version-min=16.0"
-    # TODO: consider non-arm simulator?
-    fi
+  local target_arch=$1
 
-    # Note: unlike similar install-ffmpeg scripts, not $target_platform,
-    # but $1 (which can be arm64-simulator with arm64 target_platform).
-    local build_dir="$ffmpeg_source_dir/build_ios/$1"
-    sudo mkdir -p "$build_dir"
-    pushd "$build_dir"
+  if [ "$target_arch" == "x86_64" ]; then
+     target_sdk="iphonesimulator"
+     target_arch="x86_64"
+     minos="-mios-simulator-version-min=13.0"
+  else
+     target_sdk="iphoneos"
+     target_arch="arm64"
+     minos="-miphoneos-version-min=13.0"
+  fi
 
-    # shellcheck disable=SC2086
-    sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \
+  local build_dir="$ffmpeg_source_dir/build_ios/$target_arch"
+  sudo mkdir -p "$build_dir"
+  pushd "$build_dir"
+
+  # shellcheck disable=SC2086
+  sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \
     --sysroot="$(xcrun --sdk "$target_sdk" --show-sdk-path)" \
-    --enable-cross-compile \
-    --enable-optimizations \
-    --prefix=$prefix \
-    --arch=$target_platform \
-    --cc="xcrun --sdk ${target_sdk} clang -arch $target_platform" \
-    --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_platform" \
-    --ar="$(xcrun --sdk ${target_sdk} --find ar)" \
-    --ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \
-    --strip="$(xcrun --sdk ${target_sdk} --find strip)" \
-    --nm="$(xcrun --sdk ${target_sdk} --find nm)" \
-    --target-os=darwin \
-    --extra-ldflags="$minos" \
-    --enable-cross-compile \
-    --enable-shared \
-    --disable-static \
-    --install-name-dir='@rpath' \
-    --enable-swscale \
-    --enable-pthreads \
-    --disable-audiotoolbox
+  --enable-cross-compile \
+  --enable-optimizations \
+  --prefix=$prefix \
+  --arch=$target_arch \
+  --cc="xcrun --sdk ${target_sdk} clang -arch $target_arch" \
+  --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_arch" \
+  --ar="$(xcrun --sdk ${target_sdk} --find ar)" \
+  --ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \
+  --strip="$(xcrun --sdk ${target_sdk} --find strip)" \
+  --nm="$(xcrun --sdk ${target_sdk} --find nm)" \
+  --target-os=darwin \
+  --extra-cflags="$minos" \
+  --extra-cxxflags="$minos" \
+  --enable-cross-compile \
+  --enable-shared \
+  --disable-static \
+  --install-name-dir='@rpath/Frameworks' \
+  --enable-swscale \
+  --enable-pthreads \
+  --disable-audiotoolbox
 
-    sudo make install DESTDIR="$build_dir/installed" -j4
-    popd
+  sudo make install DESTDIR="$build_dir/installed" -j4
+  popd
 }
 
 install_ffmpeg() {
@@ -100,106 +98,11 @@ install_ffmpeg() {
         popd >/dev/null
     done
     sudo cp -r $1$prefix/include $prefix
+    echo "LS done."
 }
 
-build_info_plist() {
-    local file_path="$1"
-    local framework_name="$2"
-    local framework_id="$3"
-
-    local minimum_version_key="MinimumOSVersion"
-    local minimum_os_version="16.0"
-    local supported_platforms="iPhoneOS"
-
-    info_plist="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-    <key>CFBundleDevelopmentRegion</key>
-    <string>en</string>
-    <key>CFBundleExecutable</key>
-    <string>${framework_name}</string>
-    <key>CFBundleIdentifier</key>
-    <string>${framework_id}</string>
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-    <key>CFBundleName</key>
-    <string>${framework_name}</string>
-    <key>CFBundlePackageType</key>
-    <string>FMWK</string>
-    <key>CFBundleShortVersionString</key>
-    <string>7.0.2</string>
-    <key>CFBundleVersion</key>
-    <string>7.0.2</string>
-    <key>CFBundleSignature</key>
-    <string>????</string>
-    <key>${minimum_version_key}</key>
-    <string>${minimum_os_version}</string>
-    <key>CFBundleSupportedPlatforms</key>
-    <array>
-        <string>${supported_platforms}</string>
-    </array>
-    <key>NSPrincipalClass</key>
-    <string></string>
-</dict>
-</plist>"
-    echo $info_plist | sudo tee ${file_path} 1>/dev/null
-}
-
-create_framework() {
-    # Create a 'traditional' framework from the corresponding dylib.
-    local framework_name="$1"
-    local platform="$2" # For now it's either arm64 or arm64-simulator, see below.
-    local ffmpeg_library_path="$ffmpeg_source_dir/build_ios/${platform}/installed/usr/local/ios/ffmpeg"
-    local framework_complete_path="${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
-
-    sudo mkdir -p "${ffmpeg_library_path}/framework/${framework_name}.framework"
-    sudo cp "${ffmpeg_library_path}/lib/${framework_name}.dylib" "${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
-
-    # Fix LC_ID_DYLIB (to be libavcodec.framework/libavcodec instead of @rpath/libavcodec.xx.yy.dylib
-    sudo install_name_tool -id @rpath/${framework_name}.framework/${framework_name} "${framework_complete_path}"
-
-    build_info_plist "${ffmpeg_library_path}/framework/${framework_name}.framework/Info.plist" "${framework_name}" "io.qt.ffmpegkit."${framework_name}
-
-    # Fix all FFmpeg-related LC_LOAD_DYLIB, similar to how we fixed LC_ID_DYLIB above:
-    otool -L "$framework_complete_path" | awk '/\t/ {print $1}' | egrep "$dylib_regex" | while read -r dependency_path; do
-        found_name=$(tmp=${dependency_path/*\/}; echo ${tmp/\.*})
-        if [ "$found_name" != "$framework_name" ]
-        then
-            sudo install_name_tool -change "$dependency_path" @rpath/${found_name}.framework/${found_name} "${framework_complete_path}"
-        fi
-    done
-    #sudo mkdir -p "$prefix/framework/"
-    #sudo cp -r "${ffmpeg_library_path}/framework/${framework_name}.framework" "$prefix/framework/"
-}
-
-create_xcframework() {
-    # Create 'traditional' framework from the corresponding dylib,
-    # also creating
-    local framework_name="$1"
-
-    local fw1="$ffmpeg_source_dir/build_ios/arm64/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework"
-    local fw2="$ffmpeg_source_dir/build_ios/arm64-simulator/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework"
-
-    sudo mkdir -p "$prefix/framework/"
-    sudo xcodebuild -create-xcframework -framework $fw1 -framework $fw2 -output "${prefix}/framework/${framework_name}.xcframework"
-}
-
-build_ffmpeg_ios "arm64-simulator"
+build_ffmpeg_ios "x86_64"
 build_ffmpeg_ios "arm64"
 
-ffmpeg_libs="libavcodec libavdevice libavfilter libavformat libavutil libswresample libswscale"
-
-for name in $ffmpeg_libs; do
-    create_framework $name "arm64"
-    create_framework $name "arm64-simulator"
-done
-
-# Create corresponding (xc)frameworks containing both arm64 and arm64-simulator frameworks:
-for name in $ffmpeg_libs; do
-    create_xcframework $name
-done
-
-install_ffmpeg "$ffmpeg_source_dir/build_ios/arm64/installed"
-
+install_ffmpeg "$ffmpeg_source_dir/build_ios/x86_64/installed" "$ffmpeg_source_dir/build_ios/arm64/installed"
 SetEnvVar "FFMPEG_DIR_IOS" $prefix

coin/provisioning/common/windows/android.ps1

@@ -24,8 +24,8 @@ $ndkZip = "C:\Windows\Temp\android_ndk.zip"
 $toolsVersion = "2.1"
 $toolsFile = "commandlinetools-win-6609375_latest.zip"
 $sdkApi = "ANDROID_API_VERSION"
-$sdkApiLevel = "android-35"
-$sdkBuildToolsVersion = "35.0.1"
+$sdkApiLevel = "android-34"
+$sdkBuildToolsVersion = "34.0.0"
 $toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile"
 $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
 $toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"

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

@@ -5,24 +5,24 @@
 
 # This script installs 7-Zip
 
-$version = "24.09"
-$nonDottedVersion = "2409"
+$version = "23.01"
+$nonDottedVersion = "2301"
 
 $cpu_arch = Get-CpuArchitecture
 switch ($cpu_arch) {
     arm64 {
         $arch = "-arm64"
-        $sha1 = "2f5aaa22a4a591b01a1b06c17565233f0cd70429"
+        $sha1 = "be65c2ea6119c04945c66b13413892f2bb03d9a7"
         Break
     }
     x64 {
         $arch = "-x64"
-        $sha1 = "28b53835fe92c3fa6e0c422fc3b17c6bc1cb27e0"
+        $sha1 = "7DF28D340D7084647921CC25A8C2068BB192BDBB"
         Break
     }
     x86 {
         $arch = ""
-        $sha1 = "2135a90a9f6c3202c32a87b1c5cf805ce294a497"
+        $sha1 = "D5D00E6EA8B8E68CE7A704FD478DC950E543C25C"
         Break
     }
     default {

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

@@ -154,8 +154,6 @@ installPackages+=(zip)
 installPackages+=(perl-IPC-Cmd)
 # password management support for Qt Creator
 installPackages+=(libsecret-devel)
-# For tst_license.pl with all the machines generating SBOM
-installPackages+=(perl-JSON)
 
 sudo yum -y install "${installPackages[@]}"
 

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

@@ -167,8 +167,6 @@ installPackages+=(perl-IPC-Cmd)
 installPackages+=(libsecret-devel)
 # For Firebird in RTA
 installPackages+=(libtommath-devel)
-# For tst_license.pl with all the machines generating SBOM
-installPackages+=(perl-JSON)
 
 sudo yum -y install "${installPackages[@]}"
 

coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh

@@ -107,9 +107,6 @@ sudo zypper -nq install openssl-3
 # cifs-utils, for mounting smb drive
 sudo zypper -nq install cifs-utils
 
-# For tst_license.pl with all the machines generating SBOM
-sudo zypper -nq install perl-JSON
-
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt
 

coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh

@@ -238,9 +238,6 @@ installPackages+=(jq)
 
 installPackages+=(patchelf)
 
-# For tst_license.pl with all the machines generating SBOM
-installPackages+=(libjson-perl)
-
 echo "Running update for apt"
 waitLoop
 sudo apt-get update

coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh

@@ -48,8 +48,9 @@ sudo zypper -nq install libxml2-devel libxslt-devel
 # yasm (for ffmpeg in multimedia)
 sudo zypper -nq install yasm
 
-# pulseaudio (qtmultimedia)
-sudo zypper -nq install libpulse-devel pipewire-devel
+# GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia)
+sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel \
+         gstreamer-1.20-plugin-openh264 gstreamer-plugins-bad-devel
 
 # cups
 sudo zypper -nq install cups-devel
@@ -81,9 +82,6 @@ sudo zypper -nq install cifs-utils
 # Java
 sudo zypper -nq install java-17-openjdk
 
-# For tst_license.pl with all the machines generating SBOM
-sudo zypper -nq install perl-JSON
-
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt
 

coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersion="r26b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="35.0.1"
+sdkBuildToolsVersion="34.0.0"
 # this is compile sdk version
-sdkApiLevel="android-35"
+sdkApiLevel="android-34"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

coin/provisioning/qtci-macos-11-arm/30-android.sh

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersion="r26b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="35.0.1"
+sdkBuildToolsVersion="34.0.0"
 # this is compile sdk version
-sdkApiLevel="android-35"
+sdkApiLevel="android-34"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

coin/provisioning/qtci-macos-11-x86_64/30-android.sh

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersion="r26b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="35.0.1"
+sdkBuildToolsVersion="34.0.0"
 # this is compile sdk version
-sdkApiLevel="android-35"
+sdkApiLevel="android-34"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

coin/provisioning/qtci-macos-12-arm/30-android.sh

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersion="r26b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="35.0.1"
+sdkBuildToolsVersion="34.0.0"
 # this is compile sdk version
-sdkApiLevel="android-35"
+sdkApiLevel="android-34"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

coin/provisioning/qtci-macos-12-arm/30-nodejs.sh

@@ -2,10 +2,7 @@
 #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
 
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-
 set -ex
 
-brew install node@22
-SetEnvVar "PATH" "/opt/homebrew/opt/node@22/bin:\$PATH"
+brew install nodejs
+

coin/provisioning/qtci-macos-13-arm/30-android.sh

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersion="r26b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="35.0.1"
+sdkBuildToolsVersion="34.0.0"
 # this is compile sdk version
-sdkApiLevel="android-35"
+sdkApiLevel="android-34"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

coin/provisioning/qtci-macos-14-arm/30-android.sh

@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersion="r26b"
 ndkFile="android-ndk-$ndkVersion-darwin.zip"
-sdkBuildToolsVersion="35.0.1"
+sdkBuildToolsVersion="34.0.0"
 # this is compile sdk version
-sdkApiLevel="android-35"
+sdkApiLevel="android-34"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"