Update submodules on '6.5 in qt/qt5'

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

.gitmodules

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

coin/platform_configs/address_sanitizer_platforms.yaml

@@ -1,12 +1,13 @@
 Version: 2
 Configurations:
 -
-    Id: 'OpenSUSE-15.4-host-ASAN'
+    Id: 'opensuse-15.4-host-asan'
     Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer']
     Configure arguments: '-nomake examples -developer-build'
     Environment variables: [
         'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
-        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer'
+        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
     ]

coin/platform_configs/cmake_platforms.yaml

@@ -8,13 +8,14 @@ Include: [
     ]
 Configurations:
 -
+    Id: 'ubuntu-20.04-documentation'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
     Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
     Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
 -
-    Id: 'Ubuntu-20.04-host'
+    Id: 'ubuntu-20.04'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'UseConfigure']
@@ -24,16 +25,18 @@ Configurations:
         'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
     ]
 -
-    Id: 'OpenSUSE-15.4-host'
+    Id: 'opensuse-15.4-developer-build'
     Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
     Configure arguments: '-nomake examples -developer-build'
     Environment variables: [
         'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
-        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer'
+        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
+        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
     ]
 -
+    Id: 'sles-15_sp4-static'
     Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'DisableTests', 'UseConfigure']
@@ -42,6 +45,7 @@ Configurations:
         'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
     ]
 -
+    Id: 'windows-10_22h2-msvc2019'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'MSVC2019'
     Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
@@ -55,6 +59,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
+    Id: 'windows-11_22h2-msvc2019'
     Template: 'qtci-windows-11_22H2-x86_64-50'
     Compiler: 'MSVC2019'
     Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
@@ -67,6 +72,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
+    Id: 'windows-10_22h2-msvc2022'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'MSVC2022'
     Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
@@ -79,6 +85,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
+    Id: 'windows-11_22h2-msvc2022'
     Template: 'qtci-windows-11_22H2-x86_64-50'
     Compiler: 'MSVC2022'
     Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
@@ -91,7 +98,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
-    Id: 'Windows10_22H2-MSVC2019-x64-host'
+    Id: 'windows-10_22h2-msvc2019-developer-build'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'MSVC2019'
     Features: ['Sccache', 'Conan', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
@@ -104,11 +111,12 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
+    Id: 'windows-10_22h2-msvc2019-arm64'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'MSVC2019'
     Target arch: 'arm64'
     Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
-    Platform dependency: 'Windows10_22H2-MSVC2019-x64-host'
+    Platform dependency: 'windows-10_22h2-msvc2019-developer-build'
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
         'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
@@ -121,7 +129,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
-    Id: 'Windows11_22H2-MSVC2019-x64-host'
+    Id: 'windows-11_22h2-msvc2019-developer-build'
     Template: 'qtci-windows-11_22H2-x86_64-50'
     Compiler: 'MSVC2019'
     Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
@@ -133,11 +141,12 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
+    Id: 'windows-11_22h2-msvc2019-arm64'
     Template: 'qtci-windows-11_22H2-x86_64-50'
     Compiler: 'MSVC2019'
     Target arch: 'arm64'
     Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
-    Platform dependency: 'Windows11_22H2-MSVC2019-x64-host'
+    Platform dependency: 'windows-11_22h2-msvc2019-developer-build'
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
         'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
@@ -147,7 +156,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
-    Id: 'RHEL-8.4-host'
+    Id: 'rhel-8.4'
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Compiler: 'GCC'
     Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies']
@@ -164,7 +173,7 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-universal-on-x86_64'
     Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
@@ -172,7 +181,7 @@ Configurations:
         'CONAN_PROFILE=coin/conan/profiles/ci-macos-ios-arm64-clang'
     ]
 -
-    Id: 'Windows10_22H2-Mingw11-x64-host'
+    Id: 'windows-10_22h2-mingw11'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'Mingw'
     Features: ['Packaging', 'Sccache', 'UseConfigure']
@@ -187,7 +196,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
     ]
 -
-    Id: 'Windows10_22H2-LLVM-x64-host'
+    Id: 'windows-10_22h2-llvm'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'Clang'
     Features: ['Sccache', 'UseConfigure']
@@ -201,7 +210,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
     ]
 -
-    Id: 'Windows11_22H2-LLVM-x64-host'
+    Id: 'windows-11_22h2-llvm'
     Template: 'qtci-windows-11_22H2-x86_64-50'
     Compiler: 'Clang'
     Features: ['Sccache', 'UseConfigure']
@@ -215,6 +224,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
     ]
 -
+    Id: 'windows-10_22h2-mingw11-developer-build'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'Mingw'
     Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
@@ -228,6 +238,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
     ]
 -
+    Id: 'windows-11_22h2-mingw11-developer-build'
     Template: 'qtci-windows-11_22H2-x86_64-50'
     Compiler: 'Mingw'
     Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']

coin/platform_configs/cmake_platforms_qemu.yaml

@@ -1,12 +1,12 @@
 Version: 2
 Configurations:
 -
-    Id: 'qemu-armv7-on-ubuntu20.04'
+    Id: 'qemu-armv7-developer-build'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QEMU'
     Target arch: 'armv7'
     Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-20.04-host'
+    Platform dependency: 'ubuntu-20.04'
     Features: ['Sccache', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
@@ -18,11 +18,12 @@ Configurations:
         'QT_QUICK_BACKEND=software',
     ]
 -
+    Id: 'qemu-arm64-developer-build'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QEMU'
     Target arch: 'arm64'
     Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-20.04-host'
+    Platform dependency: 'ubuntu-20.04'
     Features: ['Sccache', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
@@ -34,11 +35,12 @@ Configurations:
         'QT_QUICK_BACKEND=software',
     ]
 -
+    Id: 'qemu-mips64-developer-build'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QEMU'
     Target arch: 'mips64'
     Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-20.04-host'
+    Platform dependency: 'ubuntu-20.04'
     Features: ['Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',

coin/platform_configs/cmake_platforms_qemu_qnx710.yaml

@@ -1,13 +1,13 @@
 Version: 2
 Configurations:
 -
-    Id: 'qnx-x86_64-on-ubuntu20.04'
+    Id: 'qnx-710-x86_64-developer-build-on-linux'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QNX_710'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-20.04-host'
+    Platform dependency: 'ubuntu-20.04'
     Features: ['Packaging', 'VMSize8', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
@@ -16,24 +16,26 @@ Configurations:
         'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
     ]
 -
+    Id: 'qnx-710-arm64-on-linux'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QNX_710'
     Target arch: 'arm64'
     Compiler: 'GCC'
     Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-20.04-host'
+    Platform dependency: 'ubuntu-20.04'
     Features: ['Packaging', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
     ]
 -
+    Id: 'qnx-710-armv7-on-linux'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QNX_710'
     Target arch: 'armv7'
     Compiler: 'GCC'
     Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-20.04-host'
+    Platform dependency: 'ubuntu-20.04'
     Features: ['Packaging', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',

coin/platform_configs/cmake_platforms_static_tests.yaml

@@ -1,7 +1,7 @@
 Version: 2
 Configurations:
 -
-    Id: 'sles-15-static'
+    Id: 'sles-15_sp4-minimal-static'
     Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
@@ -10,6 +10,7 @@ Configurations:
         'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
     ]
 -
+    Id: 'windows-10_22h2-minimal-static'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'MSVC2019'
     Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
@@ -21,6 +22,7 @@ Configurations:
         'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
     ]
 -
+    Id: 'macos-11-minimal-static'
     Template: 'qtci-macos-11-x86_64-105'
     Compiler: 'Clang'
     Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']

coin/platform_configs/cmake_platforms_target_android.yaml

@@ -7,7 +7,7 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-universal-on-x86_64'
     Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     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 arm64-v8a',
@@ -18,12 +18,13 @@ Configurations:
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
+    Id: 'android-armv7-on-windows'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'armv7'
     Compiler: 'Mingw'
     Target compiler: 'Clang'
-    Platform dependency: 'Windows10_22H2-Mingw11-x64-host'
+    Platform dependency: 'windows-10_22h2-mingw11'
     Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
@@ -35,13 +36,13 @@ Configurations:
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
-    Id: 'RHEL-8.4-Android-x86'
+    Id: 'android-x86-on-linux'
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.4-host'
+    Platform dependency: 'rhel-8.4'
     Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
     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',
@@ -52,13 +53,13 @@ Configurations:
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
-    Id: 'RHEL-8.4-Android-x86_64'
+    Id: 'android-x86_64-on-linux'
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.4-host'
+    Platform dependency: 'rhel-8.4'
     Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     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',

coin/platform_configs/cmake_platforms_target_android_12.yaml

@@ -1,16 +1,18 @@
 Version: 2
 Configurations:
 -
+    Id: 'android-12-x86_64-on-linux'
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.4-host'
+    Platform dependency: 'rhel-8.4'
     Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
     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_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
         'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
         'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
         'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',

coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml

@@ -6,7 +6,7 @@ Configurations:
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.4-host'
+    Platform dependency: 'rhel-8.4'
     Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', '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',

coin/platform_configs/cmake_platforms_wasm.yaml

@@ -5,7 +5,7 @@ Configurations:
     Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
     Target os: 'WebAssembly'
     Compiler: 'GCC'
-    Platform dependency: 'OpenSUSE-15.4-host'
+    Platform dependency: 'opensuse-15.4-developer-build'
     Features: ['Sccache', 'DisableTests']
     Environment variables: [
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
@@ -17,7 +17,7 @@ Configurations:
     Target os: 'WebAssembly'
     Compiler: 'Mingw'
     Target compiler: 'Clang'
-    Platform dependency: 'Windows10_22H2-Mingw11-x64-host'
+    Platform dependency: 'windows-10_22h2-mingw11'
     Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
@@ -34,7 +34,7 @@ Configurations:
     Target os: 'WebAssembly'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-universal-on-x86_64'
     Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',

coin/platform_configs/default.yaml

@@ -1,6 +1,7 @@
 Version: 2
 Configurations:
 -
+    Id: 'ubuntu-20.04-license-check'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
     Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

coin/platform_configs/integrity.yaml

@@ -1,11 +1,11 @@
 Version: 2
 Configurations:
     -
-      Id: "integrity-arm64-on-ubuntu20.04"
+      Id: "integrity-arm64"
       Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
       Compiler: 'GCC'
       Target os: 'INTEGRITY'
-      Platform dependency: 'Ubuntu-20.04-host'
+      Platform dependency: 'ubuntu-20.04'
       Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
       Environment variables: [
           'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql',

coin/platform_configs/ios-tests.yaml

@@ -1,13 +1,13 @@
 Version: 2
 Configurations:
 -
-    Id: "ios-tests-target"
+    Id: "ios-tests-on-macos"
     Template: 'qtci-macos-12-x86_64-105'
     Target os: 'IOS_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-universal-on-x86_64'
     Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'

coin/platform_configs/linux_android_tests_developer.yaml

@@ -1,16 +1,18 @@
 Version: 2
 Configurations:
 -
+    Id: 'android-x86-developer-build-testrun-on-linux'
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.4-host'
+    Platform dependency: 'rhel-8.4'
     Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
         'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
         'CONAN_INSTALL_DIR={{.InstallDir}}/target',
         'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',

coin/platform_configs/linux_android_tests_multi_abi.yaml

@@ -1,16 +1,16 @@
 Version: 2
 Configurations:
 -
-    Id: 'RHEL_Android_Multi'
+    Id: 'rhel_8.4_android_multi'
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'multi'
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: [
-        'RHEL-8.4-host',
-        'RHEL-8.4-Android-x86',
-        'RHEL-8.4-Android-x86_64'
+        'rhel-8.4',
+        'android-x86-on-linux',
+        'android-x86_64-on-linux'
     ]
     Features: [
         'Sccache',
@@ -19,8 +19,8 @@ Configurations:
         'InstallDepsPerPlatformSubdir'
     ]
     Environment variables: [
-        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_RHEL-8.4-host',
-        'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_RHEL-8.4-Android-x86',
-        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_RHEL-8.4-Android-x86_64',
+        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.4',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-x86-on-linux',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-x86_64-on-linux',
         'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"'
     ]

coin/platform_configs/macos.yaml

@@ -8,7 +8,7 @@ Configurations:
     # Build on recent macOS version with latest Xcode
 
     -
-        Id: 'macos-latest-xcode-universal-packaging-build'
+        Id: 'macos-universal-on-x86_64'
         Template: 'qtci-macos-12-x86_64-105'
         Compiler: 'Clang'
         Target arch: 'x86_64-arm64'
@@ -22,7 +22,7 @@ Configurations:
         ]
 
     -
-        Id: 'macos-latest-xcode-arm64-universal-build'
+        Id: 'macos-universal-on-arm64'
         Template: 'qtci-macos-12-arm64'
         Compiler: 'Clang'
         Target arch: 'x86_64-arm64'
@@ -41,43 +41,43 @@ Configurations:
         Template: 'qtci-macos-11-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-11-arm64-tests'
         Template: 'qtci-macos-11.0-arm64'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-12-arm64-tests'
         Template: 'qtci-macos-12-arm64'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-13-arm64-tests'
         Template: 'qtci-macos-13-arm64'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+        Platform dependency: 'macos-universal-on-x86_64'
     -
         Id: 'macos-12-x86_64-tests'
         Template: 'qtci-macos-12-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+        Platform dependency: 'macos-universal-on-x86_64'
     -
-        Id: 'macos-12-arm64-arm64-universal-build-tests'
+        Id: 'macos-12-arm-on-arm64-tests'
         Template: 'qtci-macos-12-arm64'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-universal-build'
+        Platform dependency: 'macos-universal-on-arm64'
     -
-        Id: 'macos-12-x86_64-arm64-universal-build-tests'
+        Id: 'macos-12-arm-on-x86_64-tests'
         Template: 'qtci-macos-12-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-universal-build'
+        Platform dependency: 'macos-universal-on-arm64'
 
     # =========================================================================
     # Developer build. Single architecture builds.
@@ -86,7 +86,7 @@ Configurations:
     # Build on recent macOS version with latest Xcode
 
     -
-        Id: 'macos-latest-xcode-x86_64-developer-build'
+        Id: 'macos-12-x86_64-developer-build'
         Template: 'qtci-macos-12-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
@@ -97,7 +97,7 @@ Configurations:
             'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
         ]
     -
-        Id: 'macos-latest-xcode-arm64-developer-build'
+        Id: 'macos-12-arm64-developer-build'
         Template: 'qtci-macos-12-arm64'
         Compiler: 'Clang'
         Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
@@ -116,28 +116,28 @@ Configurations:
         Template: 'qtci-macos-11-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
+        Platform dependency: 'macos-12-x86_64-developer-build'
     -
         Id: 'macos-11-arm64-developer-build-tests'
         Template: 'qtci-macos-11.0-arm64'
         Compiler: 'Clang'
         Features: ['TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-developer-build'
+        Platform dependency: 'macos-12-arm64-developer-build'
     -
         Id: 'macos-12-x86_64-developer-build-tests'
         Template: 'qtci-macos-12-x86_64-105'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
+        Platform dependency: 'macos-12-x86_64-developer-build'
     -
         Id: 'macos-12-arm64-developer-build-tests'
         Template: 'qtci-macos-12-arm64'
         Compiler: 'Clang'
         Features: ['TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-developer-build'
+        Platform dependency: 'macos-12-arm64-developer-build'
     -
         Id: 'macos-13-arm64-developer-build-tests'
         Template: 'qtci-macos-13-arm64'
         Compiler: 'Clang'
         Features: ['TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-developer-build'
+        Platform dependency: 'macos-12-arm64-developer-build'

coin/platform_configs/nightly_macos13.yaml

@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Include: [
     macos.yaml: [
-        "macos-latest-xcode-arm64-developer-build"
+        "macos-12-arm64-developer-build"
     ]
 ]
 Configurations:
@@ -11,4 +11,4 @@ Configurations:
     Template: 'qtci-macos-13-arm64'
     Compiler: 'Clang'
     Features: ['TestOnly']
-    Platform dependency: 'macos-latest-xcode-arm64-developer-build'
+    Platform dependency: 'macos-12-arm64-developer-build'

coin/platform_configs/nightly_qnx710_host_windows.yaml

@@ -1,17 +1,18 @@
 Version: 2
 Include: [
     cmake_platforms.yaml: [
-        Windows10_22H2-MSVC2019-x64-host
+        windows-10_22h2-msvc2019-developer-build
     ]
 ]
 Configurations:
 -
+    Id: 'qnx-710-arm64-on-windows'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Target os: 'QNX_710'
     Target arch: 'arm64'
     Compiler: 'MSVC2019'
     Target compiler: 'QCC'
-    Platform dependency: 'Windows10_22H2-MSVC2019-x64-host'
+    Platform dependency: 'windows-10_22h2-msvc2019-developer-build'
     Features: ['DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch',

coin/platform_configs/nightly_rhel_9.yaml

@@ -1,44 +0,0 @@
-Version: 2
-Configurations:
--
-    Id: 'RHEL-9.0-host'
-    Template: 'qtci-linux-RHEL-9.0-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'UseConfigure']
-    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
-    ]
--
-    Template: 'qtci-linux-RHEL-9.0-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'RHEL-9.0-host'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang',
-        'ANDROID_EMULATOR=@emulator_x86_api_23',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
-    ]
--
-    Template: 'qtci-linux-RHEL-9.0-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'RHEL-9.0-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
-    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}}',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
-    ]

coin/platform_configs/nightly_ubuntu_22_04.yaml

@@ -2,12 +2,13 @@ Version: 2
 Configurations:
 -
     # cmake_platforms.yaml
+    Id: 'ubuntu-22.04-documentation'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['Sccache', 'Documentation', 'UseConfigure']
     Configure arguments: '-make examples -developer-build -c++std c++20 -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
 -
-    Id: 'Ubuntu-22.04-host'
+    Id: 'ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['Sccache', 'UseConfigure', 'InsignificantTests']
@@ -17,11 +18,12 @@ Configurations:
     ]
 -
     # cmake_platforms_qemu.yaml
+    Id: 'qemu-armv7-developer-build-on-ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Target os: 'QEMU'
     Target arch: 'armv7'
     Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['Sccache']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
@@ -32,11 +34,12 @@ Configurations:
         'QT_QUICK_BACKEND=software',
     ]
 -
+    Id: 'qemu-arm64-developer-build-on-ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Target os: 'QEMU'
     Target arch: 'arm64'
     Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['Sccache']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
@@ -47,11 +50,12 @@ Configurations:
         'QT_QUICK_BACKEND=software',
     ]
 -
+    Id: 'qemu-mips64-developer-build-on-ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Target os: 'QEMU'
     Target arch: 'mips64'
     Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['Sccache', 'DisableTests']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
@@ -63,12 +67,13 @@ Configurations:
     ]
 -
     # cmake_platforms_qemu_qnx710.yaml
+    Id: 'qnx-710-x86_64-developer-build-on-ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Target os: 'QNX_710'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['Packaging', 'VMSize8', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
@@ -77,24 +82,26 @@ Configurations:
         'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
     ]
 -
+    Id: 'qnx-710-arm64-on-ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Target os: 'QNX_710'
     Target arch: 'arm64'
     Compiler: 'GCC'
     Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['Packaging', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
     ]
 -
+    Id: 'qnx-710-armv7-on-ubuntu-22.04'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Target os: 'QNX_710'
     Target arch: 'armv7'
     Compiler: 'GCC'
     Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['Packaging', 'DisableTests', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
@@ -102,15 +109,17 @@ Configurations:
     ]
 -
     # default.yaml
+    Id: 'ubuntu-22.04-license-check'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
 -
     # integrity.yaml
+    Id: 'integrity-arm64-on-ubuntu-22.04-x86_64'
     Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
     Compiler: 'GCC'
     Target os: 'INTEGRITY'
-    Platform dependency: 'Ubuntu-22.04-host'
+    Platform dependency: 'ubuntu-22.04'
     Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli',

coin/platform_configs/precheck.yaml

@@ -2,8 +2,8 @@ Version: 2
 Module only: True
 Include: [
   cmake_platforms.yaml: [
-    "Ubuntu-20.04-host",
-    "Windows10_22H2-MSVC2019-x64-host",
+    "ubuntu-20.04",
+    "windows-10_22h2-msvc2019-developer-build",
     "ios-universal"
   ],
   macos.yaml: [
@@ -13,10 +13,10 @@ Include: [
     "android-arm64-on-macos"
   ],
   cmake_platforms_qemu.yaml: [
-    "qemu-armv7-on-ubuntu20.04"
+    "qemu-armv7-developer-build"
   ],
   cmake_platforms_qemu_qnx710.yaml: [
-    "qnx-x86_64-on-ubuntu20.04"
+    "qnx-710-x86_64-developer-build-on-linux"
   ]
 ]
 Configurations: []

coin/platform_configs/qmake2cmake.yaml

@@ -10,7 +10,7 @@ Configurations:
     Compiler: 'Clang'
     Features: ['DisableTests']
 -
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-9.0-x86_64-50'
     Compiler: 'GCC'
     Features: ['DisableTests']
 -

coin/platform_configs/qt-creator.yaml

@@ -22,7 +22,7 @@ Configurations:
     Configure arguments: ''
     Environment variables: []
 -
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Template: 'qtci-linux-RHEL-9.0-x86_64-500'
     Compiler: 'GCC'
     Features: ['Qt5', 'Sccache', 'DebugAndRelease']
     Configure arguments: ''

coin/platform_configs/tqtc-android-automotive.yaml

@@ -2,13 +2,14 @@ Version: 2
 Include: [ cmake_platforms_target_android.yaml ]
 Configurations:
 -
+    Id: 'automotive-ubuntu-20.04-documentation'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
     Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
     Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
 -
-    Id: 'Windows10_22H2-Mingw11-x64-host'
+    Id: 'windows-10_22h2-mingw11'
     Template: 'qtci-windows-10_22H2-x86_64-50'
     Compiler: 'Mingw'
     Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure']
@@ -20,7 +21,7 @@ Configurations:
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
     ]
 -
-    Id: 'macos-latest-xcode-universal-packaging-build'
+    Id: 'macos-universal-on-x86_64'
     Template: 'qtci-macos-12-x86_64-105'
     Compiler: 'Clang'
     Target arch: 'x86_64-arm64'
@@ -32,7 +33,7 @@ Configurations:
         'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
     ]
 -
-    Id: 'RHEL-8.4-host'
+    Id: 'rhel-8.4'
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Compiler: 'GCC'
     Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure']
@@ -42,16 +43,18 @@ Configurations:
         'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'
     ]
 -
+    Id: "automotive-android-x86-on-linux"
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.4-host'
+    Platform dependency: 'rhel-8.4'
     Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
         'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
+        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
         'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
         'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
         'ANDROID_EMULATOR=@automotive_emulator_x86_api_30'

coin/platform_configs/webos.yaml

@@ -1,54 +1,54 @@
 Version: 2
 Module only: true
 Configurations:
-  - Id: 'WebOS-emulator-build'
+  - Id: 'webos-emulator-build'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['DoNotRunTests']
     Environment variables: ['BUILD_EMULATOR=enabled']
-  - Id: 'WebOS-emulator-qtbase-tests'
+  - Id: 'webos-emulator-qtbase-tests'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: ['MODULE=qtbase']
-    Platform dependency: 'WebOS-emulator-build'
-  - Id: 'WebOS-emulator-qtdeclarative-tests'
+    Platform dependency: 'webos-emulator-build'
+  - Id: 'webos-emulator-qtdeclarative-tests'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: ['MODULE=qtdeclarative']
-    Platform dependency: 'WebOS-emulator-build'
-  - Id: 'WebOS-emulator-qtwayland-tests'
+    Platform dependency: 'webos-emulator-build'
+  - Id: 'webos-emulator-qtwayland-tests'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: ['MODULE=qtwayland']
-    Platform dependency: 'WebOS-emulator-build'
-  - Id: 'WebOS-emulator-qtshadertools-tests'
+    Platform dependency: 'webos-emulator-build'
+  - Id: 'webos-emulator-qtshadertools-tests'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: ['MODULE=qtshadertools']
-    Platform dependency: 'WebOS-emulator-build'
-  - Id: 'WebOS-emulator-qtgraphicaleffects-tests'
+    Platform dependency: 'webos-emulator-build'
+  - Id: 'webos-emulator-qtgraphicaleffects-tests'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
     Environment variables: ['MODULE=qtgraphicaleffects']
-    Platform dependency: 'WebOS-emulator-build'
-  - Id: 'WebOS-raspberry-build'
+    Platform dependency: 'webos-emulator-build'
+  - Id: 'webos-raspberry-build'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['DoNotRunTests']
     Environment variables: ['BUILD_RASPBERRY=enabled']
-  - Id: 'WebOS-NDK-installer-build'
+  - Id: 'webos-ndk-installer-build'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['DoNotRunTests']
     Environment variables: ['BUILD_NDK_INSTALLER=enabled']
-  - Id: 'WebOS-NDK-install'
+  - Id: 'webos-ndk-install'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
     Compiler: 'GCC'
     Features: ['TestOnly']
-    Platform dependency: ['WebOS-raspberry-build', 'WebOS-NDK-installer-build']
+    Platform dependency: ['webos-raspberry-build', 'webos-ndk-installer-build']
     Environment variables: ['TEST_INSTALL_NDK=enabled']

coin/provisioning/common/macos/docker.sh

@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2022 The Qt Company Ltd.
+## 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$
+##
+#############################################################################
+
+# shellcheck source=./../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+
+# This script will install Docker which is needed by RTA
+
+chip=$1
+
+if [[ $chip == "amd64" ]]; then
+    sha="158eae1d2f81cc8a0754d2ea3af8c6e6e555f69b"
+else
+    sha="6adf6cc8558af69296208b045187406a95b020bf"
+fi
+
+echo "Installing Docker for $chip chip"
+urlOccifical="https://desktop.docker.com/mac/main/${chip}/Docker.dmg?utm_source=docker"
+urlCache="http://ci-files01-hki.ci.qt.io/input/mac/Docker_${chip}.dmg"
+
+DownloadURL $urlCache $urlOccifical $sha "/tmp/Docker_${chip}.dmg"
+
+sudo hdiutil attach "/tmp/Docker_${chip}.dmg"
+sudo /Volumes/Docker/Docker.app/Contents/MacOS/install --accept-license --user qt
+sudo hdiutil detach /Volumes/Docker

coin/provisioning/common/unix/emsdk.sh

@@ -41,7 +41,7 @@
 # shellcheck source=./SetEnvVar.sh
 source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 
-version="3.1.10"
+version="3.1.25"
 versionNode="v14.18.2"
 
 mkdir -p /opt

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

@@ -48,34 +48,100 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="n5.0"
-ffmpeg_name="FFmpeg-$version"
+function SourceEnvVar {
+    echo "Source environment variables file"
+    if [ uname -a | grep -q "Ubuntu" ];
+    then
+        if [ lsb_release -a | grep "Ubuntu 22.04" ];
+        then source ~/.bashrc
+        else source ~/.profile
+        fi
+    else
+        source ~/.bashrc
+        source ~/.zshrc
+    fi
+}
+
+if [ "$os" == "android" ];
+then
+version="f0d2ed135c3602670b56a95e0346487730317407"
+url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz"
+sha1="a429060d07b6d84c849a68741f816a7e91447d12"
+else
+version="n5.1"
+url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
+sha1="1d4283c5ff9e02378893168f55b8672bb30b9176"
+fi
 
 url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/$version.tar.gz"
-url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
-sha1="1a979876463fd81e481d53ceb3cc117f0fce8521"
+ffmpeg_name="FFmpeg-$version"
 
 target_dir="$HOME"
 app_prefix=""
+ffmpeg_source_dir="$target_dir/$ffmpeg_name"
 
-InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix"
+if [ ! -d "$ffmpeg_source_dir" ];
+then
+   InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix"
+fi
 
 ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
-ffmpeg_source_dir="$target_dir/$ffmpeg_name"
+
 
 build_ffmpeg() {
   local arch="$1"
+  local prefix="$2"
   local build_dir="$ffmpeg_source_dir/build/$arch"
   mkdir -p "$build_dir"
   pushd "$build_dir"
+
+  if [ -z  "$prefix" ]
+  then prefix="/usr/local/$ffmpeg_name"
+  fi
+
+  # android configures its own toolchain, it does not use the system clang
+  if [ -n "$arch" ] && [ "$os" != "android" ]
+  then cc="clang -arch $arch"
+  fi
+
   if [ -n "$arch" ]
-  then $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="/usr/local/$ffmpeg_name" --enable-cross-compile --arch=$arch --cc="clang -arch $arch"
-  else $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="/usr/local/$ffmpeg_name"
+  then $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="$prefix" --enable-cross-compile --arch=$arch --cc="$cc"
+  else $ffmpeg_source_dir/configure $ffmpeg_config_options --prefix="$prefix"
   fi
   make install DESTDIR=$build_dir/installed -j4
   popd
 }
 
+build_ffmpeg_android() {
+  SourceEnvVar
+  target_arch=$1
+  target_dir=$2
+
+  if [ "$target_arch" == "x86_64" ];
+  then
+    #emulador on CI is x86_64
+    target_toolchain_arch="x86_64-linux-android"
+    target_arch=x86_64
+    target_cpu=x86_64
+  else
+    #emulador on CI is x86
+    target_toolchain_arch="i686-linux-android"
+    target_arch=x86
+    target_cpu=i686
+  fi
+
+  api_version=24
+
+  toolchain=${ANDROID_NDK_ROOT_DEFAULT}/toolchains/llvm/prebuilt/${ANDROID_NDK_HOST}
+  toolchain_bin=${toolchain}/bin
+  sysroot=${toolchain}/sysroot
+  cxx=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang++
+  cc=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang
+
+  ffmpeg_config_options+=" --disable-vulkan --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --cpu=${target_cpu} --disable-indev=android_camera --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/ --cc=${cc} --cxx=${cxx}"
+  build_ffmpeg ${target_arch} ${target_dir}
+}
+
 if [ "$os" == "linux" ]; then
   if [ -f /etc/redhat-release ]
   then sudo yum -y install yasm
@@ -83,12 +149,14 @@ if [ "$os" == "linux" ]; then
   fi
   build_ffmpeg
   sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local"
+  SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
 
 elif [ "$os" == "macos" ]; then
   brew install yasm
   export MACOSX_DEPLOYMENT_TARGET=11
   build_ffmpeg
   sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local"
+  SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
 
 elif [ "$os" == "macos-universal" ]; then
   brew install yasm
@@ -97,6 +165,40 @@ elif [ "$os" == "macos-universal" ]; then
   build_ffmpeg "x86_64"
 
   sudo "${BASH_SOURCE%/*}/../macos/makeuniversal.sh" "$ffmpeg_source_dir/build/arm64/installed" "$ffmpeg_source_dir/build/x86_64/installed"
+  SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
+
+elif  [ "$os" == "android" ]; then
+
+  SourceEnvVar
+
+  url_cached=""
+  url_public=""
+  sha1=""
+
+  #get emulator target arch
+  if [ "$ANDROID_EMULATOR" == *"x86_64"* ];
+  then
+    target_arch=x86_64
+    sha1="0241fd483c16f4ce53206b911214b06854cdef9d"
+    url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/android-ffmpeg-x86_64.zip"
+  else
+    target_arch=x86
+    url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/android-ffmpeg-x86.zip"
+    sha1="8b254e31411a350edb581bb30e31401866abbe7d"
+  fi
+
+  target_dir="/opt/android/$ffmpeg_name"
+  app_prefix=""
+
+  #try install a pre-build
+  InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix"
+
+  #if could not install pre-build, build it
+  if [ ! -d "$target_dir" ];
+  then build_ffmpeg_android "$target_arch" "$target_dir"
+  fi
+
+  #set the var to use in yaml
+  SetEnvVar "FFMPEG_DIR_ANDROID" "$target_dir"
 fi
 
-SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"

coin/provisioning/common/unix/install-openssl.sh

@@ -48,11 +48,11 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-version="1.1.1m"
+version="3.0.7"
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
-sha="39d424c4411e45f1570073d7a71b1830b96007ca"
+sha="f20736d6aae36bcbfa9aba0d358c71601833bf27"
 opensslHome="${HOME}/openssl-${version}"
 opensslSource="${opensslHome}-src"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
@@ -62,13 +62,14 @@ cd "$opensslSource"
 pwd
 
 if [[ "$os" == "linux" ]]; then
-    ./Configure --prefix="$opensslHome" shared no-ssl3-method enable-ec_nistp_64_gcc_128 linux-x86_64 "-Wa,--noexecstack"
+    ./Configure --prefix="$opensslHome" shared enable-ec_nistp_64_gcc_128 linux-x86_64 "-Wa,--noexecstack"
     make && make install_sw install_ssldirs
     SetEnvVar "OPENSSL_HOME" "$opensslHome"
+    SetEnvVar "PATH" "\"$opensslHome/bin:\$PATH\""
     if uname -a |grep -q "Ubuntu"; then
-        echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bash_profile
+        echo "export LD_LIBRARY_PATH=$opensslHome/lib64:$LD_LIBRARY_PATH" >> ~/.bash_profile
     else
-        echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bashrc
+        echo "export LD_LIBRARY_PATH=$opensslHome/lib64:$LD_LIBRARY_PATH" >> ~/.bashrc
     fi
 
 elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then

coin/provisioning/common/unix/openssl_3_for_android.sh

@@ -39,7 +39,7 @@
 ##
 #############################################################################
 
-# This script install prebuilt OpenSSL which was built against Android NDK 21.
+# This script install prebuilt OpenSSL which was built against Android NDK 25.
 # OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories
 
 set -ex
@@ -48,9 +48,16 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="3.0.3"
-: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 21
-# Source built requires GCC and Perl to be in PATH.
+version="3.0.7"
+ndkVersionLatest="r25b"
+ndkVersionDefault=$ndkVersionLatest
+prebuiltOpensslNdkShaDarwinLatest="5cf5ef6c19e62954ccffcd1e31ac1f331028de0d"
+prebuiltOpensslNdkShaLinuxLatest="f5e7e840dc1fac2868033ecfc0eeb79742b0daff"
+prebuiltOpensslNdkShaDarwinDefault=$prebuiltOpensslNdkShaDarwinLatest
+prebuiltOpensslNdkShaLinuxDefault=$prebuiltOpensslNdkShaLinuxLatest
+
+: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 25
+# Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd"
 exports_file="/tmp/export.sh"
 # source previously made environmental variables.
 if uname -a |grep -q "Ubuntu"; then
@@ -63,10 +70,13 @@ else
     rm -rf "$exports_file"
 fi
 
+# ANDROID_NDK_ROOT is required during Configure
+export ANDROID_NDK_ROOT=/opt/android/android-ndk-r25b
+
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
-sha="1138de3f1a2f573ae69302ab52ecd9bbf5e063ca"
+sha="f20736d6aae36bcbfa9aba0d358c71601833bf27"
 opensslHome="${HOME}/openssl/android/openssl-${version}"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 mkdir -p "${HOME}/openssl/android/"
@@ -81,18 +91,33 @@ PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
 PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
 '
 
-if uname -a |grep -q "Darwin"; then
-    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-3.0.3-for-android-ndk-r23b-darwin.tar.gz"
-    sha="d204cb4011ba8672aec62ab36a00dd3e32a3a5e9"
-else
-    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-3.0.3-for-android-ndk-r23b-linux.tar.gz"
-    sha="2d1b6f5d90b5e3ae6a7e2a376250c66e99371485"
-fi
-targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
-DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
-tar -xzf "$targetFile" -C "${HOME}"
+function InstallPrebuiltOpenssl() {
 
-opensslHome="${HOME}/openssl/android/openssl-${version}"
-SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
+    ndkVersion=$1
+    nkdSha=$2
+    os=$3
+
+    if [[ ! -d ${HOME}/openssl_android_ndk_${ndkVersion}/android/openssl-${version} ]]; then
+        prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}-${os}.tar.gz"
+        targetFile="/tmp/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}-${os}.tar.gz"
+
+        DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$nkdSha" "$targetFile"
+        tar -xzf "$targetFile" -C "${HOME}"
+        opensslHome="${HOME}/openssl_android_ndk_${ndkVersion}/android/openssl-${version}"
+        sudo rm -f $targetFile
+    fi
+}
+
+if uname -a |grep -q "Darwin"; then
+    InstallPrebuiltOpenssl $ndkVersionDefault $prebuiltOpensslNdkShaDarwinDefault "darwin"
+    SetEnvVar "OPENSSL_ANDROID_HOME_DEFAULT" "$opensslHome"
+    InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslNdkShaDarwinLatest "darwin"
+    SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
+else
+    InstallPrebuiltOpenssl $ndkVersionDefault $prebuiltOpensslNdkShaLinuxDefault "linux"
+    SetEnvVar "OPENSSL_ANDROID_HOME_DEFAULT" "$opensslHome"
+    InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslNdkShaLinuxLatest "linux"
+    SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
+fi
 
 echo "OpenSSL for Android = $version" >> ~/versions.txt

coin/provisioning/common/unix/openssl_for_android.sh

@@ -48,16 +48,16 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="1.1.1m"
+version="3.0.7"
 ndkVersionLatest="r25b"
 ndkVersionDefault=$ndkVersionLatest
-prebuiltOpensslNdkShaDarwinLatest="1f4f994255c39839c8857d2ed1ff58a2101de714"
-prebuiltOpensslNdkShaLinuxLatest="15f7014781186a23f4973a719b55b766b1e69116"
+prebuiltOpensslNdkShaDarwinLatest="5cf5ef6c19e62954ccffcd1e31ac1f331028de0d"
+prebuiltOpensslNdkShaLinuxLatest="f5e7e840dc1fac2868033ecfc0eeb79742b0daff"
 prebuiltOpensslNdkShaDarwinDefault=$prebuiltOpensslNdkShaDarwinLatest
 prebuiltOpensslNdkShaLinuxDefault=$prebuiltOpensslNdkShaLinuxLatest
 
 : ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 25
-# Source built requires GCC and Perl to be in PATH.
+# Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd"
 exports_file="/tmp/export.sh"
 # source previously made environmental variables.
 if uname -a |grep -q "Ubuntu"; then
@@ -70,10 +70,13 @@ else
     rm -rf "$exports_file"
 fi
 
+# ANDROID_NDK_ROOT is required during Configure
+export ANDROID_NDK_ROOT=/opt/android/android-ndk-r25b
+
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
-sha="39d424c4411e45f1570073d7a71b1830b96007ca"
+sha="f20736d6aae36bcbfa9aba0d358c71601833bf27"
 opensslHome="${HOME}/openssl/android/openssl-${version}"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 mkdir -p "${HOME}/openssl/android/"
@@ -100,7 +103,6 @@ function InstallPrebuiltOpenssl() {
 
         DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$nkdSha" "$targetFile"
         tar -xzf "$targetFile" -C "${HOME}"
-        mv "${HOME}/openssl" "${HOME}/openssl_android_ndk_${ndkVersion}"
         opensslHome="${HOME}/openssl_android_ndk_${ndkVersion}/android/openssl-${version}"
         sudo rm -f $targetFile
     fi

coin/provisioning/common/windows/android-openssl.ps1

@@ -51,12 +51,12 @@ if (Is64BitWinHost) {
 # Msys need to be installed to target machine
 # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
 
-$openssl_version = "1.1.1m"
+$openssl_version = "3.0.7"
 $ndk_version_latest = "r25b"
 $ndk_version_default = "$ndk_version_latest"
-$openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}_fixes-ndk_root.tar.gz")
-$openssl_sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206"
-$prebuilt_sha1_ndk_latest = "2897c84dccdb26e15b467e4a63de025fe7038899"
+$openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}.tar.gz")
+$openssl_sha1 = "f20736d6aae36bcbfa9aba0d358c71601833bf27"
+$prebuilt_sha1_ndk_latest = "d4348812054a88b5b672a8ceae62bf30c564869b"
 $prebuilt_sha1_ndk_default = "$prebuilt_sha1_ndk_latest"
 $destination = "C:\Utils\openssl-android-master"
 
@@ -81,16 +81,16 @@ function Install($1, $2) {
     } else {
         Write-Host "Build OpenSSL for Android from sources"
         # openssl-${openssl_version}_fixes-ndk_root.tar.gz package includes fixes from https://github.com/openssl/openssl/pull/17322 and string ANDROID_NDK_HOME is replaced with ANDROID_NDK_ROOT in Configurations/15-android.conf
-        Download \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${openssl_version}_fixes-ndk_root.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${openssl_version}_fixes-ndk_root.tar.gz $openssl_compressed
+        Download \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${openssl_version}.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${openssl_version}.tar.gz $openssl_compressed
         Verify-Checksum $openssl_compressed $openssl_sha1
 
         Extract-7Zip $openssl_compressed C:\Utils\tmp
-        Extract-7Zip C:\Utils\tmp\openssl-${openssl_version}_fixes-ndk_root.tar C:\Utils\tmp
-        Move-Item C:\Utils\tmp\openssl-${openssl_version} $destination
+        Extract-7Zip C:\Utils\tmp\openssl-${openssl_version}.tar C:\Utils\tmp
+        Move-Item C:\Utils\tmp\openssl-${openssl_version} ${destination}-${ndk_version}
         Remove "$openssl_compressed"
 
         Write-Host "Configuring OpenSSL $openssl_version for Android..."
-        Push-Location $destination
+        Push-Location ${destination}-${ndk_version}
         # $ must be escaped in powershell...
 
         function CheckExitCode {
@@ -105,6 +105,12 @@ function Install($1, $2) {
             }
         }
 
+        # ANDROID_NDK_ROOT needs to be in environment variables before running this script
+        # Set-EnvironmentVariable "ANDROID_NDK_ROOT" "C:\Utils\Android\android-ndk-r25b"
+
+        $make_install = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"yes | pacman -S make`"")
+        CheckExitCode $make_install
+
         $configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndk_path PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
         CheckExitCode $configure
 
@@ -115,7 +121,6 @@ function Install($1, $2) {
         Remove-item C:\Utils\tmp -Recurse -Confirm:$false
     }
 
-    Move-Item $destination "${destination}-${ndk_version}"
 }
 
 # Install NDK Default version

coin/provisioning/common/windows/conan.ps1

@@ -39,7 +39,7 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-$scriptsPath = "C:\Python36\Scripts"
+$scriptsPath = [System.Environment]::GetEnvironmentVariable('PIP3_PATH', [System.EnvironmentVariableTarget]::Machine)
 $version = "1.39.0"
 Run-Executable "$scriptsPath\pip3.exe" "install conan==$version"
 Write-Output "Conan = $version" >> ~\versions.txt

coin/provisioning/common/windows/emsdk.ps1

@@ -41,7 +41,7 @@
 
 # This script will install emscripten needed by WebAssembly
 
-$version = "3.1.10"
+$version = "3.1.25"
 
 # Make sure python is in the path
 Prepend-Path "C:\Python27"

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

@@ -42,9 +42,9 @@
 # This script will install FFmpeg
 $msys = "C:\Utils\msys64\usr\bin\bash"
 
-$version = "n5.0"
+$version = "n5.1"
 $ffmpeg_name = "ffmpeg-" + $version;
-$sha1 = "3F7C6D5264A04BC27BA471D189B0483954820D65"
+$sha1 = "9D5AD63032B03922D38F99159728F24C305FC345"
 
 $url_cached = "http://ci-files01-hki.intra.qt.io/input/ffmpeg/" + $version + ".zip"
 $url_public = "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/" +$version + ".zip"

coin/provisioning/common/windows/mesa_llvmpipe.ps1

@@ -40,12 +40,12 @@
 
 $version = "11_2_2"
 $package = "C:\Windows\temp\opengl32sw.7z"
-$mesaOpenglSha1_64 = "0ed35efbc8112282be5d0c87c37fde2d15e81998"
-$mesaOpenglUrl_64_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-64-mesa_$version-signed.7z"
-$mesaOpenglUrl_64_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version-signed.7z"
-$mesaOpenglSha1_32 = "96bd6ca0d7fd249fb61531dca888965ffd20f53c"
-$mesaOpenglUrl_32_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-32-mesa_$version-signed.7z"
-$mesaOpenglUrl_32_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version-signed.7z"
+$mesaOpenglSha1_64 = "58f948746696b17a594b2f542e87b0e831b28dc3"
+$mesaOpenglUrl_64_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-64-mesa_$version-signed_sha256.7z"
+$mesaOpenglUrl_64_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version-signed_sha256.7z"
+$mesaOpenglSha1_32 = "974f468acaa0018d46607e2100f1214fecd35bd4"
+$mesaOpenglUrl_32_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-32-mesa_$version-signed_sha256.7z"
+$mesaOpenglUrl_32_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version-signed_sha256.7z"
 
 function Extract-Mesa
 {

coin/provisioning/common/windows/openssl-arm64.ps1

@@ -46,7 +46,10 @@
 # From Visual studio 'C++ Universal Windows Platform support for v142 build tools (ARM64)' and 'Windows Universal C Runtime' were installed
 # cd C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build
 # call vcvarsamd64_arm64
-#
+# curl -o C:\Utils\openssl-3.0.7.zip http://ci-files01-hki.intra.qt.io/input/openssl/openssl-3.0.7.zip
+# cd C:\Utils
+# C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-3.0.7.zip
+# cd C:\Utils\openssl-3.0.7
 # perl Configure no-asm VC-WIN64-ARM --debug --prefix=C:\openssl_arm64\ --openssldir=C:\openssl_arm64\
 # nmake
 # nmake install
@@ -56,9 +59,9 @@
 # nmake install
 #################################################################################################################################################
 
-$version = "1_1_1_m"
+$version = "3_0_7"
 $url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version-arm64.zip"
-$sha1 = "52963bba9b542eb885f19641f5cd78870246ea02"
+$sha1 = "19be15069d981b4a96f5715f039df7aaa7456d52"
 $installFolder = "C:\openssl_arm64"
 $zip_package = "C:\Windows\Temp\$version.zip"
 

coin/provisioning/common/windows/openssl.ps1

@@ -42,7 +42,7 @@
 # This script installs OpenSSL $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine
 
-$version = "1_1_1m"
+$version = "3_0_7"
 $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
 $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
 
@@ -53,7 +53,7 @@ if (Is64BitWinHost) {
     $installFolder = "C:\openssl"
     $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
     $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
-    $sha1 = "16d83bd6d36be7b3ea85f822135352fa8f8d8134"
+    $sha1 = "2fb73f233bc565939312782b8157bebc26a5e17b"
 
     Write-Host "Fetching from URL ..."
     Download $externalUrl $internalUrl $packagex64
@@ -67,6 +67,7 @@ if (Is64BitWinHost) {
     Set-EnvironmentVariable "OPENSSL_CONF_x64" "$installFolder\bin\openssl.cfg"
     Set-EnvironmentVariable "OPENSSL_INCLUDE_x64" "$installFolder\include"
     Set-EnvironmentVariable "OPENSSL_LIB_x64" "$installFolder\lib"
+    Prepend-Path "$installFolder\bin"
 }
 
 # Install x86 bit version
@@ -80,7 +81,7 @@ if (Is64BitWinHost) {
 
 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
-$sha1 = "1d7146e56b201404ce67f1e636eab360211c175a"
+$sha1 = "ddead693fa279ad6b1baf123b3af51a9ef289dc1"
 
 Write-Host "Fetching from URL ..."
 Download $externalUrl $internalUrl $packagex86

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

@@ -86,9 +86,6 @@ installPackages+=(libusbx-devel)
 installPackages+=(speech-dispatcher-devel)
 # Python 2 devel and pip. python-pip requires the EPEL repository to be added
 installPackages+=(python2-devel python2-pip)
-# Python 3 with python-devel, pip and virtualenv
-installPackages+=(python36)
-installPackages+=(python36-devel)
 # WebEngine
 installPackages+=(bison)
 installPackages+=(flex)

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

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -48,7 +48,7 @@ installPackages=()
 installPackages+=(git)
 installPackages+=(zlib-devel)
 installPackages+=(glib2-devel)
-installPackages+=(openssl-devel)
+installPackages+=(openssl3-devel)
 installPackages+=(freetype-devel)
 installPackages+=(fontconfig-devel)
 installPackages+=(curl-devel)
@@ -183,6 +183,5 @@ python3.8 -m pip wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
 
-OpenSSLVersion="$(openssl version |cut -b 9-14)"
+OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
-

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

@@ -1,3 +1,4 @@
 #!/usr/bin/env bash
 
 source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
+source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "android"

coin/provisioning/qtci-linux-RHEL-9.0-x86_64/50-openssl_for_android_linux.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.

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

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2022 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -58,7 +58,6 @@ sudo zypper -nq install bison flex gperf \
         zlib-devel \
         libudev-devel \
         glib2-devel \
-        libopenssl-devel \
         freetype2-devel \
         fontconfig-devel \
         sqlite3-devel \
@@ -126,8 +125,8 @@ sudo zypper -nq install autoconf libcurl-devel libexpat-devel
 # Nodejs - required by QtWebengine
 sudo zypper -nq install nodejs16
 
+# OpenSSL 3
+sudo zypper -nq install openssl-3
+
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt
-
-OpenSSLVersion="$(openssl version |cut -b 9-14)"
-echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/08-pythondev.sh

@@ -64,7 +64,7 @@ function InstallPython {
     PACKAGE_VERSION=$1
     PACKAGE_SHA=$2
 
-    $CMD_PKG_INSTALL  ncurses zlib-devel libffi-devel libopenssl-devel
+    $CMD_PKG_INSTALL  ncurses zlib-devel libffi-devel
 
     echo 'Configuration and Installation started'
 

coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/09-openssl.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -ex
+
+"$(dirname "$0")/../common/unix/install-openssl.sh" "linux"

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

@@ -44,7 +44,7 @@ sudo zypper -nq install bison flex gperf \
         zlib-devel \
         systemd-devel \
         glib2-devel \
-        libopenssl-devel \
+        libopenssl-3-devel \
         freetype2-devel \
         fontconfig-devel \
         sqlite3-devel \
@@ -90,8 +90,11 @@ sudo zypper -nq install make
 # Tools to build Git
 sudo zypper -nq install autoconf libcurl-devel libexpat-devel
 
+# OpenSSL 3
+sudo zypper -nq install openssl-3
+
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt
 
-OpenSSLVersion="$(openssl version |cut -b 9-14)"
+OpenSSLVersion="$(openssl-3 version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/09-openssl.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -ex
+
+"$(dirname "$0")/../common/unix/install-openssl.sh" "linux"

coin/provisioning/qtci-macos-10.15-x86_64/90-docker.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -ex
+
+# shellcheck source=../common/macos/docker.sh
+source "${BASH_SOURCE%/*}/../common/macos/docker.sh" "amd64"
+

coin/provisioning/qtci-macos-12-arm/20-xcode.sh

@@ -56,4 +56,4 @@ set -ex
 # shellcheck source=../common/macos/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
 
-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_14.1.xip 14.1
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_14.2.xip 14.2

coin/provisioning/qtci-macos-12-arm/21-install-commandlinetools.sh

@@ -43,9 +43,9 @@ set -ex
 
 # shellcheck source=../common/macos/install-commandlinetools.sh
 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
-version="14.1"
+version="14.2"
 packageName="Command_Line_Tools_for_Xcode_$version.dmg"
 url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName"
-sha1="0f1be21eef0a0cdd98cbccd5ae042034ad820450"
+sha1="f9d18da696bc54755bd85fb4f42c0a8866bdade6"
 
 InstallCommandLineTools $url $url $sha1 $packageName $version

coin/provisioning/qtci-macos-12-arm/90-docker.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -ex
+
+# shellcheck source=../common/macos/docker.sh
+source "${BASH_SOURCE%/*}/../common/macos/docker.sh" "arm64"
+

coin/provisioning/qtci-macos-12-x86_64/20-xcode.sh

@@ -56,4 +56,4 @@ set -ex
 # shellcheck source=../common/macos/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
 
-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_14.1.xip 14.1
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_14.2.xip 14.2

coin/provisioning/qtci-macos-12-x86_64/21-install-commandlinetools.sh

@@ -43,9 +43,9 @@ set -ex
 
 # shellcheck source=../common/macos/install-commandlinetools.sh
 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
-version="14.1"
+version="14.2"
 packageName="Command_Line_Tools_for_Xcode_$version.dmg"
 url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName"
-sha1="0f1be21eef0a0cdd98cbccd5ae042034ad820450"
+sha1="f9d18da696bc54755bd85fb4f42c0a8866bdade6"
 
 InstallCommandLineTools $url $url $sha1 $packageName $version

coin/provisioning/qtci-macos-12-x86_64/90-docker.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -ex
+
+# shellcheck source=../common/macos/docker.sh
+source "${BASH_SOURCE%/*}/../common/macos/docker.sh" "amd64"
+

coin/provisioning/qtci-macos-13-arm/20-xcode.sh

@@ -56,4 +56,4 @@ set -ex
 # shellcheck source=../common/macos/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
 
-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_14.1.xip 14.1
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_14.2.xip 14.2

coin/provisioning/qtci-macos-13-arm/21-install-commandlinetools.sh

@@ -43,9 +43,9 @@ set -ex
 
 # shellcheck source=../common/macos/install-commandlinetools.sh
 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
-version="14.1"
+version="14.2"
 packageName="Command_Line_Tools_for_Xcode_$version.dmg"
 url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName"
-sha1="0f1be21eef0a0cdd98cbccd5ae042034ad820450"
+sha1="f9d18da696bc54755bd85fb4f42c0a8866bdade6"
 
 InstallCommandLineTools $url $url $sha1 $packageName $version

coin/provisioning/qtci-macos-13-arm/90-docker.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -ex
+
+# shellcheck source=../common/macos/docker.sh
+source "${BASH_SOURCE%/*}/../common/macos/docker.sh" "arm64"
+

coin/provisioning/qtci-windows-10_21H2-x86_64/08-python3.ps1

@@ -6,9 +6,6 @@
 #  - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false
 
 . "$PSScriptRoot\..\common\windows\python3.ps1" 64 "3ee4e92a8ef94c70fb56859503fdc805d217d689" "C:\Python310_64" "3.10.0"
-
-. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1"
-. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1"
 # default ones
-. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "bcf9bda733a9153811209c62d628c41ab6cedbe2" "C:\Python36" "3.6.2" $true
-. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "cd9744b142eca832f9534390676e6cfb84bf655d" "C:\Python36_32" "3.6.2" $true
+. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1" $true
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1" $true

coin/provisioning/qtci-windows-10_21H2-x86_64/90-python-modules.ps1

@@ -1,3 +1,4 @@
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 # Needed by packaging scripts
-C:\Python36\Scripts\pip3 install bs4
-C:\Python36\Scripts\pip3 install sh
+$scriptsPath = [System.Environment]::GetEnvironmentVariable('PIP3_PATH', [System.EnvironmentVariableTarget]::Machine)
+Run-Executable "$scriptsPath\pip3.exe" "install bs4"

coin/provisioning/qtci-windows-10_22H2-x86_64/08-python3.ps1

@@ -6,9 +6,6 @@
 #  - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false
 
 . "$PSScriptRoot\..\common\windows\python3.ps1" 64 "3ee4e92a8ef94c70fb56859503fdc805d217d689" "C:\Python310_64" "3.10.0"
-
-. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1"
-. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1"
 # default ones
-. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "bcf9bda733a9153811209c62d628c41ab6cedbe2" "C:\Python36" "3.6.2" $true
-. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "cd9744b142eca832f9534390676e6cfb84bf655d" "C:\Python36_32" "3.6.2" $true
+. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1" $true
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1" $true

coin/provisioning/qtci-windows-10_22H2-x86_64/90-python-modules.ps1

@@ -1,3 +1,4 @@
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 # Needed by packaging scripts
-C:\Python36\Scripts\pip3 install bs4
-C:\Python36\Scripts\pip3 install sh
+$scriptsPath = [System.Environment]::GetEnvironmentVariable('PIP3_PATH', [System.EnvironmentVariableTarget]::Machine)
+Run-Executable "$scriptsPath\pip3.exe" "install bs4"

coin/provisioning/qtci-windows-11_21H2-x86_64/08-python3.ps1

@@ -5,9 +5,8 @@
 #  - version
 #  - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false
 
-. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1"
-. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1"
 . "$PSScriptRoot\..\common\windows\python3.ps1" 64 "f8d42a421db25a01b53f0c135a9a74ddae042643" "C:\Python37_64" "3.7.9"
+. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "3ee4e92a8ef94c70fb56859503fdc805d217d689" "C:\Python310_64" "3.10.0"
 # default ones
-. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "bcf9bda733a9153811209c62d628c41ab6cedbe2" "C:\Python36" "3.6.2" $true
-. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "cd9744b142eca832f9534390676e6cfb84bf655d" "C:\Python36_32" "3.6.2" $true
+. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1" $true
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1" $true

coin/provisioning/qtci-windows-11_21H2-x86_64/90-python-modules.ps1

@@ -1,3 +1,4 @@
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 # Needed by packaging scripts
-C:\Python36\Scripts\pip3 install bs4
-C:\Python36\Scripts\pip3 install sh
+$scriptsPath = [System.Environment]::GetEnvironmentVariable('PIP3_PATH', [System.EnvironmentVariableTarget]::Machine)
+Run-Executable "$scriptsPath\pip3.exe" "install bs4"

coin/provisioning/qtci-windows-11_22H2-x86_64/08-python3.ps1

@@ -5,9 +5,8 @@
 #  - version
 #  - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false
 
-. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1"
-. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1"
 . "$PSScriptRoot\..\common\windows\python3.ps1" 64 "f8d42a421db25a01b53f0c135a9a74ddae042643" "C:\Python37_64" "3.7.9"
+. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "3ee4e92a8ef94c70fb56859503fdc805d217d689" "C:\Python310_64" "3.10.0"
 # default ones
-. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "bcf9bda733a9153811209c62d628c41ab6cedbe2" "C:\Python36" "3.6.2" $true
-. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "cd9744b142eca832f9534390676e6cfb84bf655d" "C:\Python36_32" "3.6.2" $true
+. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1" $true
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1" $true

coin/provisioning/qtci-windows-11_22H2-x86_64/90-python-modules.ps1

@@ -1,3 +1,4 @@
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 # Needed by packaging scripts
-C:\Python36\Scripts\pip3 install bs4
-C:\Python36\Scripts\pip3 install sh
+$scriptsPath = [System.Environment]::GetEnvironmentVariable('PIP3_PATH', [System.EnvironmentVariableTarget]::Machine)
+Run-Executable "$scriptsPath\pip3.exe" "install bs4"