Update submodules on '6.3 in qt/qt5'

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

coin/instructions/coin_qt_build_docs.yaml

@@ -0,0 +1,33 @@
+type: Group
+instructions:
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --build . --target qtbase/src/plugins/platforms/all qtbase/src/plugins/sqldrivers/all qttools/all --parallel -v"
+    maxTimeInSeconds: 12000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to build sources.
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake --build . --target docs -v"
+    maxTimeInSeconds: 12000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to generate docs.
+  - type: ExecuteCommand
+    command: "cp -r {{.BuildDir}}/qtbase/doc/config {{.BuildDir}}/doc"
+    maxTimeInSeconds: 12000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: "Failed to copy qtbase/doc/config to documentation directory."
+  - type: ExecuteCommand
+    command: "cp -r {{.BuildDir}}/qtbase/doc/global {{.BuildDir}}/doc"
+    maxTimeInSeconds: 12000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: "Failed to copy qtbase/doc/global to documentation directory."
+  - type: UploadArtifact
+    archiveDirectory: '{{.BuildDir}}/doc'
+    transferType: UploadModuleDocumentation
+    maxTimeInSeconds: 1800
+    maxTimeBetweenOutput: 1800
+enable_if:
+  condition: property
+  property: features
+  contains_value: "Documentation"

coin/instructions/coin_qt_build_template.yaml

@@ -0,0 +1,4 @@
+type: Group
+instructions:
+  - !include "{{qt/qt5}}/coin_qt_configure.yaml"
+  - !include "{{qt/qt5}}/coin_qt_build_docs.yaml"

coin/instructions/coin_qt_configure.yaml

@@ -0,0 +1,16 @@
+type: Group
+instructions:
+  - !include "{{qt/qtbase}}/prepare_building_env.yaml"
+  - type: MakeDirectory
+    directory: .git
+  - type: SetBuildDirectory
+    directory: "{{.SourceDir}}"
+  - type: ChangeDirectory
+    directory: "{{.BuildDir}}"
+  - type: ExecuteCommand
+    command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -DQT_BUILD_TESTS=OFF {{.SourceDir}}"
+    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
+    maxTimeInSeconds: 6000
+    maxTimeBetweenOutput: 1200
+    userMessageOnFailure: >
+      Failed to call cmake.

coin/module_config.yaml

@@ -6,54 +6,7 @@ accept_configuration:
 
 instructions:
   Build:
-    - !include "{{qt/qtbase}}/prepare_building_env.yaml"
-    - type: MakeDirectory
-      directory: .git
-    - type: SetBuildDirectory
-      directory: "{{.SourceDir}}"
-    - type: ChangeDirectory
-      directory: "{{.BuildDir}}"
-    - type: ExecuteCommand
-      command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -DQT_BUILD_TESTS=OFF {{.SourceDir}}"
-      executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
-      maxTimeInSeconds: 6000
-      maxTimeBetweenOutput: 1200
-      userMessageOnFailure: >
-        Failed to call cmake.
-
-    - type: Group
-      instructions:
-        - type: ExecuteCommand
-          command: "{{.Env.ENV_PREFIX}} cmake --build . --target qtbase/src/plugins/platforms/all qtbase/src/plugins/sqldrivers/all qttools/all --parallel -v"
-          maxTimeInSeconds: 12000
-          maxTimeBetweenOutput: 1200
-          userMessageOnFailure: >
-            Failed to build sources.
-        - type: ExecuteCommand
-          command: "{{.Env.ENV_PREFIX}} cmake --build . --target docs -v"
-          maxTimeInSeconds: 12000
-          maxTimeBetweenOutput: 1200
-          userMessageOnFailure: >
-            Failed to generate docs.
-        - type: ExecuteCommand
-          command: "cp -r {{.BuildDir}}/qtbase/doc/config {{.BuildDir}}/doc"
-          maxTimeInSeconds: 12000
-          maxTimeBetweenOutput: 1200
-          userMessageOnFailure: "Failed to copy qtbase/doc/config to documentation directory."
-        - type: ExecuteCommand
-          command: "cp -r {{.BuildDir}}/qtbase/doc/global {{.BuildDir}}/doc"
-          maxTimeInSeconds: 12000
-          maxTimeBetweenOutput: 1200
-          userMessageOnFailure: "Failed to copy qtbase/doc/global to documentation directory."
-        - type: UploadArtifact
-          archiveDirectory: '{{.BuildDir}}/doc'
-          transferType: UploadModuleDocumentation
-          maxTimeInSeconds: 1800
-          maxTimeBetweenOutput: 1800
-      enable_if:
-        condition: property
-        property: features
-        contains_value: "Documentation"
+    - !include "{{qt/qt5}}/coin_qt_build_template.yaml"
 
   Test:
     - type: EnvironmentVariable

coin/platform_configs/cmake_platforms.yaml

@@ -9,21 +9,6 @@ Include: [
     macos.yaml
     ]
 Configurations:
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache']
-    Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_widgets=OFF'
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests']
-    Configure arguments: '-DFEATURE_developer_build=ON -DFEATURE_gui=OFF'
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests']
-    Configure arguments: '-DFEATURE_developer_build=ON -DINPUT_opengl=no'
 -
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
@@ -34,7 +19,7 @@ Configurations:
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON'
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY'
 -
     Id: 'OpenSUSE-15.3-host'
     Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
@@ -43,11 +28,6 @@ Configurations:
     Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON'
     Environment variables: [
         'CONAN_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc']
--
-    Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY'
 -
     Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
     Compiler: 'GCC'
@@ -64,7 +44,7 @@ Configurations:
 -
     Template: 'qtci-windows-11_21H2-x86_64-51'
     Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'InsignificantTests']
+    Features: ['Packaging', 'Sccache', "DebugAndRelease"]
     Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: [
         'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
@@ -81,7 +61,7 @@ Configurations:
 -
     Template: 'qtci-windows-11_21H2-x86_64-51'
     Compiler: 'MSVC2022'
-    Features: ['Sccache', "DebugAndRelease", 'InsignificantTests']
+    Features: ['Sccache', "DebugAndRelease"]
     Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: [
         'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
@@ -111,7 +91,7 @@ Configurations:
     Id: 'Windows11_21H2-MSVC2019-x64-host'
     Template: 'qtci-windows-11_21H2-x86_64-51'
     Compiler: 'MSVC2019'
-    Features: ['Sccache', "DebugAndRelease", "InsignificantTests"]
+    Features: ['Sccache', "DebugAndRelease"]
     Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: [
         'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
@@ -120,7 +100,7 @@ Configurations:
     Template: 'qtci-windows-11_21H2-x86_64-51'
     Compiler: 'MSVC2019'
     Target arch: 'arm64'
-    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'InsignificantTests']
+    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging']
     Platform dependency: 'Windows11_21H2-MSVC2019-x64-host'
     Environment variables: [
         'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
@@ -169,7 +149,7 @@ Configurations:
     Id: 'Windows11_21H2-LLVM-x64-host'
     Template: 'qtci-windows-11_21H2-x86_64-51'
     Compiler: 'Clang'
-    Features: ['Sccache', 'InsignificantTests']
+    Features: ['Sccache']
     Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
     Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'LLVM_INSTALL_DIR=C:\llvm-mingw']

coin/platform_configs/qtbase.yaml

@@ -19,5 +19,6 @@ Configurations:
         'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -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']
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
+        'ANDROID_EMULATOR=@emulator_x86_api_23']
 

coin/platform_configs/tqtc-android-automotive.yaml

@@ -5,6 +5,11 @@ Include: [
     cmake_platforms_target_android_host_windows.yaml
     ]
 Configurations:
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'Documentation', 'TestDocs']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace'
 -
     Id: 'Windows10_21H2-Mingw11-x64-host'
     Template: 'qtci-windows-10_21H2-x86_64-51'
@@ -40,7 +45,7 @@ Configurations:
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: 'RHEL-8.4-host'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun']
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'Insignificant']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -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',

coin/provisioning/common/linux/android_linux.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.
@@ -136,6 +136,6 @@ echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86"  \
 echo "Checking the contents of Android SDK again..."
 ls -l "$sdkTargetFolder"
 
-echo "no" | ./avdmanager create avd -n x86emulator -k "system-images;android-23;google_apis;x86" -c 2048M -f
+echo "no" | ./avdmanager create avd -n emulator_x86_api_23 -k "system-images;android-23;google_apis;x86" -c 2048M -f
 # Purely informative, show the list of avd devices
 ./avdmanager list avd

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

@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2022 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## 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 http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://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 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script install git from sources.
+# Requires GCC and Perl to be in PATH.
+set -ex
+
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+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="859dbeaefd9cb6c590050b9cc4b83cb51e412410"
+DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
+sourceDir="/tmp/git-$version-source"
+mkdir $sourceDir
+tar -xzf "$targetFile" -C $sourceDir
+
+cd "$sourceDir/git-2.31.1"
+installDir="$HOME/git"
+make configure
+./configure --prefix=$installDir
+make all
+sudo make install
+
+SetEnvVar "PATH" "\"$installDir/bin:\$PATH\""
+
+$installDir/bin/git --version

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

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+set -ex
+
+brew install git

coin/provisioning/common/unix/install-openssl.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,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.1k"
+version="1.1.1m"
 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="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
+sha="39d424c4411e45f1570073d7a71b1830b96007ca"
 opensslHome="${HOME}/openssl-${version}"
 opensslSource="${opensslHome}-src"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"

coin/provisioning/common/unix/openssl_for_android.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 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="1.1.1k"
+version="1.1.1m"
 : ' 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"
@@ -66,7 +66,7 @@ fi
 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="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
+sha="39d424c4411e45f1570073d7a71b1830b96007ca"
 opensslHome="${HOME}/openssl/android/openssl-${version}"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 mkdir -p "${HOME}/openssl/android/"
@@ -82,11 +82,11 @@ 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-1_1_1_k_for-android-ndk-21_darwin.tar.gz"
-    sha="6e3e48441ff58596f25bc27fdc05ae43e5a7581d"
+    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_m_for-android-ndk-21_darwin.tar.gz"
+    sha="d8c189f8a329263365c73bc471b6c9c68d117e3a"
 else
-    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21.tar.gz"
-    sha="8c4db1eb8460d749c998a0e033b3939123cbc5ac"
+    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_m_for-android-ndk-21.tar.gz"
+    sha="db028f25ca4d000fe2317c3abfdfa0c234833549"
 fi
 targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
 DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"

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

@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## 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.
@@ -51,10 +51,10 @@ 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
 
-$version = "1.1.1k"
+$version = "1.1.1m"
 $zip = Get-DownloadLocation ("openssl-$version.tar.gz")
 $prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip")
-$sha1 = "bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
+$sha1 = "39d424c4411e45f1570073d7a71b1830b96007ca"
 $prebuilt_sha1 = "07fad2a44ffa90261a779782bd64fe2304487945"
 $destination = "C:\Utils\openssl-android-master"
 $prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip"

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

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## 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.
@@ -56,9 +56,9 @@
 # nmake install
 #################################################################################################################################################
 
-$version = "1_1_1_k"
+$version = "1_1_1_m"
 $url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version-arm64.zip"
-$sha1 = "e31f6d3a4af225f9314830aad099bb8e5d4a7ff1"
+$sha1 = "52963bba9b542eb885f19641f5cd78870246ea02"
 $installFolder = "C:\openssl_arm64"
 $zip_package = "C:\Windows\Temp\$version.zip"
 

coin/provisioning/common/windows/openssl.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## 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.
@@ -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_1k"
+$version = "1_1_1m"
 $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 = "ab5367a1f46a3779a870fe2c1a99e03f8ffa3041"
+    $sha1 = "16d83bd6d36be7b3ea85f822135352fa8f8d8134"
 
     Write-Host "Fetching from URL ..."
     Download $externalUrl $internalUrl $packagex64
@@ -80,7 +80,7 @@ if (Is64BitWinHost) {
 
 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
-$sha1 = "49f5b7fe01d686f706071c9a00d19bd69f2e7371"
+$sha1 = "1d7146e56b201404ce67f1e636eab360211c175a"
 
 Write-Host "Fetching from URL ..."
 Download $externalUrl $internalUrl $packagex86

coin/provisioning/qtci-linux-CentOS-8.3-x86_64/04-install-packages.sh

@@ -51,6 +51,11 @@ installPackages+=(glib2-devel)
 installPackages+=(openssl-devel)
 installPackages+=(freetype-devel)
 installPackages+=(fontconfig-devel)
+installPackages+=(curl-devel)
+installPackages+=(expat-devel)
+installPackages+=(gettext-devel)
+installPackages+=(perl-devel)
+installPackages+=(dh-autoreconf)
 # cmake build
 installPackages+=(ninja-build)
 installPackages+=(pcre2-devel)

coin/provisioning/qtci-linux-CentOS-8.3-x86_64/30-install-git.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"

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

@@ -51,6 +51,11 @@ installPackages+=(glib2-devel)
 installPackages+=(openssl-devel)
 installPackages+=(freetype-devel)
 installPackages+=(fontconfig-devel)
+installPackages+=(curl-devel)
+installPackages+=(expat-devel)
+installPackages+=(gettext-devel)
+installPackages+=(perl-devel)
+installPackages+=(dh-autoreconf)
 # cmake build
 installPackages+=(ninja-build)
 installPackages+=(pcre2-devel)

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/30-install-git.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"

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

@@ -51,6 +51,11 @@ installPackages+=(glib2-devel)
 installPackages+=(openssl-devel)
 installPackages+=(freetype-devel)
 installPackages+=(fontconfig-devel)
+installPackages+=(curl-devel)
+installPackages+=(expat-devel)
+installPackages+=(gettext-devel)
+installPackages+=(perl-devel)
+installPackages+=(dh-autoreconf)
 # cmake build
 installPackages+=(ninja-build)
 installPackages+=(pcre2-devel)
@@ -84,6 +89,9 @@ installPackages+=(python2-devel python2-pip)
 # Python 3 with python-devel, pip and virtualenv
 installPackages+=(python36)
 installPackages+=(python36-devel)
+# Python 3.8 for pyside. Qt for Python support for Python 3.6 will be deprecated in within pyside6.3
+installPackages+=(python38)
+installPackages+=(python38-devel)
 # WebEngine
 installPackages+=(bison)
 installPackages+=(flex)
@@ -156,6 +164,8 @@ sudo dnf -y module install nodejs:12
 # working, but we can use installed pip
 sudo pip3 install --upgrade pip
 sudo pip3 install virtualenv wheel
+# Just make sure we have virtualenv to run with python3.8 -m virtualenv
+python3.8 -m pip install virtualenv --user
 
 sudo /usr/bin/pip3 install wheel
 # Install all needed packages in a special wheel cache directory

coin/provisioning/qtci-linux-RHEL-8.4-x86_64/30-install-git.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"

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

@@ -118,6 +118,9 @@ 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
+
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt
 

coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/30-install-git.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"

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

@@ -133,6 +133,7 @@ installPackages+=(libgl1-mesa-glx)
 installPackages+=(libgl1-mesa-dev)
 installPackages+=(libegl1-mesa-dev)
 installPackages+=(curl)
+installPackages+=(libcurl4-openssl-dev)
 installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/30-install-git.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"

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

@@ -151,6 +151,7 @@ installPackages+=(libegl-dev)
 installPackages+=(libglvnd-dev)
 installPackages+=(libgles2-mesa-dev)
 installPackages+=(curl)
+installPackages+=(libcurl4-openssl-dev)
 installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
 installPackages+=(zlib1g)

coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/30-install-git.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"

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

@@ -55,6 +55,9 @@ sudo zypper -nq install libspeechd-devel
 # make
 sudo zypper -nq install make
 
+# Tools to build Git
+sudo zypper -nq install autoconf libcurl-devel libexpat-devel
+
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt
 

coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/30-install-git.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/linux/install-git.sh"

coin/provisioning/qtci-macos-10.14-x86_64/30-install-git.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/install-git.sh"

coin/provisioning/qtci-macos-10.15-x86_64/30-install-git.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/install-git.sh"

coin/provisioning/qtci-macos-11.0-x86_64/30-install-git.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+"$BASEDIR/../common/macos/install-git.sh"