Update submodules on '6.4.0 in qt/qt5'

Change-Id: I4fcf089726ed09044c4045cefc5f73f068ae28d5
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 = 6.4.1
+	branch = 6.4.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
-	recommends = qtdeclarative qtquick3d
+	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -83,14 +83,14 @@
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,61 +117,61 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
@@ -219,27 +219,27 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
@@ -252,68 +252,68 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = preview
 [submodule "qthttpserver"]
 	depends = qtbase
 	recommends = qtwebsockets
 	path = qthttpserver
 	url = ../qthttpserver.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = preview
 [submodule "qtquick3dphysics"]
 	depends = qtbase qtdeclarative qtquick3d qtshadertools
 	path = qtquick3dphysics
 	url = ../qtquick3dphysics.git
-	branch = 6.4.1
+	branch = 6.4.0
 	status = preview
 

coin/instructions/coin_bic_tests.yaml

@@ -1,32 +0,0 @@
-type: Group
-instructions:
-  - type: EnvironmentVariable
-    variableName: QT_MODULE_TO_TEST
-    variableValue: "qt=QtConcurrent,QtCore,QtDBus,QtDesigner,QtGui,QtHelp,QtNetwork,QtOpenGL,QtPrintSupport,QtQml,QtQuick,QtQuickTest,QtSql,QtSvg,QtTest,QtWidgets,QtXml;{{.SourceDir}}/qtbase"
-  - type: EnvironmentVariable
-    variableName: QTDIR
-    variableValue: "{{.InstallDir}}"
-  - type: PrependToEnvironmentVariable
-    variableName: PATH
-    variableValue: "{{.InstallDir}}/bin:"
-  - type: ChangeDirectory
-    directory: "{{.SourceDir}}/qtqa/tests/postbuild/bic"
-  - type: ExecuteCommand
-    command: ["{{.InstallDir}}/bin/qmake"]
-    maxTimeInSeconds: 3600
-    maxTimeBetweenOutput: 300
-    userMessageOnFailure: "Failed to execute qmake for bic tests"
-  - type: ExecuteCommand
-    command: ["make", "check", "-j1"]
-    maxTimeInSeconds: 7200
-    maxTimeBetweenOutput: 300
-    userMessageOnFailure: "Failed to execute bic tests"
-enable_if:
-  condition: and
-  conditions:
-    - condition: property
-      property: features
-      contains_value: Packaging
-    - condition: property
-      property: target.os
-      equals_value: Linux

coin/module_config.yaml

@@ -9,4 +9,6 @@ instructions:
     - !include "{{qt/qt5}}/coin_qt_build_template.yaml"
 
   Test:
-    - !include "{{qt/qt5}}/coin_bic_tests.yaml"
+    - type: EnvironmentVariable
+      variableName: Dummy
+      variableValue: dummy

coin/platform_configs/cmake_platforms.yaml

@@ -2,7 +2,9 @@ Version: 2
 Include: [
     cmake_platforms_qemu.yaml,
     cmake_platforms_qemu_qnx710.yaml,
-    cmake_platforms_target_android.yaml,
+    cmake_platforms_target_android_host_linux.yaml,
+    cmake_platforms_target_android_host_macos.yaml,
+    cmake_platforms_target_android_host_windows.yaml,
     cmake_platforms_wasm.yaml,
     macos.yaml
     ]
@@ -32,7 +34,7 @@ Configurations:
         'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer'
     ]
 -
-    Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
+    Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
     Compiler: 'GCC'
     Features: ['Sccache', 'DisableTests', 'UseConfigure']
     Configure arguments: '-nomake examples -static -no-sql-mysql'
@@ -124,7 +126,7 @@ Configurations:
     Id: 'RHEL-8.4-host'
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies']
+    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',
@@ -132,7 +134,7 @@ Configurations:
     ]
 -
     Id: 'ios-universal'
-    Template: 'qtci-macos-12-x86_64-105'
+    Template: 'qtci-macos-12-x86_64-102'
     Target os: 'IOS_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'

coin/platform_configs/cmake_platforms_static_tests.yaml

@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
     Id: 'sles-15-static'
-    Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
+    Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
     Compiler: 'GCC'
     Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
     Configure arguments: '-nomake examples -static -no-sql-mysql'
@@ -19,7 +19,7 @@ Configurations:
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
     ]
 -
-    Template: 'qtci-macos-11-x86_64-105'
+    Template: 'qtci-macos-11-x86_64-104'
     Compiler: 'Clang'
     Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
     Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework'

coin/platform_configs/cmake_platforms_target_android_host_linux.yaml

@@ -1,36 +1,32 @@
 Version: 2
 Configurations:
 -
-    Id: 'android-arm64-on-macos'
+    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Template: 'qtci-macos-12-x86_64-105'
     Target os: 'Android_ANY'
     Target arch: 'arm64'
-    Compiler: 'Clang'
+    Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'RHEL-8.4-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 arm64-v8a',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
-        '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',
+        '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-macos-universal-clang',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang',
+        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang'
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
-    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'armv7'
-    Compiler: 'Mingw'
+    Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+    Platform dependency: 'RHEL-8.4-host'
     Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
     Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a',
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
+        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
-        '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',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-armv7-clang'
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-armv7-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
@@ -41,12 +37,11 @@ Configurations:
     Platform dependency: 'RHEL-8.4-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_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        '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_EMULATOR=@emulator_x86_api_23'
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
     ]
 -
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
@@ -57,9 +52,8 @@ Configurations:
     Platform dependency: 'RHEL-8.4-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_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -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',
+        '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',
+        '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_host_macos.yaml

@@ -0,0 +1,59 @@
+Version: 2
+Configurations:
+-
+    Id: 'android-arm64-on-macos'
+    Template: 'qtci-macos-12-x86_64-102'
+    Target os: 'Android_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
+        '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-macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang'
+    ]
+-
+    Template: 'qtci-macos-12-x86_64-102'
+    Target os: 'Android_ANY'
+    Target arch: 'armv7'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a',
+        '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-macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-armv7-clang'
+    ]
+-
+    Template: 'qtci-macos-12-x86_64-102'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -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-macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang'
+    ]
+-
+    Template: 'qtci-macos-12-x86_64-102'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -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-macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang'
+    ]

coin/platform_configs/cmake_platforms_target_android_host_windows.yaml

@@ -0,0 +1,62 @@
+Version: 2
+Configurations:
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a -no-feature-pkg-config',
+        '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-windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-arm64-clang'
+    ]
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'armv7'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
+        '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-windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-armv7-clang'
+    ]
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86 -no-feature-pkg-config',
+        '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-windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-x86-clang'
+    ]
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
+        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64 -no-feature-pkg-config',
+        '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-windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-x86_64-clang'
+    ]

coin/platform_configs/cmake_platforms_wasm.yaml

@@ -38,7 +38,7 @@ Configurations:
         'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
         'CONAN_PROFILE=coin/conan/profiles/ci-windows-webassembly-x86_64-clang']
 -
-    Template: 'qtci-macos-12-x86_64-105'
+    Template: 'qtci-macos-12-x86_64-102'
     Target os: 'WebAssembly'
     Compiler: 'Clang'
     Target compiler: 'Clang'

coin/platform_configs/ios-tests.yaml

@@ -2,7 +2,7 @@ Version: 2
 Configurations:
 -
     Id: "ios-tests-target"
-    Template: 'qtci-macos-12-x86_64-105'
+    Template: 'qtci-macos-12-x86_64-102'
     Target os: 'IOS_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'

coin/platform_configs/linux_android_tests_developer.yaml

@@ -9,8 +9,8 @@ Configurations:
     Platform dependency: 'RHEL-8.4-host'
     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_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT}} -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}}',
+        '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/linux-x86_64-gcc',
         'CONAN_INSTALL_DIR={{.InstallDir}}/target',
         'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',

coin/platform_configs/macos.yaml

@@ -9,7 +9,7 @@ Configurations:
 
     -
         Id: 'macos-latest-xcode-universal-packaging-build'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-102'
         Compiler: 'Clang'
         Target arch: 'x86_64-arm64'
         Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
@@ -47,7 +47,7 @@ Configurations:
         Platform dependency: 'macos-latest-xcode-universal-packaging-build'
     -
         Id: 'macos-11-x86_64-tests'
-        Template: 'qtci-macos-11-x86_64-105'
+        Template: 'qtci-macos-11-x86_64-104'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-latest-xcode-universal-packaging-build'
@@ -65,7 +65,7 @@ Configurations:
         Platform dependency: 'macos-latest-xcode-universal-packaging-build'
     -
         Id: 'macos-12-x86_64-tests'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-102'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-latest-xcode-universal-packaging-build'
@@ -77,7 +77,7 @@ Configurations:
         Platform dependency: 'macos-latest-xcode-arm64-universal-build'
     -
         Id: 'macos-12-x86_64-arm64-universal-build-tests'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-102'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
         Platform dependency: 'macos-latest-xcode-arm64-universal-build'
@@ -90,7 +90,7 @@ Configurations:
 
     -
         Id: 'macos-latest-xcode-x86_64-developer-build'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-102'
         Compiler: 'Clang'
         Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
         Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
@@ -122,7 +122,7 @@ Configurations:
         Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
     -
         Id: 'macos-11-x86_64-developer-build-tests'
-        Template: 'qtci-macos-11-x86_64-105'
+        Template: 'qtci-macos-11-x86_64-104'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
         Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
@@ -134,7 +134,7 @@ Configurations:
         Platform dependency: 'macos-latest-xcode-arm64-developer-build'
     -
         Id: 'macos-12-x86_64-developer-build-tests'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-102'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly']
         Platform dependency: 'macos-latest-xcode-x86_64-developer-build'

coin/platform_configs/nightly_qnx710_host_windows.yaml

@@ -16,5 +16,4 @@ Configurations:
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch',
         'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_LIBRARY_PATH={{.Env.QNX_710}}\target\qnx7\aarch64le\lib;{{.Env.QNX_710}}\target\qnx7\aarch64le\usr\lib -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -G "Ninja"',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON'
     ]

coin/platform_configs/precheck.yaml

@@ -9,7 +9,7 @@ Include: [
   macos.yaml: [
     "macos-12-x86_64-tests",
   ],
-  cmake_platforms_target_android.yaml: [
+  cmake_platforms_target_android_host_macos.yaml: [
     "android-arm64-on-macos"
   ],
   cmake_platforms_qemu.yaml: [

coin/platform_configs/qmake2cmake.yaml

@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-macos-12-x86_64-105'
+    Template: 'qtci-macos-12-x86_64-102'
     Compiler: 'Clang'
     Features: ['DisableTests']
 -

coin/platform_configs/qtdeclarative.yaml

@@ -2,6 +2,7 @@ Version: 2
 Include: [
     cmake_platforms.yaml,
     integrity.yaml,
-    cmake_platforms_static_tests.yaml
+    cmake_platforms_static_tests.yaml,
+    linux_android_tests_developer.yaml
 ]
 Configurations: []

coin/platform_configs/qtsaferenderer.yaml

@@ -4,21 +4,21 @@ Configurations:
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'Mingw'
     Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
     Features: ['UseLegacyInstructions']
 -
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'Mingw'
     Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
     Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
 -
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Compiler: 'GCC'
     Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
     Compiler: 'GCC'
     Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'

coin/platform_configs/tqtc-android-automotive.yaml

@@ -1,5 +1,9 @@
 Version: 2
-Include: [ cmake_platforms_target_android.yaml ]
+Include: [
+    cmake_platforms_target_android_host_linux.yaml,
+    cmake_platforms_target_android_host_macos.yaml,
+    cmake_platforms_target_android_host_windows.yaml
+    ]
 Configurations:
 -
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
@@ -20,7 +24,7 @@ Configurations:
     ]
 -
     Id: 'macos-latest-xcode-universal-packaging-build'
-    Template: 'qtci-macos-12-x86_64-105'
+    Template: 'qtci-macos-12-x86_64-102'
     Compiler: 'Clang'
     Target arch: 'x86_64-arm64'
     Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
@@ -49,8 +53,8 @@ Configurations:
     Platform dependency: 'RHEL-8.4-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_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -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}}',
+        '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/linux-x86_64-gcc',
         'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
         'ANDROID_EMULATOR=@automotive_emulator_x86_api_30'

coin/platform_configs/tqtc-qtinsighttracker.yaml

@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []

coin/pre-provisioning/qtci-linux-SLES-15_SP4-x86_64/README_MANUAL_INSTALLATIONS

@@ -1,64 +0,0 @@
-### SUSE Linux Enterprise Server 15 SP4 ###
-
-# Installation #
-Language: English (US)
-Keyboard Layout: English (US)
-
-Available Extensions and Modules:
-   Basesystem Module
-   Desktop Applications Module
-   Python 3 Module
-   Server Applications Module
-
-SLES with GNOME
-
-Region: Etc
-Time Zone: UTC
-
-Create user with automatic login
-
-disable firewall
-
-Displays: Resolution 1280x800
-Power: Screen Blank: Never
-Privacy: Screen lock: Automatic screen lock: disable
-Privacy: Screen lock: Show notifications on lock screen: disable
-
-# Add user to sudoers
-Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
-
-sudo su -
-echo "add_drivers+=\"virtio-blk\"" >/etc/dracut.conf.d/virtio.conf
-dracut -f
-
-# Add these to /etc/polkit-default-privs.local
-org.freedesktop.udisks2.filesystem-mount yes
-org.freedesktop.udisks2.filesystem-mount-other-seat yes
-org.freedesktop.udisks2.filesystem-mount-system yes
-org.freedesktop.login1.power-off yes
-org.freedesktop.login1.power-off-ignore-inhibit yes
-org.freedesktop.login1.power-off-multiple-sessions yes
-
-# Set how DHClient creates CID for compatibility with older DHCP servers
-sudo sed -i 's/DHCLIENT_CREATE_CID=""/DHCLIENT_CREATE_CID="rfc2132"/' /etc/sysconfig/network/dhcp
-systemctl restart wicked
-
-# Create etc/sysconfig/network/ifcfg-eth1 with values:
-* BOOTPROTO='dhcp'
-* STARTMODE='auto'
-sudo ifup eth1
-
-# Register product
-# Add 'Available Extensions and Modules'
-* Basesystem Module 15 SP4 x86_64
-* Server Applications Module 15 SP4 x86_64
-
-zypper yum update
-
-* Download and run coin-setup
-
-# Fetch and run coin-setup
-Download http://coin/coin/binary/linux_386/coin-setup
-sudo ./coin-setup
-
-sudo reboot now

coin/pre-provisioning/qtci-macos-12.0-x86_64/README

@@ -27,12 +27,3 @@
   - Copy its content to Tier1 folder
 * Copy Tier1 folder to 101 NFS
    - Check folder access rights
-
-# How to upgrade existing Tier1 image
-
-* Open KVM connection to Intel mac Parallels host
-   - Open Parallels :: create new VM :: select macOS :: start installation but then stop it when machine boots to recovery mode
-* You should now have a virtual machine folder in /Users/qt/Parallels/<VM folder>
-* Remove files from <VM folder>/harddisk.hdd/ and copy Tier1 VM files from NFS to <VM folder>/harddisk.hdd/
-* Start the virtual machine and make needed changes
-* Copy <VM folder>/harddisk.hdd to NFS with updated number in its name

coin/provisioning/common/linux/android_linux.sh

@@ -55,20 +55,18 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 targetFolder="/opt/android"
 sdkTargetFolder="$targetFolder/sdk"
 
-sudo mkdir -p $sdkTargetFolder
-
 basePath="http://ci-files01-hki.intra.qt.io/input/android"
 
 toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
-ndkVersionLatest="r23b"
+ndkVersion="r23b"
-ndkVersionDefault=$ndkVersionLatest
+ndkFile="android-ndk-$ndkVersion-linux.zip"
 sdkBuildToolsVersion="31.0.0"
 sdkApiLevel="android-31"
 
 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
-ndkSha1Latest="f47ec4c4badd11e9f593a8450180884a927c330d"
+ndkSha1="f47ec4c4badd11e9f593a8450180884a927c330d"
-ndkSha1Default=$ndkSha1Latest
+
 # Android automotive
 sdkApiLevelAutomovie="android-30"
 androidAutomotive11Url="$basePath/${sdkApiLevelAutomovie}_automotive.tar.gz"
@@ -77,37 +75,18 @@ android11Sha="4a5cd2bea7ce323b724c3ff1faab13d99f9d2be9"
 
 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
+ndkTargetFile="/tmp/$ndkFile"
+ndkSourceFile="$basePath/$ndkFile"
 
-echo "Download and unzip Android SDK"
 DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile"
+DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
+echo "Unzipping Android NDK to '$targetFolder'"
+sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
 echo "Unzipping Android Tools to '$sdkTargetFolder'"
 sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder"
+rm "$ndkTargetFile"
 rm "$toolsTargetFile"
 
-function InstallNdk() {
-
-    ndkVersion=$1
-    ndkSha1=$2
-
-    if [[ ! -d $targetFolder/android-ndk-$ndkVersion ]]; then
-
-        ndkFile="android-ndk-$ndkVersion-linux.zip"
-        ndkTargetFile="/tmp/$ndkFile"
-        ndkSourceFile="$basePath/$ndkFile"
-
-        DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
-        echo "Unzipping Android NDK to '$targetFolder'"
-        sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
-        rm "$ndkTargetFile"
-    fi
-
-}
-
-InstallNdk $ndkVersionDefault $ndkSha1Default
-SetEnvVar "ANDROID_NDK_ROOT_DEFAULT" "$targetFolder/android-ndk-$ndkVersionDefault"
-InstallNdk $ndkVersionLatest $ndkSha1Latest
-SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest"
-
 echo "Changing ownership of Android files."
 if uname -a |grep -q "el7"; then
     sudo chown -R qt:wheel "$targetFolder"
@@ -143,6 +122,7 @@ echo "Checking the contents of Android SDK..."
 ls -l "$sdkTargetFolder"
 
 SetEnvVar "ANDROID_SDK_ROOT" "$sdkTargetFolder"
+SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion"
 SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
 SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
 

coin/provisioning/common/linux/install-git.sh

@@ -42,17 +42,17 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="2.36.1"
+version="2.31.1"
 officialUrl="https://github.com/git/git/archive/refs/tags/v$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/git/git-$version.tar.gz"
 targetFile="/tmp/git-$version.tar.gz"
-sha="a17c11da2968f280a13832d97f48e9039edac354"
+sha="859dbeaefd9cb6c590050b9cc4b83cb51e412410"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 sourceDir="/tmp/git-$version-source"
 mkdir $sourceDir
 tar -xzf "$targetFile" -C $sourceDir
 
-cd "$sourceDir/git-$version"
+cd "$sourceDir/git-2.31.1"
 installDir="$HOME/git"
 make configure
 ./configure --prefix=$installDir

coin/provisioning/common/linux/integrity.sh

@@ -48,9 +48,9 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-urlToolchainEs7="http://ci-files01-hki.intra.qt.io/input/integrity/integrity_toolchain_es7_05102022.zip"
+urlToolchainEs7="http://ci-files01-hki.intra.qt.io/input/integrity/integrity_toolchain_es7_20042022.zip"
 urlLibeglmegapack="http://ci-files01-hki.intra.qt.io/input/integrity/integrity_libeglmegapack.zip"
-SHA1_toolchainEs7="a95e11996d89218ac93493484e483d169976f565"
+SHA1_toolchainEs7="9e05277ec6a4610d4df565c3fbe24b9ce2a1f057"
 SHA1_Libeglmegapack="7f8ca64132eaea66202ea8db7f71f3300aab0777"
 targetFolder="$HOME"
 appPrefix=""

coin/provisioning/common/linux/qnx_qemu_build_files/local/opt_scripts/opt_nfs_qt

@@ -25,7 +25,7 @@ function configure()
         cat >output/option_files/post_start.opt_nfs <<EOF
 
 echo "---> Starting NFS"
-STARTU_P(fs_nfs3_t,__FS_NFS3_ID__) fs-nfs3 -t 172.31.1.1:$OPT_NFS_QT $OPT_NFS_QT
+STARTU_P(fs_nfs3_t,__FS_NFS3_ID__) fs-nfs3 172.31.1.1:$OPT_NFS_QT $OPT_NFS_QT
 EOF
     fi
 

coin/provisioning/common/macos/android.sh

@@ -1,112 +0,0 @@
-#!/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$
-##
-#############################################################################
-
-# This script install Android sdk and ndk.
-
-# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
-
-set -ex
-
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
-targetFolder="/opt/android"
-sdkTargetFolder="$targetFolder/sdk"
-
-basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android"
-
-toolsVersion="2.1"
-# toolsFile dertermines tools version
-toolsFile="commandlinetools-mac-6609375_latest.zip"
-
-ndkVersionLatest="r23b"
-ndkVersionDefault="$ndkVersionLatest"
-sdkBuildToolsVersion="31.0.0"
-# this is compile sdk version
-sdkApiLevel="android-31"
-
-toolsSourceFile="$basePath/$toolsFile"
-
-function InstallNdk() {
-
-    ndkVersion=$1
-
-    if [[ ! -d "${targetFolder}/android-ndk-${ndkVersion}" ]]; then
-        echo "Unzipping Android NDK $ndkVersion to '${targetFolder}'"
-        ndkSourceFile="$basePath/android-ndk-$ndkVersion-darwin*.zip"
-        sudo unzip -q "$ndkSourceFile" -d "$targetFolder"
-    fi
-
-}
-
-InstallNdk $ndkVersionDefault
-InstallNdk $ndkVersionLatest
-
-echo "Unzipping Android Tools to '$sdkTargetFolder'"
-sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder"
-
-echo "Changing ownership of Android files."
-sudo chown -R qt:wheel "$targetFolder"
-
-# Run the following command under `eval` or `sh -c` so that the shell properly splits it
-sdkmanager_no_progress_bar_cmd="tr '\r' '\n'  |  grep -v '^\[[ =]*\]'"
-
-sudo mkdir "$sdkTargetFolder/cmdline-tools"
-sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools"
-
-echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
-(echo "y"; echo "y") | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" "--sdk_root=$sdkTargetFolder" \
-    "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
-    | eval $sdkmanager_no_progress_bar_cmd
-
-echo "Checking the contents of Android SDK..."
-ls -l "$sdkTargetFolder"
-
-SetEnvVar "ANDROID_SDK_ROOT" "$sdkTargetFolder"
-SetEnvVar "ANDROID_NDK_ROOT_DEFAULT" "$targetFolder/android-ndk-$ndkVersionDefault"
-SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest"
-SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64"
-SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
-
-echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
-echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
-echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
-echo "Android NDK = $ndkVersionDefault" >> ~/versions.txt

coin/provisioning/common/macos/libiodbc.sh

@@ -46,7 +46,7 @@ set -ex
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-brew install --formula ${BASH_SOURCE%/*}/libiodbc.rb $*
+brew install ${BASH_SOURCE%/*}/libiodbc.rb $*
 
 # CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc
 

coin/provisioning/common/unix/openssl_for_android.sh

@@ -49,13 +49,6 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 version="1.1.1m"
-ndkVersionLatest="r23b"
-ndkVersionDefault=$ndkVersionLatest
-prebuiltOpensslNdkShaDarwinLatest="2624b0c2772e360bbbae7a7f2dc342e4b97f1a2e"
-prebuiltOpensslNdkShaLinuxLatest="f58dcb32b2d3e5edc7e5141ae139a50547805f60"
-prebuiltOpensslNdkShaDarwinDefault=$prebuiltOpensslNdkShaDarwinLatest
-prebuiltOpensslNdkShaLinuxDefault=$prebuiltOpensslNdkShaLinuxLatest
-
 : ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 21
 # Source built requires GCC and Perl to be in PATH.
 exports_file="/tmp/export.sh"
@@ -88,34 +81,18 @@ PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
 PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
 '
 
-function InstallPrebuiltOpenssl() {
-
-    ndkVersion=$1
-    nkdSha=$2
-    os=$3
-
-    if [[ ! -d $HOME/openssl/android/openssl ]]; 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}"
-        mv "${HOME}/openssl" "${HOME}/openssl_android_ndk_${ndkVersion}"
-        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"
+    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1.1.1m-for-android-ndk-r23b-darwin.tar.gz"
-    SetEnvVar "OPENSSL_ANDROID_HOME_DEFAULT" "$opensslHome"
+    sha="2624b0c2772e360bbbae7a7f2dc342e4b97f1a2e"
-    InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslNdkShaDarwinLatest "darwin"
-    SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
 else
-    InstallPrebuiltOpenssl $ndkVersionDefault $prebuiltOpensslNdkShaLinuxDefault "linux"
+    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1.1.1m-for-android-ndk-r23b-linux.tar.gz"
-    SetEnvVar "OPENSSL_ANDROID_HOME_DEFAULT" "$opensslHome"
+    sha="f58dcb32b2d3e5edc7e5141ae139a50547805f60"
-    InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslNdkShaLinuxLatest "linux"
-    SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
 fi
+targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
+DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
+tar -xzf "$targetFile" -C "${HOME}"
+
+opensslHome="${HOME}/openssl/android/openssl-${version}"
+SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
 
 echo "OpenSSL for Android = $version" >> ~/versions.txt

coin/provisioning/common/unix/squishInstall.sh

@@ -47,20 +47,20 @@ set -ex
 # This script will fetch and extract pre-buildt squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)
 
-version="7.0.1"
+version="6.7.2"
-qtBranch="63x"
+qtBranch="62x"
 installFolder="/opt"
 squishFolder="$installFolder/squish"
 preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable"
 licenseFile=".squish-license"
-licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/$licenseFile"
+licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$licenseFile"
-licenseSHA="e84b499a2011f9bb1a6eefc7b2338d7ae770927a"
+licenseSHA="bda9c3bce2b9a74cb10ead9e87a4ebacd9eef4c2"
 if uname -a |grep -q Darwin; then
     compressedFolder="prebuild-squish-$version-$qtBranch-mac.tar.gz"
-    sha1="ed8aa2e902808741fb9496a0d339d4c145530eef"
+    sha1="6b7d80be4d107ba53ac9218fe5ca79f72c6e1e2d"
 else
      compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz"
-     sha1="a9de35bba9b4dd9afabdde4df14564428745a979"
+     sha1="1f57efd6f21a994b07f28b0b44ff7972bbf51733"
 fi
 
 mountFolder="/tmp/squish"
@@ -110,8 +110,8 @@ fi
 if uname -a |grep -q "Ubuntu"; then
     if [ ! -e "/usr/lib/tcl8.6" ]; then
         sudo mkdir /usr/lib/tcl8.6
-        #this needs to be copied only to squish_for_qt62
+        #this needs to be copied only to squish_for_qt6
-        sudo cp "$squishFolder/squish_for_qt62/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
+        sudo cp "$squishFolder/squish_for_qt6/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
     fi
 fi
 
@@ -124,26 +124,26 @@ sudo chown qt:$usersGroup "$HOME/$licenseFile"
 
 echo "Set commands for environment variables in .bashrc"
 if uname -a |grep -q "Ubuntu"; then
-    echo "export SQUISH_PATH=$squishFolder/squish_for_qt62" >> ~/.profile
+    echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.profile
-    echo "export PATH=\$PATH:$squishFolder/squish_for_qt62/bin" >> ~/.profile
+    echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.profile
 else
-    echo "export SQUISH_PATH=$squishFolder/squish_for_qt63" >> ~/.bashrc
+    echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.bashrc
-    echo "export PATH=\$PATH:$squishFolder/squish_for_qt63/bin" >> ~/.bashrc
+    echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.bashrc
 fi
 
 echo "Verifying Squish, available installations:"
 ls -la $squishFolder
 
-if "$squishFolder/squish_for_qt62/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
+if "$squishFolder/squish_for_qt5/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
-  echo "Squish for Qt6.3 installation tested successfully"
+  echo "Squish for Qt5 installation tested successfully"
 else
-  echo "Squish for Qt6.3 test failed! Package wasn't installed correctly."
+  echo "Squish for Qt5 test failed! Package wasn't installed correctly."
   exit 1
 fi
-if "$squishFolder/squish_for_qt63/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
+if "$squishFolder/squish_for_qt6/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
-  echo "Squish for Qt6.2 installation tested successfully"
+  echo "Squish for Qt6 installation tested successfully"
 else
-  echo "Squish for Qt6.2 test failed! Package wasn't installed correctly."
+  echo "Squish for Qt6 test failed! Package wasn't installed correctly."
   exit 1
 fi
 

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

@@ -51,83 +51,59 @@ 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"
+$version = "1.1.1m"
-$ndk_version_latest = "r23b"
+$ndk_version = "r23b"
-$ndk_version_default = "$ndk_version_latest"
+$zip = Get-DownloadLocation ("openssl-${version}_fixes-ndk_root.tar.gz")
-$openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}_fixes-ndk_root.tar.gz")
+$prebuilt_zip = Get-DownloadLocation ("prebuilt-openssl-${version}-for-android-used-ndk-${ndk_version}-windows.zip")
-$openssl_sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206"
+$sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206"
-$prebuilt_sha1_ndk_latest = "0aebe55d2436f235e1a24ae9d1030cb6ce8f31da"
+$prebuilt_sha1 = "0aebe55d2436f235e1a24ae9d1030cb6ce8f31da"
-$prebuilt_sha1_ndk_default = "$prebuilt_sha1_ndk_latest"
 $destination = "C:\Utils\openssl-android-master"
+$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${version}-for-android-used-ndk-${ndk_version}-windows.zip"
 
-function Install($1, $2) {
+# msys unix style paths
-        $ndk_version = $1
+$ndkPath = "/c/Utils/Android/android-ndk-${ndk_version}"
-        $prebuilt_sha1 = $2
+$openssl_path = "/c/Utils/openssl-android-master"
+$cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin"
+if ((Test-Path $prebuilt_url)) {
+    Download $prebuilt_url $prebuilt_url $prebuilt_zip
+    Verify-Checksum $prebuilt_zip $prebuilt_sha1
+    Extract-7Zip $prebuilt_zip C:\Utils
+    Remove $prebuilt_zip
+} else {
+    # 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-${version}_fixes-ndk_root.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${version}_fixes-ndk_root.tar.gz $zip
+    Verify-Checksum $zip $sha1
 
-        # msys unix style paths
+    Extract-7Zip $zip C:\Utils\tmp
-        $openssl_path = "/c/Utils/openssl-android-master"
+    Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp
-        $ndk_path = "/c/Utils/Android/android-ndk-${ndk_version}"
+    Move-Item C:\Utils\tmp\openssl-${version} $destination
-        $cc_path = "$ndk_path/toolchains/llvm/prebuilt/windows-x86_64/bin"
+    Remove "$zip"
 
-        $prebuilt_url_ndk = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${openssl_version}-for-android-used-ndk-${ndk_version}-windows.zip"
+    Write-Host "Configuring OpenSSL $version for Android..."
-        $prebuilt_zip_ndk = Get-DownloadLocation ("prebuilt-openssl-${openssl_version}-for-android-used-ndk-${ndk_version}-windows.zip")
+    Push-Location $destination
+    # $ must be escaped in powershell...
 
-    if ((Test-Path $prebuilt_url_ndk)) {
+    function CheckExitCode {
-        Write-Host "Install prebuilt OpenSSL for Android"
-        Download $prebuilt_url_ndk $prebuilt_url_ndk $prebuilt_zip_ndk
-        Verify-Checksum $prebuilt_zip_ndk $prebuilt_sha1
-        Extract-7Zip $prebuilt_zip_ndk C:\Utils
-        Remove $prebuilt_zip_ndk
-    } 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
-        Verify-Checksum $openssl_compressed $openssl_sha1
 
-        Extract-7Zip $openssl_compressed C:\Utils\tmp
+        param (
-        Extract-7Zip C:\Utils\tmp\openssl-${openssl_version}_fixes-ndk_root.tar C:\Utils\tmp
+            $p
-        Move-Item C:\Utils\tmp\openssl-${openssl_version} $destination
+        )
-        Remove "$openssl_compressed"
 
-        Write-Host "Configuring OpenSSL $openssl_version for Android..."
+        if ($p.ExitCode) {
-        Push-Location $destination
+            Write-host "Process failed with exit code: $($p.ExitCode)"
-        # $ must be escaped in powershell...
+            exit 1
-
-        function CheckExitCode {
-
-            param (
-                $p
-            )
-
-            if ($p.ExitCode) {
-                Write-host "Process failed with exit code: $($p.ExitCode)"
-                exit 1
-            }
         }
-
-        $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
-
-        $make = 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 make -f $openssl_path/Makefile build_generated`"")
-        CheckExitCode $make
-
-        Pop-Location
-        Remove-item C:\Utils\tmp -Recurse -Confirm:$false
     }
 
-    Move-Item $destination "${destination}-${ndk_version}"
+    $configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
+    CheckExitCode $configure
+
+    $make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"")
+    CheckExitCode $make
+
+    Pop-Location
+    Remove-item C:\Utils\tmp -Recurse -Confirm:$false
 }
 
-# Install NDK Default version
+Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination"
-Install $ndk_version_default $prebuilt_sha1_ndk_default
+Write-Output "Android OpenSSL = $version" >> ~/versions.txt
-
-if (Test-Path -Path ${destination}-${ndk_version_latest}) {
-    Write-Host "OpenSSL for Android Latest version is the same than Default. Installation done."
-} else {
-    # Install NDK Latest version
-    Install $ndk_version_latest $prebuilt_sha1_ndk_latest
-}
-
-Set-EnvironmentVariable "OPENSSL_ANDROID_HOME_DEFAULT" "${destination}-${ndk_version_default}"
-Set-EnvironmentVariable "OPENSSL_ANDROID_HOME_LATEST" "${destination}-${ndk_version_latest}"
-Write-Output "Android OpenSSL = $openssl_version" >> ~/versions.txt

coin/provisioning/common/windows/android.ps1

@@ -46,17 +46,12 @@
 # That's why we need to use Andoid-21 API version in Qt 5.9.
 
 # NDK
-$ndkVersionLatest = "r23b"
+$ndkVersion = "r23b"
-$ndkVersionDefault = $ndkVersionLatest
+$ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows.zip"
-$ndkChecksumLatest = "6e3fb50022c611a2b13d02f5de5c21cc7206a298"
+$ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows.zip"
-$ndkChecksumDefault = $ndkChecksumLatest
+$ndkChecksum = "6e3fb50022c611a2b13d02f5de5c21cc7206a298"
-$ndkCachedUrlLatest = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersionLatest-windows.zip"
+$ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion"
-$ndkOfficialUrlLatest = "https://dl.google.com/android/repository/android-ndk-$ndkVersionLatest-windows.zip"
+$ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
-$ndkCachedUrlDefault = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersionDefault-windows.zip"
-$ndkOfficialUrlDefault = "https://dl.google.com/android/repository/android-ndk-$ndkVersionDefault-windows.zip"
-$ndkFolderLatest = "c:\Utils\Android\android-ndk-$ndkVersionLatest"
-$ndkFolderDefault = "c:\Utils\Android\android-ndk-$ndkVersionDefault"
-$ndkZip = "c:\Windows\Temp\android_ndk.zip"
 
 # SDK
 $toolsVersion = "2.1"
@@ -80,20 +75,11 @@ function Install($1, $2, $3, $4) {
     Download $offcialUrl $cacheUrl $zip
     Verify-Checksum $zip "$checksum"
     Extract-7Zip $zip C:\Utils\Android
-    Remove $zip
 }
 
-Write-Host "Installing Android NDK $ndkVersionDefault"
+Write-Host "Installing Android NDK $nkdVersion"
-Install $ndkCachedUrlDefault $ndkZip $ndkChecksumDefault $ndkOfficialUrlDefault
+Install $ndkCachedUrl $ndkZip $ndkChecksum $ndkOfficialUrl
-Set-EnvironmentVariable "ANDROID_NDK_ROOT_DEFAULT" $ndkFolderDefault
+Set-EnvironmentVariable "ANDROID_NDK_ROOT" $ndkFolder
-
-if (Test-Path -Path $ndkFolderLatest) {
-    Write-Host "Android Latest version is the same than Default. NDK installation done."
-} else {
-    Write-Host "Installing Android NDK $nkdVersionLatest"
-    Install $ndkCachedUrlLatest $ndkZip $ndkChecksumLatest $ndkOfficialUrlLatest
-    Set-EnvironmentVariable "ANDROID_NDK_ROOT_LATEST" $ndkFolderLatest
-}
 
 Install $toolsCachedUrl $sdkZip $toolsChecksum $sdkOfficialUrl
 New-Item -ItemType directory -Path $toolsFolder
@@ -131,4 +117,4 @@ cmd /c "dir C:\Utils\android"
 Write-Output "Android SDK tools= $toolsVersion" >> ~/versions.txt
 Write-Output "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
 Write-Output "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt
-Write-Output "Android NDK = $ndkVersionDefault" >> ~/versions.txt
+Write-Output "Android NDK = $ndkVersion" >> ~/versions.txt

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

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2022 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -38,15 +38,15 @@
 #############################################################################
 . "$PSScriptRoot\helpers.ps1"
 
-# Install Git
+# Install Git version 2.31.0
 
-$version = "2.36.1"
+$version = "2.31.0"
 if (Is64BitWinHost) {
     $arch = "-64-bit"
-    $sha1 = "594bdfc4e7704fb03fe14b7c0613087dfa3d4416"
+    $sha1 = "495d78f8d961e030944d9cb53af80d909d493c3f"
 } else {
     $arch = "-32-bit"
-    $sha1 = "1bbe040254c236607ccb84e14a3f608b1a4e959a"
+    $sha1 = "e57c040aea297b363aefaf26424f2e7a84a4a173"
 }
 $gitPackage = "C:\Windows\Temp\Git-" + $version + $arch + ".exe"
 $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\Git-" + $version + $arch + ".exe"

coin/provisioning/common/windows/squishInstall.ps1

@@ -42,12 +42,12 @@
 # This script will pre-installed squish package for Windows.
 # Squish is need by Release Test Automation (RTA)
 
-$version = "7.0.1"
+$version = "6.7.2"
-$qtBranch = "63x"
+$qtBranch = "62x"
 $targetDir = "C:\Utils\squish"
 $squishPackage = "C:\Utils\rta_squish"
 $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable"
-$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\$qtBranch"
+$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\"
 
 # Squish license
 $licensePackage = ".squish-license"
@@ -67,7 +67,7 @@ if (($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 10 Pro
     # In Windows 11 case $OSVersion is 'Windows 10 Pro'
     $winVersion = "win10"
     if (Is64BitWinHost) {
-        $sha1 = "9c1554ba55f3d4927f89d0d939a52988272d5494"
+        $sha1 = "3dd65fe3996bffd25892d5a7dfd2da26420a3f33"
     }
 } else {
     $winVersion = "n/a"

coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/01-disable_net_lso.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-sudo mkdir -p /etc/wicked/scripts
+sudo mkdir /etc/wicked/scripts
 echo "ethtool -K \$2 tso off" | sudo tee -a /etc/wicked/scripts/net_tso_off
 sudo chmod 744 /etc/wicked/scripts/net_tso_off
 echo "PRE_UP_SCRIPT='wicked:/etc/wicked/scripts/net_tso_off'" | sudo tee -a /etc/sysconfig/network/ifcfg-eth0

coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-enable-modules.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -ex
+
+sudo curl http://repo-clones.ci.qt.io:8081/tools/rmt-client-setup --output rmt-client-setup
+sudo chmod 755 rmt-client-setup
+sudo SUSEConnect --cleanup
+sudo sh rmt-client-setup https://repo-clones.ci.qt.io:8082 --yes --fingerprint 80:90:7F:45:C6:DF:45:8A:57:25:1E:17:5E:D7:E3:6E:96:1B:1B:95
+
+# Activate these modules
+sudo SUSEConnect -p sle-module-basesystem/15.3/x86_64
+sudo SUSEConnect -p sle-module-server-applications/15.3/x86_64
+sudo SUSEConnect -p sle-module-desktop-applications/15.3/x86_64
+sudo SUSEConnect -p sle-module-development-tools/15.3/x86_64
+sudo SUSEConnect -p sle-module-python2/15.3/x86_64
+
+sudo zypper lr -u

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

@@ -79,7 +79,7 @@ sudo zypper -nq install libicu-devel libicu-suse65_1
 sudo zypper -nq install gtk3-devel
 
 # Xinput2
-sudo zypper -nq install libXi-devel postgresql14 postgresql14-devel mysql-devel mysql mysql-server
+sudo zypper -nq install libXi-devel postgresql13 postgresql13-devel mysql-devel mysql mysql-server
 
 # system provided XCB libraries
 sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \
@@ -115,12 +115,12 @@ sudo zypper -nq install java
 # open-vm-tools requires update. Version in tier1 is broken and causes segfault on boot.
 sudo zypper -nq update open-vm-tools
 
+# RTA tests requires python 2 xml modules
+sudo zypper -nq install python-xml
+
 # Tools to build Git
 sudo zypper -nq install autoconf libcurl-devel libexpat-devel
 
-# Nodejs - required by QtWebengine
-sudo zypper -nq install nodejs16
-
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt
 

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

@@ -50,19 +50,15 @@ PROVISIONING_DIR="$(dirname "$0")/../"
 . "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
 
 
+# Python 2
+$CMD_PKG_INSTALL python-devel
+
 # Selected installation instructions coming from:
 # https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh
 export PACKAGE_NAME="python"
-python2Version="2.7.18"
+export PACKAGE_VERSION="3.7.6"
-python3Version="3.7.6"
+export PACKAGE_SHA=55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f
-python2Sha="678d4cf483a1c92efd347ee8e1e79326dc82810b"
+(
-python3Sha="55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f"
-
-
-function InstallPython {
-
-    PACKAGE_VERSION=$1
-    PACKAGE_SHA=$2
 
     $CMD_PKG_INSTALL  ncurses zlib-devel libffi-devel libopenssl-devel
 
@@ -96,14 +92,10 @@ function InstallPython {
         printf -- "Error while installing %s, exiting with 127 \n" "$PACKAGE_NAME"
         exit 127
     fi
+)
 
 
-}
+python3 --version | fgrep "$PACKAGE_VERSION"
-
-InstallPython "$python2Version" "$python2Sha"
-InstallPython "$python3Version" "$python3Sha"
-
-python3 --version | fgrep "$python3Version"
 
 pip3 install --user wheel
 pip3 install --user virtualenv

coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/99-cleanup.sh

@@ -41,20 +41,4 @@
 
 set -ex
 
-sudo curl http://repo-clones.ci.qt.io:8081/tools/rmt-client-setup --output rmt-client-setup
+"$(dirname "$0")"/../common/linux/cleanup_cache.sh
-sudo chmod 755 rmt-client-setup
-sudo SUSEConnect --cleanup
-sudo sh rmt-client-setup https://repo-clones.ci.qt.io:8082 --yes --fingerprint 80:90:7F:45:C6:DF:45:8A:57:25:1E:17:5E:D7:E3:6E:96:1B:1B:95
-
-# Activate these modules
-sudo SUSEConnect -p sle-module-basesystem/15.4/x86_64
-sudo SUSEConnect -p sle-module-server-applications/15.4/x86_64
-sudo SUSEConnect -p sle-module-desktop-applications/15.4/x86_64
-sudo SUSEConnect -p sle-module-development-tools/15.4/x86_64
-sudo SUSEConnect -p sle-module-python3/15.4/x86_64
-# sle-module-web-scripting is required for Nodejs
-sudo SUSEConnect -p sle-module-web-scripting/15.4/x86_64
-
-sudo zypper lr -u
-
-sudo rm -f /tmp/suse_rk.sh

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

@@ -156,8 +156,6 @@ installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)
 installPackages+=(openjdk-8-jdk)
-#Java 11 for Android
-installPackages+=(openjdk-11-jdk)
 installPackages+=(libgtk-3-dev)
 installPackages+=(ninja-build)
 installPackages+=(libssl-dev)

coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/85-qdoc_qtattributionsscanner.sh

@@ -48,8 +48,8 @@ set -e
 "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
-version="cc30cd5c91c8ae4bfe3736a2294969781bd48cc9"
+version="836becf90211c483d3d65987914c9fd962644be9"
-sha1="1779d5c18183e689a732bf015e99113dae9d7a16"
+sha1="ef8c886480b57dfc799c7c2dd71ed859787f94a8"
 url="https://download.qt.io/development_releases/prebuilt/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
 url_cached="http://ci-files01-hki.intra.qt.io/input/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
 

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

@@ -1,6 +1,99 @@
 #!/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$
+##
+#############################################################################
+
+# This script install Android sdk and ndk.
+
+# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
+
 set -ex
 
-# shellcheck source=../common/macos/android.sh
+# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/macos/android.sh"
+source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
+
+targetFolder="/opt/android"
+sdkTargetFolder="$targetFolder/sdk"
+
+basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android"
+
+toolsVersion="2.1"
+# toolsFile dertermines tools version
+toolsFile="commandlinetools-mac-6609375_latest.zip"
+
+ndkVersion="r23b"
+ndkFile="android-ndk-$ndkVersion-darwin.zip"
+sdkBuildToolsVersion="31.0.0"
+# this is compile sdk version
+sdkApiLevel="android-31"
+
+toolsSourceFile="$basePath/$toolsFile"
+ndkSourceFile="$basePath/$ndkFile"
+
+echo "Unzipping Android NDK to '$targetFolder'"
+sudo unzip -q "$ndkSourceFile" -d "$targetFolder"
+echo "Unzipping Android Tools to '$sdkTargetFolder'"
+sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder"
+
+echo "Changing ownership of Android files."
+sudo chown -R qt:wheel "$targetFolder"
+
+# Run the following command under `eval` or `sh -c` so that the shell properly splits it
+sdkmanager_no_progress_bar_cmd="tr '\r' '\n'  |  grep -v '^\[[ =]*\]'"
+
+sudo mkdir "$sdkTargetFolder/cmdline-tools"
+sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools"
+
+echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
+(echo "y"; echo "y") | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" "--sdk_root=$sdkTargetFolder" \
+    "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
+    | eval $sdkmanager_no_progress_bar_cmd
+
+echo "Checking the contents of Android SDK..."
+ls -l "$sdkTargetFolder"
+
+SetEnvVar "ANDROID_SDK_ROOT" "$sdkTargetFolder"
+SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion"
+SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64"
+SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
+
+echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
+echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
+echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
+echo "Android NDK = $ndkVersion" >> ~/versions.txt

coin/provisioning/qtci-macos-11.0-arm/25-python3.sh

@@ -45,7 +45,7 @@
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 
-brew install --formula ${BASH_SOURCE%/*}/pyenv.rb
+brew install ${BASH_SOURCE%/*}/pyenv.rb
 
 pyenv install 3.9.7
 

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

@@ -1,6 +1,99 @@
 #!/usr/bin/env bash
 
+#############################################################################
+##
+## Copyright (C) 2021 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$
+##
+#############################################################################
+
+# This script install Android sdk and ndk.
+
+# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
+
 set -ex
 
-# shellcheck source=../common/macos/android.sh
+# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/macos/android.sh"
+source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
+
+targetFolder="/opt/android"
+sdkTargetFolder="$targetFolder/sdk"
+
+basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android"
+
+toolsVersion="2.1"
+# toolsFile dertermines tools version
+toolsFile="commandlinetools-mac-6609375_latest.zip"
+
+ndkVersion="r23b"
+ndkFile="android-ndk-$ndkVersion-darwin.zip"
+sdkBuildToolsVersion="31.0.0"
+# this is compile sdk version
+sdkApiLevel="android-31"
+
+toolsSourceFile="$basePath/$toolsFile"
+ndkSourceFile="$basePath/$ndkFile"
+
+echo "Unzipping Android NDK to '$targetFolder'"
+sudo unzip -q "$ndkSourceFile" -d "$targetFolder"
+echo "Unzipping Android Tools to '$sdkTargetFolder'"
+sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder"
+
+echo "Changing ownership of Android files."
+sudo chown -R qt:wheel "$targetFolder"
+
+# Run the following command under `eval` or `sh -c` so that the shell properly splits it
+sdkmanager_no_progress_bar_cmd="tr '\r' '\n'  |  grep -v '^\[[ =]*\]'"
+
+sudo mkdir "$sdkTargetFolder/cmdline-tools"
+sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools"
+
+echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
+(echo "y"; echo "y") | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" "--sdk_root=$sdkTargetFolder" \
+    "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
+    | eval $sdkmanager_no_progress_bar_cmd
+
+echo "Checking the contents of Android SDK..."
+ls -l "$sdkTargetFolder"
+
+SetEnvVar "ANDROID_SDK_ROOT" "$sdkTargetFolder"
+SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion"
+SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64"
+SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
+
+echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
+echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
+echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
+echo "Android NDK = $ndkVersion" >> ~/versions.txt

coin/provisioning/qtci-macos-12.0-arm/25-python.sh

@@ -45,7 +45,7 @@
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 
-brew install --formula ${BASH_SOURCE%/*}/pyenv.rb
+brew install ${BASH_SOURCE%/*}/pyenv.rb
 
 pyenv install 3.9.7
 

coin/provisioning/qtci-windows-10-x86_64/25-llvm-mingw.ps1

@@ -41,15 +41,15 @@
 
 # This script installs LLVM-Mingw by mstorsjo
 
-$zip = Get-DownloadLocation "llvm-mingw-20220906-ucrt-x86_64.zip"
+$zip = Get-DownloadLocation "llvm-mingw-20220209-ucrt-x86_64.zip"
-$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/llvm-mingw-20220906-ucrt-x86_64.zip"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/llvm-mingw-20220209-ucrt-x86_64.zip"
-$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20220906/llvm-mingw-20220906-ucrt-x86_64.zip"
+$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20220209/llvm-mingw-20220209-ucrt-x86_64.zip"
 
 Download $url_official $url_cache $zip
-Verify-Checksum $zip "51ff525eefa4f5db905cc7b4c8b56079c3baed65"
+Verify-Checksum $zip "e24078c0d742b39eef4d739b345a0b6b49bc348b"
 Extract-7Zip $zip C:\
 
-Rename-Item C:\llvm-mingw-20220906-ucrt-x86_64 C:\llvm-mingw
+Rename-Item C:\llvm-mingw-20220209-ucrt-x86_64 C:\llvm-mingw
 
-Write-Output "llvm-mingw = 15.0.0" >> ~/versions.txt
+Write-Output "llvm-mingw = 14.0.0 RC1" >> ~/versions.txt
 Remove-Item -Path $zip

coin/provisioning/qtci-windows-10_21H2-x86_64/25-llvm-mingw.ps1

@@ -40,17 +40,17 @@
 . "$PSScriptRoot\..\common\windows\helpers.ps1"
 
 # This script installs LLVM-Mingw by mstorsjo
-# https://github.com/mstorsjo/llvm-mingw/releases/tag/20220906
+# https://github.com/mstorsjo/llvm-mingw/releases/tag/20220323
 
-$zip = Get-DownloadLocation "llvm-mingw-20220906-ucrt-x86_64.zip"
+$zip = Get-DownloadLocation "llvm-mingw-20220323-ucrt-x86_64.zip"
-$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/llvm-mingw-20220906-ucrt-x86_64.zip"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/llvm-mingw-20220323-ucrt-x86_64.zip"
-$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20220906/llvm-mingw-20220906-ucrt-x86_64.zip"
+$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20220323/llvm-mingw-20220323-ucrt-x86_64.zip"
 
 Download $url_official $url_cache $zip
-Verify-Checksum $zip "51ff525eefa4f5db905cc7b4c8b56079c3baed65"
+Verify-Checksum $zip "2b55846635f9e57fd37a19e0ba4183b3176ad57f"
 Extract-7Zip $zip C:\
 
-Rename-Item C:\llvm-mingw-20220906-ucrt-x86_64 C:\llvm-mingw
+Rename-Item C:\llvm-mingw-20220323-ucrt-x86_64 C:\llvm-mingw
 
-Write-Output "llvm-mingw = 15.0.0" >> ~/versions.txt
+Write-Output "llvm-mingw = 14.0.0" >> ~/versions.txt
 Remove-Item -Path $zip

coin/provisioning/qtci-windows-11_21H2-x86_64/25-llvm-mingw.ps1

@@ -40,17 +40,17 @@
 . "$PSScriptRoot\..\common\windows\helpers.ps1"
 
 # This script installs LLVM-Mingw by mstorsjo
-# https://github.com/mstorsjo/llvm-mingw/releases/tag/20220906
+# https://github.com/mstorsjo/llvm-mingw/releases/tag/20220323
 
-$zip = Get-DownloadLocation "llvm-mingw-20220906-ucrt-x86_64.zip"
+$zip = Get-DownloadLocation "llvm-mingw-20220323-ucrt-x86_64.zip"
-$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/llvm-mingw-20220906-ucrt-x86_64.zip"
+$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/llvm-mingw-20220323-ucrt-x86_64.zip"
-$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20220906/llvm-mingw-20220906-ucrt-x86_64.zip"
+$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20220323/llvm-mingw-20220323-ucrt-x86_64.zip"
 
 Download $url_official $url_cache $zip
-Verify-Checksum $zip "51ff525eefa4f5db905cc7b4c8b56079c3baed65"
+Verify-Checksum $zip "2b55846635f9e57fd37a19e0ba4183b3176ad57f"
 Extract-7Zip $zip C:\
 
-Rename-Item C:\llvm-mingw-20220906-ucrt-x86_64 C:\llvm-mingw
+Rename-Item C:\llvm-mingw-20220323-ucrt-x86_64 C:\llvm-mingw
 
-Write-Output "llvm-mingw = 15.0.0" >> ~/versions.txt
+Write-Output "llvm-mingw = 14.0.0" >> ~/versions.txt
 Remove-Item -Path $zip