Merge remote-tracking branch 'origin/6.1' into pyside6.1

Change-Id: I7c69ec340c2c36d5c4eb30c87586fb45449968bf

.gitmodules

@@ -18,6 +18,7 @@
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
+	recommends = qttools
 	path = qtactiveqt
 	url = ../qtactiveqt.git
 	branch = 6.1
@@ -31,7 +32,7 @@
 	status = ignore
 [submodule "qttools"]
 	depends = qtbase
-	recommends = qtdeclarative qtactiveqt
+	recommends = qtdeclarative
 	path = qttools
 	url = ../qttools.git
 	branch = 6.1
@@ -121,13 +122,14 @@
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
-	recommends = qtdeclarative qtshadertools
+	recommends = qtdeclarative qtshadertools qttools
 	path = qt3d
 	url = ../qt3d.git
 	branch = 6.1
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
+	recommends = qttools
 	path = qtimageformats
 	url = ../qtimageformats.git
 	branch = 6.1
@@ -234,25 +236,25 @@
 	status = ignore
 [submodule "qtcharts"]
 	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
+	recommends = qtdeclarative qtmultimedia qttools
 	path = qtcharts
 	url = ../qtcharts.git
 	branch = 6.1
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
+	recommends = qtdeclarative qtmultimedia qttools
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
 	branch = 6.1
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia qtquickcontrols
+	recommends = qtmultimedia qtquickcontrols qttools
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
 	branch = 6.1
-	status = addon
+	status = additionalLibrary
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -262,6 +264,7 @@
 	status = ignore
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
+	recommends = qttools
 	path = qtscxml
 	url = ../qtscxml.git
 	branch = 6.1
@@ -275,10 +278,11 @@
 	status = ignore
 [submodule "qtnetworkauth"]
 	depends = qtbase
+	recommends = qttools
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
 	branch = 6.1
-	status = addon
+	status = additionalLibrary
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -295,10 +299,11 @@
 	status = ignore
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
+	recommends = qttools
 	path = qtlottie
 	url = ../qtlottie.git
 	branch = 6.1
-	status = addon
+	status = additionalLibrary
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
@@ -328,16 +333,16 @@
 	path = qtcoap
 	url = ../qtcoap.git
 	branch = 6.1
-	status = addon
+	status = additionalLibrary
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative qttools
 	path = qtmqtt
 	url = ../qtmqtt.git
 	branch = 6.1
-	status = addon
+	status = additionalLibrary
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative qtquickcontrols2 qttools
 	path = qtopcua
 	url = ../qtopcua.git
 	branch = 6.1
-	status = addon
+	status = additionalLibrary

CMakeLists.txt

@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION ${__qt_minimum_cmake_version})
 include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")
 
 project(Qt
-    VERSION "${QT_REPO_MODULE_VERSION}"
+    VERSION 6.1.0
     DESCRIPTION "Qt Libraries"
     HOMEPAGE_URL "https://qt.io/"
     LANGUAGES CXX C ASM

cmake/QtTopLevelHelpers.cmake

@@ -108,9 +108,8 @@ function(qt_internal_sort_module_dependencies modules out_all_ordered dependenci
                 "${${module_dependencies_list_var_name}}" PARENT_SCOPE)
         if(NOT module_depends)
             list(APPEND no_dependencies "${module}")
-        else()
-            set(ordered "${out_ordered}")
         endif()
+        set(ordered "${out_ordered}")
     endforeach()
     if (no_dependencies)
         list(APPEND ordered "${no_dependencies}")

coin/module_config.yaml

@@ -35,16 +35,8 @@ instructions:
           maxTimeBetweenOutput: 1200
           userMessageOnFailure: >
             Failed to generate docs.
-        - type: ExecuteCommand
+        - type: MakeDirectory
-          command: "cp -r {{.BuildDir}}/qtbase/doc/config {{.BuildDir}}/doc"
+          directory: "{{.BuildDir}}/qtbase/doc/global"
-          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

coin/platform_configs/cmake_platforms.yaml

@@ -1,71 +1,8 @@
 Version: 2
 Include: [
-    cmake_platforms_qemu.yaml,
-    cmake_platforms_target_android_host_linux.yaml,
-    cmake_platforms_target_android_host_macos.yaml,
-    cmake_platforms_target_android_host_windows.yaml,
     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 -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',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests']
-    Configure arguments: '-DFEATURE_developer_build=ON -DFEATURE_gui=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',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests']
-    Configure arguments: '-DFEATURE_developer_build=ON -DINPUT_opengl=no -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',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'Documentation']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace -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',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
--
-    Id: 'Ubuntu-20.04-host'
-    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 -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',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
--
-    Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -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',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
--
-    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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY'
-    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
--
-    Template: 'qtci-linux-SLES-15_SP2-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -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',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
     Template: 'qtci-windows-10-x86_64-52'
     Compiler: 'MSVC2019'
@@ -76,14 +13,6 @@ Configurations:
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
     ]
--
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'MSVC2019'
-    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',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
     Id: 'CentOS-8.3-host'
     Template: 'qtci-linux-CentOS-8.3-x86_64-50'
@@ -92,73 +21,3 @@ Configurations:
     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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY'
     Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
--
-    Template: 'qtci-macos-10.14-x86_64'
-    Target os: 'IOS_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
-    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
--
-    Id: 'Windows10-Mingw8-x64-host'
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'Mingw'
-    Features: ['Packaging', 'Sccache']
-    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -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={{.Env.MINGW810}}\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={{.Env.LLVM_INSTALL_DIR_mingw}}'
-    ]
--
-    Id: 'Windows10-LLVM-x64-host'
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'Clang'
-    Features: ['Sccache']
-    Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_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']
--
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
-    Features: ['Sccache']
-    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=ON -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'
-    Environment variables: ['Path={{.Env.MINGW810}}\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={{.Env.LLVM_INSTALL_DIR_mingw}}']
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QNX_710'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'DisableTests']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QNX_710'
-    Target arch: 'arm64'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'DisableTests']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QNX_710'
-    Target arch: 'armv7'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'DisableTests']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']

coin/platform_configs/cmake_platforms_static_tests.yaml

@@ -1,28 +0,0 @@
-Version: 2
-Configurations:
--
-    Template: 'qtci-linux-SLES-15_SP2-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'MinimalStaticTests']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -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',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
--
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'MSVC2019'
-    Features: ['Sccache', 'MinimalStaticTests']
-    Configure arguments: '-G"Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_SHARED_LIBS=OFF -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -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',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
-    ]
--
-    Template: 'qtci-macos-11.0-x86_64-102'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'MinimalStaticTests']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DFEATURE_framework=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',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-    ]

coin/platform_configs/cmake_platforms_target_android_host_linux.yaml

@@ -44,3 +44,48 @@ Configurations:
     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_HOME}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'arm64'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'Ubuntu-18.04-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    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_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'armv7'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'Ubuntu-18.04-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    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_HOME}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'Ubuntu-18.04-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    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_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'Ubuntu-18.04-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    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_HOME}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+

coin/platform_configs/macos-developer-build-tests.yaml

@@ -10,11 +10,11 @@ Configurations:
         Id: 'macos-10.15-x86_64-developer-build-tests'
         Template: 'qtci-macos-10.15-x86_64-102'
         Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
+        Features: ['Sccache', 'TestOnly', 'InsignificantTests']
         Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
     -
         Id: 'macos-11-x86_64-developer-build-tests'
         Template: 'qtci-macos-11.0-x86_64-102'
         Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
+        Features: ['Sccache', 'TestOnly', 'InsignificantTests']
         Platform dependency: 'macos-latest-xcode-x86_64-developer-build'

coin/platform_configs/macos.yaml

@@ -11,36 +11,3 @@ Configurations:
             'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
             'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
             ]
-
-    # Then run tests on all supported deployment targets
-    -
-        Id: 'macos-10.14-x86_64-tests'
-        Template: 'qtci-macos-10.14-x86_64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
-    -
-        Id: 'macos-10.15-x86_64-tests'
-        Template: 'qtci-macos-10.15-x86_64-102'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
-    -
-        Id: 'macos-11-x86_64-tests'
-        Template: 'qtci-macos-11.0-x86_64-102'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
-
-    # Build developer builds for all modules, but only run tests for qtbase and declarative.
-    # See macos-developer-build-tests.yaml for the tests
-    -
-        Id: 'macos-latest-xcode-x86_64-developer-build'
-        Template: 'qtci-macos-11.0-x86_64-102'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'DoNotRunTests']
-        Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -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',
-            'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-            ]

coin/platform_configs/pyside-setup.yaml

@@ -3,7 +3,7 @@ Module only: True
 Include: [cmake_platforms.yaml]
 Configurations:
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Compiler: 'GCC'
     Features: ['TestOnly', 'LicenseCheck']
 

coin/platform_configs/qdb.yaml

@@ -1,40 +1,3 @@
 Version: 2
-Configurations:
+Include: [cmake_platforms.yaml]
--
+Configurations: []
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', "Static"]
-    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo" -DFEATURE_msvc_obj_debug_info=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 -DBUILD_SHARED_LIBS=OFF'
-    Environment variables: [
-        'NON_QTBASE_CONFIGURE_ARGS=-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={{.Env.LLVM_INSTALL_DIR_msvc}}'
-    ]
--
-    Id: 'CentOS-8.3-host'
-    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', "Static"]
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=OFF -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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY -DBUILD_SHARED_LIBS=OFF'
-    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
--
-    Id: 'macOS-11.0'
-    Template: 'qtci-macos-11.0-x86_64-102'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=OFF -DFEATURE_headersclean=ON -DFEATURE_framework=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DBUILD_SHARED_LIBS=OFF'
-    Features: ['Packaging', 'Sccache', "Static"]
-    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
--
-    Id: 'Windows10-Mingw8-x64-host'
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'Mingw'
-    Features: ['Packaging', 'Sccache', "Static"]
-    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=OFF -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}}\.. -DBUILD_SHARED_LIBS=OFF'
-    Environment variables: [
-        'Path={{.Env.MINGW810}}\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={{.Env.LLVM_INSTALL_DIR_mingw}}'
-    ]

coin/platform_configs/qt-creator.yaml

@@ -1,33 +0,0 @@
-Version: 2
-Module only: True
-Configurations:
--
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
-    Configure arguments: ''
-    Environment variables: []
-    Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
--
-    Template: 'qtci-windows-10-x86-4'
-    Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
-    Configure arguments: ''
-    Environment variables: []
-    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'x86']
--
-    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'DisableTests']
-    Configure arguments: ''
-    Environment variables: []
--
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Features: ['Packaging', 'DisableTests', 'Sccache', 'DebugAndRelease']
-    Configure arguments: ''
-    Environment variables: []
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'LicenseCheck']

coin/platform_configs/qtbase.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    cmake_platforms_static_tests.yaml,
     macos-developer-build-tests.yaml
 ]
 Configurations:
@@ -16,3 +15,14 @@ Configurations:
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'Ubuntu-18.04-host'
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'InsignificantTests']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']

coin/platform_configs/tqtc-pyside-setup.yaml

@@ -3,7 +3,7 @@ Module only: True
 Include: [cmake_platforms.yaml]
 Configurations:
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Compiler: 'GCC'
     Features: ['TestOnly', 'LicenseCheck']
 

coin/provisioning/common/linux/android_linux.sh

@@ -53,13 +53,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android"
 
 toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
-ndkVersion="r22b"
+ndkVersion="r21d"
 ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
 sdkBuildToolsVersion="29.0.3"
 sdkApiLevel="android-29"
 
 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
-ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc"
+ndkSha1="bcf4023eb8cb6976a4c7cff0a8a8f145f162bf4d"
 
 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"

coin/provisioning/common/linux/openssl_for_android_linux.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,18 +33,14 @@
 ##
 #############################################################################
 
-# This script install prebuilt OpenSSL which was built against Android NDK 21.
+# This script install OpenSSL from sources.
-# OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories
+# 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="1.1.1k"
-: ' 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"
 # source previously made environmental variables.
 if uname -a |grep -q "Ubuntu"; then
@@ -57,10 +53,11 @@ else
     rm -rf "$exports_file"
 fi
 
+version="1.1.1g"
 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="b213a293f2127ec3e323fb3cfc0c9807664fd997"
 opensslHome="${HOME}/openssl/android/openssl-${version}"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 mkdir -p "${HOME}/openssl/android/"
@@ -70,14 +67,7 @@ TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin
 cd "$opensslHome"
 PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
 PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
-'
-prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21.tar.gz"
-targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
-sha="8c4db1eb8460d749c998a0e033b3939123cbc5ac"
-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/linux/qnx_700.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,9 +33,35 @@
 ##
 #############################################################################
 
+# This script installs QNX 7.
+
 set -ex
 
-sudo yum -y install gcc-toolset-9
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-echo "source /opt/rh/gcc-toolset-9/enable" >> ~/.bashrc
+targetFolder="/opt/"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-linux.tar.xz"
+sha1="9fb115b2c84b8e7b6016a51cc421a763bda298a1"
+folderName="qnx700"
+targetFile="qnx700.tar.xz"
+wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
+echo "$sha1  $targetFile" | sha1sum --check
+if [ ! -d "$targetFolder" ]; then
+    mkdir -p $targetFolder
+fi
+sudo tar -C $targetFolder -Jxf $targetFile
+sudo chown -R qt:users "$targetFolder"/"$folderName"
 
+# Verify that we have last file in tar
+if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
+    echo "Installation failed!"
+    exit -1
+fi
+
+rm -rf $targetFile
+
+# Set env variables
+SetEnvVar "QNX_700" "$targetFolder$folderName"
+
+echo "QNX SDP = 7.0.0" >> ~/versions.txt

coin/provisioning/common/linux/qnx_710.sh

@@ -1,89 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2021 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 installs QNX 7.
-
-set -ex
-
-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
-DownloadAndExtract () {
-    url=$1
-    sha=$2
-    file=$3
-    folder=$4
-
-    DownloadURL "$url" "$url" "$sha" "$file"
-    sudo tar -C $folder -Jxf $file
-
-    rm -rf $file
-}
-
-targetFolder="/opt/"
-folderName="qnx710"
-targetPath="$targetFolder$folderName"
-
-if [ ! -d "$targetFolder" ]; then
-    mkdir -p $targetFolder
-fi
-
-# QNX SDP
-sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx710-20201027-linux.tar.xz"
-targetFile="qnx710.tar.xz"
-sha1="fa9eb0f4247504a546cb014784646847eb6c8114"
-DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
-
-# Toolchain files
-sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx-toolchains.tar.xz"
-targetFile="qnx-toolchains.tar.xz"
-sha1="d8a97605d80a2296f98caba3854557ca0dd5d7d3"
-DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetPath"
-
-sudo chown -R qt:users "$targetPath"
-
-# Verify that we have last files in tars
-if [ ! -f $targetPath/qnxsdp-env.sh ] || [ ! -f $targetPath/qnx-toolchain-x8664.cmake ]
-then
-    echo "QNX toolchain installation failed!"
-    exit -1
-fi
-
-# Set env variables
-SetEnvVar "QNX_710" "$targetPath"
-
-echo "QNX SDP = 7.1.0" >> ~/versions.txt

coin/provisioning/common/macos/disable_net_lso.sh

@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2021 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$
-##
-#############################################################################
-
-echo """<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-    <key>Label</key>
-    <string>net_tcp_tso_off</string>
-    <key>MachServices</key>
-    <dict>
-        <key>net_tcp_tso_off</key>
-        <true/>
-    </dict>
-    <key>Program</key>
-    <string>/usr/sbin/sysctl</string>
-    <key>ProgramArguments</key>
-    <array>
-        <string>/usr/sbin/sysctl</string>
-        <string>net.inet.tcp.tso=0</string>
-    </array>
-    <key>UserName</key>
-    <string>root</string>
-    <key>GroupName</key>
-    <string>wheel</string>
-    <key>KeepAlive</key>
-    <true/>
-    <key>RunAtLoad</key>
-    <true/>
-</dict>
-</plist>
-""" | sudo tee -a /Library/LaunchDaemons/net_tcp_tso_off.plist

coin/provisioning/common/macos/install_xcode.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,9 +33,6 @@
 ##
 #############################################################################
 
-# shellcheck source=./../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-
 # This script installs Xcode
 # Prerequisites: Have Xcode prefetched to local cache as xz compressed.
 # This can be achieved by fetching Xcode_8.xip from Apple Store.
@@ -55,12 +52,7 @@ function InstallXCode() {
     if [[ $sourceFile =~ tar ]]; then
         cd /Applications/ && sudo tar -zxf "$sourceFile"
     elif [[ $sourceFile =~ "xip" ]]; then
-        if [[ $sourceFile =~ "http" ]]; then
+        cd /Applications/ && xip -x "$sourceFile"
-            Download $sourceFile /Applications/Xcode_$version.xip
-            cd /Applications/ && xip -x "Xcode_$version.xip"
-        else
-            cd /Applications/ && xip -x "$sourceFile"
-        fi
     else
         xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)
     fi

coin/provisioning/common/macos/nodejs.sh

@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2021 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$
-##
-#############################################################################
-
-# shellcheck source=./../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-
-# This script will install Nodejs
-
-version="14.16.1"
-urlCache="http://ci-files01-hki.ci.local/input/nodejs/node-v$version.pkg"
-urlOffcial="https://nodejs.org/dist/v$version/node-v$version.pkg"
-sha1="4720274971c40fe51b2c647060f77c45fb4949a7"
-
-DownloadURL $urlCache $urlOffcial $sha1 "/tmp/node-v$version.pkg"
-sudo installer -pkg "/tmp/node-v$version.pkg" -target /
-
- echo "Nodejs = $version" >> ~/versions.txt
-

coin/provisioning/common/macos/set-locale.sh

@@ -39,10 +39,3 @@ set -ex
 
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 SetEnvVar "LANG" "en_US.UTF-8"
-
-# The following settings match the "United States" region default
-defaults write -globalDomain AppleLocale "en_US"
-defaults write -globalDomain AppleLanguages "(en)"
-defaults write -globalDomain AppleMeasurementUnits "Inches"
-defaults write -globalDomain AppleTemperatureUnit "Fahrenheit"
-defaults write -globalDomain AppleMetricUnits -bool false

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

@@ -1,20 +1,8 @@
 #!/usr/bin/env bash
 
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
 # This script will install Conan
 # Note! Python3 is required for Conan installation
 
-os="$1"
-
 # Install Conan to Python user install directory (typically ~./local/)
 pip3 install conan --user
 
-SetEnvVar "CONAN_REVISIONS_ENABLED" "1"
-
-if [ "$os" == "linux" ]; then
-    SetEnvVar "PATH" "/home/qt/.local/bin:\$PATH"
-elif [ "$os" == "macos" ]; then
-    SetEnvVar "PATH" "/Users/qt/Library/Python/3.7/bin:\$PATH"
-fi

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

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="1.1.1k"
+version="1.1.1g"
 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="b213a293f2127ec3e323fb3cfc0c9807664fd997"
 opensslHome="${HOME}/openssl-${version}"
 opensslSource="${opensslHome}-src"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"

coin/provisioning/common/unix/squishInstall.sh

@@ -41,7 +41,7 @@ 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="6.7-20210318-1241"
+version="6.7-20210119-1632"
 qtBranch="60x"
 installFolder="/opt"
 squishFolder="$installFolder/squish"
@@ -49,15 +49,12 @@ preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build
 licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/515x/.squish-3-license"
 licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a"
 if uname -a |grep -q Darwin; then
-    #macOS package had to redo, so it's having same filename but different location to
+     version="6.6.1"
-    #keep previous provisioning in working state
+     compressedFolder="prebuild-squish-$version-515x-macx86_64.tar.gz"
-    preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable/6.7_rerun"
+     sha1="9fff9a7cb037214d21f47f2cc53747885fd1f2ae"
-    version="6.7-20210301-1401"
-    compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz"
-    sha1="e82701ffc1eb465dce3163ce7eab9ccaedc568c1"
 else
      compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz"
-     sha1="80b3f36e760963a6989a49c79818bf8671d1932a"
+     sha1="8780665c3560456cd86980802cb24513233444fe"
 fi
 
 mountFolder="/tmp/squish"
@@ -120,24 +117,31 @@ if uname -a |grep -q "Ubuntu"; then
     echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.profile
     echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.profile
 else
-    echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.bashrc
+    echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc
-    echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.bashrc
+    echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc
 fi
 
 echo "Verifying Squish, available installations:"
 ls -la $squishFolder
-
+if uname -a |grep -q Darwin; then
-if "$squishFolder/squish_for_qt5/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
+  if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
-  echo "Squish for Qt5 installation tested successfully"
+      echo "Squish for Qt installation tested successfully"
+  else
+      echo "Squish for Qt test failed! Package wasn't installed correctly."
+      exit 1
+  fi
 else
-  echo "Squish for Qt5 test failed! Package wasn't installed correctly."
+  if "$squishFolder/squish_for_qt5/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
-  exit 1
+      echo "Squish for Qt5 installation tested successfully"
-fi
+  else
-if "$squishFolder/squish_for_qt6/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
+      echo "Squish for Qt5 test failed! Package wasn't installed correctly."
-  echo "Squish for Qt6 installation tested successfully"
+      exit 1
-else
+  fi
-  echo "Squish for Qt6 test failed! Package wasn't installed correctly."
+  if "$squishFolder/squish_for_qt6/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
-  exit 1
+      echo "Squish for Qt6 installation tested successfully"
+  else
+      echo "Squish for Qt6 test failed! Package wasn't installed correctly."
+      exit 1
+  fi
 fi
 
-

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

@@ -45,16 +45,16 @@ 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.1g"
 $zip = Get-DownloadLocation ("openssl-$version.tar.gz")
 $prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip")
-$sha1 = "bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
+$sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997"
-$prebuilt_sha1 = "07fad2a44ffa90261a779782bd64fe2304487945"
+$prebuilt_sha1 = "d799f54e402c00eaa2633d54df1e8295bfac3d7b"
 $destination = "C:\Utils\openssl-android-master"
 $prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip"
 
 # msys unix style paths
-$ndkPath = "/c/Utils/Android/android-ndk-r22b"
+$ndkPath = "/c/Utils/Android/android-ndk-r21d"
 $openssl_path = "/c/Utils/openssl-android-master"
 $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin"
 if ((Test-Path $prebuilt_url)) {

coin/provisioning/common/windows/android.ps1

@@ -40,10 +40,10 @@
 # That's why we need to use Andoid-21 API version in Qt 5.9.
 
 # NDK
-$ndkVersion = "r22b"
+$ndkVersion = "r21d"
 $ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip"
 $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip"
-$ndkChecksum = "96ba1a049303cf6bf3ee84cfd64d6bcd43486a50"
+$ndkChecksum = "99175ce1210258f2280568cd340e0666c69955c7"
 $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion"
 $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
 
@@ -51,8 +51,8 @@ $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
 $toolsVersion = "2.1"
 $toolsFile = "commandlinetools-win-6609375_latest.zip"
 $sdkApi = "ANDROID_API_VERSION"
-$sdkApiLevel = "android-29"
+$sdkApiLevel = "android-28"
-$sdkBuildToolsVersion = "29.0.3"
+$sdkBuildToolsVersion = "28.0.3"
 $toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
 $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
 $toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"

coin/provisioning/common/windows/conan.ps1

@@ -1,6 +1,7 @@
-############################################################################
+#############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
+## Copyright (C) 2019 Konstantin Tokarev <annulen@yandex.ru>
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -29,26 +30,68 @@
 ##
 ## $QT_END_LICENSE$
 ##
-############################################################################
+#############################################################################
 
 . "$PSScriptRoot\helpers.ps1"
 
-# This is temporary solution for installing packages provided by Conan until we have fixed Conan setup for this
+$scriptsPath = "C:\Python36\Scripts"
 
-$url_conan = "\\ci-files01-hki.intra.qt.io\provisioning\windows\.conan.zip"
+Run-Executable "$scriptsPath\pip3.exe" "install -r $PSScriptRoot\conan_requirements.txt"
-$url_conan_home = "\\ci-files01-hki.intra.qt.io\provisioning\windows\.conanhome.zip"
+Write-Output "Conan = 1.29.0" >> ~\versions.txt
-$sha1_conan_compressed = "1abbe43e7a29ddd9906328702b5bc5231deeb721"
-$sha1_conanhome_compressed = "f44c2ae21cb1c7dc139572e399b7b0eaf492af03"
-$conan_compressed = "C:\.conan.zip"
-$conanhome_compressed = "C:\.conanhome.zip"
 
-Download $url_conan $url_conan $conan_compressed
+# Use Qt Project repository by default
-Verify-Checksum $conan_compressed $sha1_conan_compressed
+Run-Executable "$scriptsPath\conan.exe" "remote add qtproject https://api.bintray.com/conan/qtproject/conan --insert --force"
-Extract-7Zip $conan_compressed C:\
 
-Download $url_conan_home $url_conan_home $conanhome_compressed
+Set-EnvironmentVariable "CI_CONAN_BUILDINFO_DIR" "C:\Utils\conanbuildinfos"
-Verify-Checksum $conanhome_compressed $sha1_conanhome_compressed
-Extract-7Zip $conanhome_compressed C:\Users\qt
 
-Remove $conan_compressed
+function Run-Conan-Install
-Remove $conanhome_compressed
+{
+    Param (
+        [string]$ConanfilesDir,
+        [string]$BuildinfoDir,
+        [string]$Arch,
+        [string]$Compiler,
+        [string]$CompilerVersion,
+        [string]$CompilerRuntime,
+        [string]$CompilerLibcxx,
+        [string]$CompilerException,
+        [string]$CompilerThreads
+    )
+
+    if ($CompilerRuntime) {
+        $extraArgs += " -s compiler.runtime=$CompilerRuntime"
+    }
+
+    if ($CompilerLibcxx) {
+        $extraArgs += " -s compiler.libcxx=$CompilerLibcxx"
+    }
+
+    if ($CompilerException) {
+        $extraArgs += " -s compiler.exception=$CompilerException"
+    }
+
+    if ($CompilerThreads) {
+        $extraArgs += " -s compiler.threads=$CompilerThreads"
+    }
+
+    $manifestsDir = "$PSScriptRoot\conan_manifests"
+    $buildinfoRoot = "C:\Utils\conanbuildinfos"
+
+    # Make up to 5 attempts for all download operations in conan
+    $env:CONAN_RETRY = "5"
+
+    Get-ChildItem -Path "$ConanfilesDir\*.txt" |
+    ForEach-Object {
+        $conanfile = $_.FullName
+        $outpwd = "$buildinfoRoot\$BuildinfoDir\$($_.BaseName)"
+        New-Item $outpwd -Type directory -Force | Out-Null
+
+        Push-Location $outpwd
+        Run-Executable "$scriptsPath\conan.exe" "install --no-imports --verify $manifestsDir", `
+            '-s', ('compiler="' + $Compiler + '"'), `
+            "-s os=Windows -s arch=$Arch -s compiler.version=$CompilerVersion $extraArgs $conanfile"
+        Pop-Location
+
+        Copy-Item -Path $conanfile -Destination "$outpwd\conanfile.txt"
+    }
+}

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

@@ -32,15 +32,15 @@
 #############################################################################
 . "$PSScriptRoot\helpers.ps1"
 
-# Install Git version 2.31.0
+# Install Git version 2.13.0
 
-$version = "2.31.0"
+$version = "2.13.0"
 if (Is64BitWinHost) {
     $arch = "-64-bit"
-    $sha1 = "495d78f8d961e030944d9cb53af80d909d493c3f"
+    $sha1 = "E1D7C6E5E16ACAF3C108064A2ED158F604FA29A7"
 } else {
     $arch = "-32-bit"
-    $sha1 = "e57c040aea297b363aefaf26424f2e7a84a4a173"
+    $sha1 = "03c7df2e4ef61ea6b6f9c0eb7e6d5151d9682aec"
 }
 $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/libusb.ps1

@@ -35,16 +35,15 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-$archive = Get-DownloadLocation "libusb-1.0.24.7z"
+$archive = Get-DownloadLocation "libusb-1.0.21-ife3db79196-msvc2015.7z"
-
 $libusb_location = "C:\Utils\libusb-1.0"
 
-Copy-Item \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.24.7z $archive
+Copy-Item \\ci-files01-hki.intra.qt.io\provisioning\libusb-1.0\libusb-1.0.21-ife3db79196-msvc2015.7z $archive
-Verify-Checksum $archive "1ACAAD5C8F5190A10958867101A5FEEF1FFA1CD8"
+Verify-Checksum $archive "396a3224c306480f24a583850d923d06aa4377c1"
 
 Extract-7Zip $archive $libusb_location
 
 # Tell qt-apps/qdb build system where to find libusb
 Set-EnvironmentVariable "LIBUSB_PATH" $libusb_location
 
-Write-Output "libusb = libusb-1.0.24" >> ~/versions.txt
+Write-Output "libusb = libusb-1.0.21" >> ~/versions.txt

coin/provisioning/common/windows/openssl.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -36,7 +36,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_1g"
 $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
 $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
 
@@ -47,7 +47,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 = "7643561c372720f55de51454a707ede334db086e"
 
     Write-Host "Fetching from URL ..."
     Download $externalUrl $internalUrl $packagex64
@@ -74,7 +74,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 = "c7d4b096c2413d1af819ccb291214fa3c4cece07"
 
 Write-Host "Fetching from URL ..."
 Download $externalUrl $internalUrl $packagex86

coin/provisioning/common/windows/squishInstall.ps1

@@ -36,7 +36,7 @@
 # This script will pre-installed squish package for Windows.
 # Squish is need by Release Test Automation (RTA)
 
-$version = "6.7-20210319-0956"
+$version = "6.7-20210112-1612"
 $qtBranch = "60x"
 $targetDir = "C:\Utils\squish"
 $squishPackage = "C:\Utils\rta_squish"
@@ -50,7 +50,7 @@ Write-Host "Installing Squish license to home directory"
 Copy-Item $licenseUrl\$licensePackage ~\$licensePackage
 
 if (Is64BitWinHost) {
-    $arch = "x64"
+     $arch = "x64"
 } else {
     $arch = "x86"
 }
@@ -60,10 +60,15 @@ $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\Curren
 if ($OSVersion -eq "Windows 10 Enterprise") {
     $winVersion = "win10"
     if (Is64BitWinHost) {
-        $sha1 = "61eca4950d24d9780e02cd4183c54009eda46114"
+        $sha1 = "628bb65cf515d08df388b0dc4d5b403e4c6657b2"
+    } else {
+        $sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705"
+        #Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild
+        $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\6.6.1_rerun"
     }
-} else {
+} elseif ($OSVersion -eq "Windows 7 Enterprise") {
-    $winVersion = "n/a"
+    $winVersion = "win7"
+    $sha1 = "ec890c16bb671ae79b093ba81e6567d2780f85a2"
 }
 $squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip"
 

coin/provisioning/common/windows/update-msvc2019.ps1

@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -37,13 +37,13 @@
 # NOTE! Visual Studio is pre-installed to tier 1 image so this script won't install the whole Visual Studio. See ../../../pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt
 # MSVC 2019 online installers can be found from here https://docs.microsoft.com/en-us/visualstudio/releases/2019/history#installing-an-earlier-release
 
-$version = "16_9_4"
+$version = "16_7_5"
 $urlCache_vsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_Professional_$version.exe"
-$urlOfficial_vsInstaller = "https://download.visualstudio.microsoft.com/download/pr/3105fcfe-e771-41d6-9a1c-fc971e7d03a7/d60c42571053950bf742db19e30430f76354c95af06afb1364d5b2aab620f4e5/vs_Professional.exe"
+$urlOfficial_vsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/74b4e599138d5b5824d87ee657b78cbdeb3716f58a9645047e53bb5f68131516/vs_Professional.exe"
-$sha1_vsInstaller = "03e3896b790b1734434ab12c2e06ca458e67395f"
+$sha1_vsInstaller = "70062274c1ae79f5f0f7cb91192347abc1ebcb00"
 $urlCache_buildToolsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_BuildTools_$version.exe"
-$urlOfficial_buildToolsInstaller = "https://download.visualstudio.microsoft.com/download/pr/3105fcfe-e771-41d6-9a1c-fc971e7d03a7/e0c2f5b63918562fd959049e12dffe64bf46ec2e89f7cadde3214921777ce5c2/vs_BuildTools.exe"
+$urlOfficial_buildToolsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/f3713de3e01b7829d529f67d6240116b73cc0743974bb5373a052f9629cc24d2/vs_BuildTools.exe"
-$sha1_buildToolsInstaller = "59e62e552305e60420154395d79d5261d65f52dc"
+$sha1_buildToolsInstaller = "efb4600bf9bd09adf55a36e2e5d0d47a3abd481e"
 $installerPath = "C:\Windows\Temp\installer.exe"
 
 function Install {

coin/provisioning/qtci-linux-CentOS-8.3-x86_64/01-disable_net_lso.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo "ETHTOOL_OPTS='-K \${DEVICE} tso off'" | sudo tee -a /etc/sysconfig/network-scripts/ifcfg-Wired_connection_1

coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_700.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -36,4 +36,4 @@
 set -ex
 
 # shellcheck source=../common/linux/qnx_700.sh
-source "${BASH_SOURCE%/*}/../common/linux/qnx_710.sh"
+source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh"

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

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-conan.sh" "linux"
+"$BASEDIR/../common/unix/install-conan.sh"

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

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-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_SP2-x86_64/30-install-conan.sh

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-conan.sh" "linux"
+"$BASEDIR/../common/unix/install-conan.sh"

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

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

coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-disable_net_lso.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo "ethtool -K \${DEVICE_IFACE} tso off" | sudo tee -a /etc/NetworkManager/dispatcher.d/pre-up.d/net_tso_off
-sudo chmod +x /etc/NetworkManager/dispatcher.d/pre-up.d/net_tso_off

coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-set-ulimit.sh

@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2021 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 will set ulimit size for open files
-# Linker for Qt Webengine builds needs to open a multiple files. Without this it will hit the limit.
-
-file="/etc/security/limits.conf"
-file2="/etc/pam.d/common-session"
-sudo sed -i '/End of file/d' $file
-sudo tee -a $file <<"EOF"
-* soft        nproc          4096
-* hard        nproc          4096
-* soft        nofile         4096
-* hard        nofile         4096
-root soft     nproc          4096
-root hard     nproc          4096
-root soft     nofile         4096
-root hard     nofile         4096
-# End of file
-EOF
-
-sudo sed -i '/end of pam-auth-update config/d' $file2
-sudo tee -a $file2 <<"EOF"
-session required        pam_limits.so
-# end of pam-auth-update config
-EOF

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

@@ -190,8 +190,6 @@ installPackages+=(ssh)
 # For bitbake
 installPackages+=(diffstat)
 installPackages+=(binfmt-support)
-# Vulkan is needed for examples
-installPackages+=(libvulkan-dev)
 
 echo "Running update for apt"
 waitLoop

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

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-conan.sh" "linux"
+"$BASEDIR/../common/unix/install-conan.sh"

coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/70-qnx700.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the test suite of the Qt Toolkit.
@@ -36,4 +36,4 @@
 set -ex
 
 # shellcheck source=../common/linux/qnx_700.sh
-source "${BASH_SOURCE%/*}/../common/linux/qnx_710.sh"
+source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh"

coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/03-enable-repos.sh

@@ -35,9 +35,9 @@
 
 set -ex
 
-sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.3/repo/oss/#g" /etc/zypp/repos.d/repo-oss.repo
+sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.2/repo/oss/#g" /etc/zypp/repos.d/repo-oss.repo
-sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.3/repo/non-oss/#g" /etc/zypp/repos.d/repo-non-oss.repo
+sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.2/repo/non-oss/#g" /etc/zypp/repos.d/repo-non-oss.repo
-sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.3/oss/#g" /etc/zypp/repos.d/repo-update.repo
+sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.2/oss/#g" /etc/zypp/repos.d/repo-update.repo
-sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.3/non-oss/#g" /etc/zypp/repos.d/repo-update-non-oss.repo
+sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.2/non-oss/#g" /etc/zypp/repos.d/repo-update-non-oss.repo
 
 sudo zypper lr -u

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

@@ -51,9 +51,6 @@ sudo zypper -nq install cups-devel
 #speech-dispatcher
 sudo zypper -nq install libspeechd-devel
 
-# make
-sudo zypper -nq install make
-
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt
 

coin/provisioning/qtci-linux-openSUSE-15.2-x86_64/30-install-conan.sh

@@ -3,5 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-
+"$BASEDIR/../common/unix/install-conan.sh"
-"$BASEDIR/../common/macos/libusb.sh"

coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-disable_net_lso.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-echo "ethtool -K \${DEVICE_IFACE} tso off" | sudo tee -a /etc/NetworkManager/dispatcher.d/net_tso_off
-sudo chmod +x /etc/NetworkManager/dispatcher.d/net_tso_off

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

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

coin/provisioning/qtci-macos-10.14-x86_64/01-disable-net-lso.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-"$(dirname "$0")"/../common/macos/disable_net_lso.sh

coin/provisioning/qtci-macos-10.14-x86_64/05-systemsetup.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -97,17 +97,5 @@ echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
 echo "$NTS_IP    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
 
 sudo systemsetup settimezone GMT
-# Setting Time Zone seems to be flaky in macOS 10.13 and in macOS 10.14. Checking that Time Zone is correct. If not, reset it.
-if [[ $(sudo systemsetup -gettimezone) = *GMT* ]]; then
-    echo "Time Zone is GMT"
-else
-    echo "Wrong Time Zone. Reset Time Zone to GMT"
-    sleep 5
-    sudo systemsetup settimezone GMT
-        if [[ $(sudo systemsetup -gettimezone) != *GMT* ]]; then
-            echo "Couldn't set Time Zone!"
-            exit 1
-        fi
-fi
 sudo systemsetup setusingnetworktime off
 sudo rm -f "$targetFile"

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

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -50,4 +50,4 @@ set -ex
 # shellcheck source=../common/macos/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
 
-InstallXCode http://ci-files01-hki.intra.qt.io/input/mac/macos_10.14_mojave/Xcode_11.3.1.xip 11.3.1
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.14_mojave/Xcode_11.3.tar.gz 11.3

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

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -37,10 +37,10 @@ set -ex
 
 # shellcheck source=../common/macos/install-commandlinetools.sh
 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
-version="11.3.1"
+version="11.3"
 packageName="Command_Line_Tools_for_Xcode_$version.dmg"
 url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.14_mojave/$packageName"
-sha1="cec5824d127bba2d2a3ba8e5343ae7a32214e62c"
+sha1="b42a0fdf69ac46de04812cd23f0eefa141371253"
 
 InstallCommandLineTools $url $url $sha1 $packageName $version
 

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

@@ -51,11 +51,11 @@ toolsVersion="2.1"
 # toolsFile dertermines tools version
 toolsFile="commandlinetools-mac-6609375_latest.zip"
 
-ndkVersion="r22b"
+ndkVersion="r21d"
 ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
-sdkBuildToolsVersion="29.0.3"
+sdkBuildToolsVersion="28.0.3"
 # this is compile sdk version
-sdkApiLevel="android-29"
+sdkApiLevel="android-28"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

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

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-conan.sh" "macos"
+"$BASEDIR/../common/unix/install-conan.sh"

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

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

coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh

@@ -0,0 +1,138 @@
+#!/usr/bin/env sh
+
+#############################################################################
+##
+## Copyright (C) 2020 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$
+##
+#############################################################################
+
+# Install tools for singing packages
+# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed.
+
+set -ex
+
+cache="http://ci-files01-hki.intra.qt.io/input"
+cacheSigningTools="$cache/mac/sign_tools"
+targetFolder="/Users/qt"
+keychains="$targetFolder/Library/Keychains"
+
+Install() {
+
+    url=$1
+    targetFile=$2
+    expectedSha1=$3
+
+    echo "Fetching $targetFile from $url..."
+    curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile"
+    shasum "$targetFile" |grep "$expectedSha1"
+
+}
+
+# qt-license
+sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d"
+Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense
+
+# Login keychain
+sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
+Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
+{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null
+loginKeychain=$keychains/login.keychain
+
+echo "Setting login.keychain as default keychain.."
+security default-keychain -s $loginKeychain*
+echo "Unlocking Login keychain with password.."
+{ security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*; } 2> /dev/null
+
+echo "remove the "Lock after X minutes of inactivity" from login.keychain"
+security set-keychain-settings $loginKeychain
+
+# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer
+sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64"
+Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA
+sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer"
+
+# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer
+sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186"
+Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA
+sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer"
+
+# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain'
+sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724"
+unlockKeychain=$targetFolder/unlock-keychain.sh
+{ Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain; } 2> /dev/null
+sudo chmod 755 "$unlockKeychain"
+
+# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed.
+shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910"
+csreq=$targetFolder/csreq_qt_company.txt
+Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq
+chmod 755 "$csreq"
+
+# iOS signing tools
+devIDKeychain="Developer_ID_TheQtCompany.keychain-db"
+shaDevIdKeychain="972cca1879cdaeeb6042f9879756c748a8d1eddc"
+Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain
+echo "Opening $devIDKeychain.."
+open "$keychains/$devIDKeychain"
+
+sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
+Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
+{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null
+
+echo "Unlocking $devIDKeychain with password.."
+{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null
+security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
+
+sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
+{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
+{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null
+
+iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12"
+shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2"
+Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
+echo "Importing $iPhoneDeveloper.."
+{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
+
+iPhoneDistribution="iPhoneDistributionCiTeam2020.p12"
+shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d"
+Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
+echo "Importing $iPhoneDistribution.."
+{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
+
+# Mobileprovision
+echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
+mkdir "$targetFolder/Library/MobileDevice"
+mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles"
+shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da"
+Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision
+
+# Removing password files
+rm -fr "$targetFolder/login_keychain_password.txt"
+

coin/provisioning/qtci-macos-10.15-x86_64/01-disable-net-lso.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-"$(dirname "$0")"/../common/macos/disable_net_lso.sh

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

@@ -50,4 +50,4 @@ set -ex
 # shellcheck source=../common/macos/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
 
-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.15_catalina/Xcode_12.4.xip 12.4
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.15_catalina/Xcode_12.3.xip 12.3

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

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -37,10 +37,10 @@ set -ex
 
 # shellcheck source=../common/macos/install-commandlinetools.sh
 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
-version="12.4"
+version="12.3"
 packageName="Command_Line_Tools_for_Xcode_$version.dmg"
 url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.15_catalina/$packageName"
-sha1="eabb32d167da029dfc70af94de2bf61abd416ca1"
+sha1="67d55d5868e1f495a66e2b302e91a3cdea923ca9"
 
 InstallCommandLineTools $url $url $sha1 $packageName $version
 

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

@@ -51,11 +51,11 @@ toolsVersion="2.1"
 # toolsFile dertermines tools version
 toolsFile="commandlinetools-mac-6609375_latest.zip"
 
-ndkVersion="r22b"
+ndkVersion="r21d"
 ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
-sdkBuildToolsVersion="29.0.3"
+sdkBuildToolsVersion="28.0.3"
 # this is compile sdk version
-sdkApiLevel="android-29"
+sdkApiLevel="android-28"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

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

@@ -3,4 +3,4 @@
 set -ex
 
 BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-conan.sh" "macos"
+"$BASEDIR/../common/unix/install-conan.sh"

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

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

coin/provisioning/qtci-macos-10.15-x86_64/55-signtools.sh

@@ -0,0 +1,138 @@
+#!/usr/bin/env sh
+
+#############################################################################
+##
+## Copyright (C) 2020 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$
+##
+#############################################################################
+
+# Install tools for singing packages
+# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed.
+
+set -ex
+
+cache="http://ci-files01-hki.intra.qt.io/input"
+cacheSigningTools="$cache/mac/sign_tools"
+targetFolder="/Users/qt"
+keychains="$targetFolder/Library/Keychains"
+
+Install() {
+
+    url=$1
+    targetFile=$2
+    expectedSha1=$3
+
+    echo "Fetching $targetFile from $url..."
+    curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile"
+    shasum "$targetFile" |grep "$expectedSha1"
+
+}
+
+# qt-license
+sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d"
+Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense
+
+# Login keychain
+sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
+Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
+{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null
+loginKeychain=$keychains/login.keychain
+
+echo "Setting login.keychain as default keychain.."
+security default-keychain -s $loginKeychain*
+echo "Unlocking Login keychain with password.."
+{ security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*; } 2> /dev/null
+
+echo "remove the "Lock after X minutes of inactivity" from login.keychain"
+security set-keychain-settings $loginKeychain
+
+# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer
+sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64"
+Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA
+sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer"
+
+# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer
+sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186"
+Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA
+sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer"
+
+# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain'
+sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724"
+unlockKeychain=$targetFolder/unlock-keychain.sh
+{ Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain; } 2> /dev/null
+sudo chmod 755 "$unlockKeychain"
+
+# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed.
+shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910"
+csreq=$targetFolder/csreq_qt_company.txt
+Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq
+chmod 755 "$csreq"
+
+# iOS signing tools
+devIDKeychain="Developer_ID_TheQtCompany.keychain-db"
+shaDevIdKeychain="972cca1879cdaeeb6042f9879756c748a8d1eddc"
+Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain
+echo "Opening $devIDKeychain.."
+open "$keychains/$devIDKeychain"
+
+sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
+Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
+{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null
+
+echo "Unlocking $devIDKeychain with password.."
+{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null
+security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
+
+sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
+{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
+{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null
+
+iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12"
+shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2"
+Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
+echo "Importing $iPhoneDeveloper.."
+{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
+
+iPhoneDistribution="iPhoneDistributionCiTeam2020.p12"
+shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d"
+Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
+echo "Importing $iPhoneDistribution.."
+{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
+
+# Mobileprovision
+echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
+mkdir "$targetFolder/Library/MobileDevice"
+mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles"
+shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da"
+Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision
+
+# Removing password files
+rm -fr "$targetFolder/login_keychain_password.txt"
+

coin/provisioning/qtci-macos-11.0-x86_64/01-disable-net-lso.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-"$(dirname "$0")"/../common/macos/disable_net_lso.sh

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

@@ -50,4 +50,4 @@ set -ex
 # shellcheck source=../common/macos/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
 
-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.15_catalina/Xcode_12.4.xip 12.4
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.15_catalina/Xcode_12.3.xip 12.3

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

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -37,10 +37,10 @@ set -ex
 
 # shellcheck source=../common/macos/install-commandlinetools.sh
 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
-version="12.4"
+version="12.3"
 packageName="Command_Line_Tools_for_Xcode_$version.dmg"
 url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.15_catalina/$packageName"
-sha1="eabb32d167da029dfc70af94de2bf61abd416ca1"
+sha1="67d55d5868e1f495a66e2b302e91a3cdea923ca9"
 
 InstallCommandLineTools $url $url $sha1 $packageName $version
 

coin/provisioning/qtci-macos-11.0-x86_64/29-libusb.sh

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

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

@@ -51,11 +51,11 @@ toolsVersion="2.1"
 # toolsFile dertermines tools version
 toolsFile="commandlinetools-mac-6609375_latest.zip"
 
-ndkVersion="r22b"
+ndkVersion="r21d"
 ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
-sdkBuildToolsVersion="29.0.3"
+sdkBuildToolsVersion="28.0.3"
 # this is compile sdk version
-sdkApiLevel="android-29"
+sdkApiLevel="android-28"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

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

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

coin/provisioning/qtci-macos-11.0-x86_64/30-nodejs.sh

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

coin/provisioning/qtci-macos-11.0-x86_64/55-signtools.sh

@@ -0,0 +1,138 @@
+#!/usr/bin/env sh
+
+#############################################################################
+##
+## Copyright (C) 2020 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$
+##
+#############################################################################
+
+# Install tools for singing packages
+# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed.
+
+set -ex
+
+cache="http://ci-files01-hki.intra.qt.io/input"
+cacheSigningTools="$cache/mac/sign_tools"
+targetFolder="/Users/qt"
+keychains="$targetFolder/Library/Keychains"
+
+Install() {
+
+    url=$1
+    targetFile=$2
+    expectedSha1=$3
+
+    echo "Fetching $targetFile from $url..."
+    curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile"
+    shasum "$targetFile" |grep "$expectedSha1"
+
+}
+
+# qt-license
+sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d"
+Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense
+
+# Login keychain
+sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
+Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
+{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null
+loginKeychain=$keychains/login.keychain
+
+echo "Setting login.keychain as default keychain.."
+security default-keychain -s $loginKeychain*
+echo "Unlocking Login keychain with password.."
+{ security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*; } 2> /dev/null
+
+echo "remove the "Lock after X minutes of inactivity" from login.keychain"
+security set-keychain-settings $loginKeychain
+
+# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer
+sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64"
+Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA
+sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer"
+
+# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer
+sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186"
+Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA
+sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer"
+
+# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain'
+sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724"
+unlockKeychain=$targetFolder/unlock-keychain.sh
+{ Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain; } 2> /dev/null
+sudo chmod 755 "$unlockKeychain"
+
+# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed.
+shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910"
+csreq=$targetFolder/csreq_qt_company.txt
+Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq
+chmod 755 "$csreq"
+
+# iOS signing tools
+devIDKeychain="Developer_ID_TheQtCompany.keychain-db"
+shaDevIdKeychain="972cca1879cdaeeb6042f9879756c748a8d1eddc"
+Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain
+echo "Opening $devIDKeychain.."
+open "$keychains/$devIDKeychain"
+
+sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
+Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
+{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null
+
+echo "Unlocking $devIDKeychain with password.."
+{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null
+security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
+
+sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
+{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
+{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null
+
+iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12"
+shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2"
+Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
+echo "Importing $iPhoneDeveloper.."
+{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
+
+iPhoneDistribution="iPhoneDistributionCiTeam2020.p12"
+shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d"
+Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
+echo "Importing $iPhoneDistribution.."
+{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
+
+# Mobileprovision
+echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
+mkdir "$targetFolder/Library/MobileDevice"
+mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles"
+shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da"
+Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision
+
+# Removing password files
+rm -fr "$targetFolder/login_keychain_password.txt"
+

coin/provisioning/qtci-windows-10-x86/08-libclang.ps1

@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 vs2019
+. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw $False

coin/provisioning/qtci-windows-10-x86/08-python3.ps1

@@ -5,4 +5,4 @@
 #  - version
 #  - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false
 
-. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "cd9744b142eca832f9534390676e6cfb84bf655d" "C:\Python36" "3.6.2" $true
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "76c50b747237a0974126dd8b32ea036dd77b2ad1" "C:\Python36" "3.6.1" $true

coin/provisioning/qtci-windows-10-x86/11-conan.ps1

@@ -1 +1,17 @@
 . "$PSScriptRoot\..\common\windows\conan.ps1"
+
+Run-Conan-Install `
+    -ConanfilesDir "$PSScriptRoot\conanfiles" `
+    -BuildinfoDir MSVC2015-x86 `
+    -Arch x86 `
+    -Compiler "Visual Studio" `
+    -CompilerVersion 14 `
+    -CompilerRuntime MD
+
+Run-Conan-Install `
+    -ConanfilesDir "$PSScriptRoot\conanfiles" `
+    -BuildinfoDir MSVC2017-x86 `
+    -Arch x86 `
+    -Compiler "Visual Studio" `
+    -CompilerVersion 15 `
+    -CompilerRuntime MD

coin/provisioning/qtci-windows-10-x86_64/01-disable-runtimebroker.ps1

@@ -1,4 +0,0 @@
-# Disable RunTime Broker
-# The RunTime Broker is a Windows system process, which helps to manage app permissions on your pc between Windows apps and ensures apps are behaving themselves.
-# Coordinates execution of background work for WinRT application. If this service is stopped or disabled, then background work might not be triggered.
-reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\TimeBrokerSvc" /V Start /T REG_dWORD /D 4 /F

coin/provisioning/qtci-windows-10-x86_64/05-msvc2019.ps1

@@ -1,36 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2020 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$
-##
-#############################################################################
-
-# MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with:
-. "$PSScriptRoot\..\common\windows\update-msvc2019.ps1"
-

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

@@ -8,5 +8,5 @@
 . "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1"
 . "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1"
 # default ones
-. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "bcf9bda733a9153811209c62d628c41ab6cedbe2" "C:\Python36" "3.6.2" $true
+. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "bf54252c4065b20f4a111cc39cf5215fb1edccff" "C:\Python36" "3.6.1" $true
-. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "cd9744b142eca832f9534390676e6cfb84bf655d" "C:\Python36_32" "3.6.2" $true
+. "$PSScriptRoot\..\common\windows\python3.ps1" 32 "76c50b747237a0974126dd8b32ea036dd77b2ad1" "C:\Python36_32" "3.6.1" $true

coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1

@@ -1 +1,69 @@
 . "$PSScriptRoot\..\common\windows\conan.ps1"
+
+Run-Conan-Install `
+    -ConanfilesDir "$PSScriptRoot\conanfiles" `
+    -BuildinfoDir MSVC2015-x86_64 `
+    -Arch x86_64 `
+    -Compiler "Visual Studio" `
+    -CompilerVersion 14 `
+    -CompilerRuntime MD
+
+Run-Conan-Install `
+    -ConanfilesDir "$PSScriptRoot\conanfiles" `
+    -BuildinfoDir MSVC2015-x86 `
+    -Arch x86 `
+    -Compiler "Visual Studio" `
+    -CompilerVersion 14 `
+    -CompilerRuntime MD
+
+Run-Conan-Install `
+    -ConanfilesDir "$PSScriptRoot\conanfiles" `
+    -BuildinfoDir MSVC2017-x86_64 `
+    -Arch x86_64 `
+    -Compiler "Visual Studio" `
+    -CompilerVersion 15 `
+    -CompilerRuntime MD
+
+Run-Conan-Install `
+    -ConanfilesDir "$PSScriptRoot\conanfiles" `
+    -BuildinfoDir MSVC2017-x86 `
+    -Arch x86 `
+    -Compiler "Visual Studio" `
+    -CompilerVersion 15 `
+    -CompilerRuntime MD
+
+Run-Conan-Install `
+    -ConanfilesDir "$PSScriptRoot\conanfiles" `
+    -BuildinfoDir MSVC2019-x86_64 `
+    -Arch x86_64 `
+    -Compiler "Visual Studio" `
+    -CompilerVersion 16 `
+    -CompilerRuntime MD
+
+Run-Conan-Install `
+    -ConanfilesDir "$PSScriptRoot\conanfiles" `
+    -BuildinfoDir MSVC2019-x86 `
+    -Arch x86 `
+    -Compiler "Visual Studio" `
+    -CompilerVersion 16 `
+    -CompilerRuntime MD
+
+Run-Conan-Install `
+    -ConanfilesDir "$PSScriptRoot\conanfiles" `
+    -BuildinfoDir Mingw-x86 `
+    -Arch x86 `
+    -Compiler "gcc" `
+    -CompilerVersion 8 `
+    -CompilerLibcxx "libstdc++" `
+    -CompilerException "dwarf2" `
+    -CompilerThreads "posix"
+
+Run-Conan-Install `
+    -ConanfilesDir "$PSScriptRoot\conanfiles" `
+    -BuildinfoDir Mingw-x86_64 `
+    -Arch x86_64 `
+    -Compiler "gcc" `
+    -CompilerVersion 8 `
+    -CompilerLibcxx "libstdc++" `
+    -CompilerException "seh" `
+    -CompilerThreads "posix"

coin/provisioning/qtci-windows-10-x86_64/29-libusb.ps1

@@ -1,3 +0,0 @@
-
-
-. "$PSScriptRoot\..\common\windows\libusb.ps1"

init-repository

@@ -72,14 +72,11 @@ Options:
         Only initialize the specified subset of modules given as the
         argument. Specified modules must already exist in .gitmodules. The
         string "all" results in cloning all known modules. The strings
-        "essential", "addon", "preview", "deprecated", "obsolete",
+        "essential", "addon", "preview", "deprecated", "obsolete", and
-        "additionalLibrary", and "ignore" refer to classes of modules
+        "ignore" refer to classes of modules; "default" maps to
-        identified by "status=" lines in the .gitmodules file.
+        "essential,addon,preview,deprecated", which corresponds with the
-        You can use "default" in the subset as a short-hand for
+        set of maintained modules and is also the default set. Module
-        "essential,addon,preview,deprecated", which corresponds to the set of
+        names may be prefixed with a dash to exclude them from a bigger
-        maintained modules included in standard Qt releases; this is also the
-        default module subset when this option is not given. Entries
-        may be prefixed with a dash to exclude them from a bigger
         set, e.g. "all,-ignore".
 
     --no-update