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

Change-Id: I7c69ec340c2c36d5c4eb30c87586fb45449968bf

.gitmodules

@@ -1,27 +1,28 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.0
+	branch = 6.1
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.0
+	branch = 6.1
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.0
+	branch = 6.1
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
+	recommends = qttools
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = dev
-	status = ignore
+	branch = 6.1
+	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -31,10 +32,10 @@
 	status = ignore
 [submodule "qttools"]
 	depends = qtbase
-	recommends = qtdeclarative qtactiveqt
+	recommends = qtdeclarative
 	path = qttools
 	url = ../qttools.git
-	branch = 6.0
+	branch = 6.1
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +48,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.0
+	branch = 6.1
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +56,7 @@
 	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.0
+	branch = 6.1
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -117,21 +118,22 @@
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.0
+	branch = 6.1
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
-	recommends = qtdeclarative qtshadertools
+	recommends = qtdeclarative qtshadertools qttools
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.0
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
+	recommends = qttools
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.0
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
@@ -223,7 +225,7 @@
 	recommends = qtimageformats qtgraphicaleffects
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 6.0
+	branch = 6.1
 	status = essential
 [submodule "qtpurchasing"]
 	depends = qtbase
@@ -234,25 +236,25 @@
 	status = ignore
 [submodule "qtcharts"]
 	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
+	recommends = qtdeclarative qtmultimedia qttools
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = dev
-	status = ignore
+	branch = 6.1
+	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
+	recommends = qtdeclarative qtmultimedia qttools
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = dev
-	status = ignore
+	branch = 6.1
+	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia qtquickcontrols
+	recommends = qtmultimedia qtquickcontrols qttools
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = dev
-	status = ignore
+	branch = 6.1
+	status = additionalLibrary
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -262,10 +264,11 @@
 	status = ignore
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
+	recommends = qttools
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = dev
-	status = ignore
+	branch = 6.1
+	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
@@ -275,9 +278,10 @@
 	status = ignore
 [submodule "qtnetworkauth"]
 	depends = qtbase
+	recommends = qttools
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.0
+	branch = 6.1
 	status = additionalLibrary
 [submodule "qtremoteobjects"]
 	depends = qtbase
@@ -295,49 +299,50 @@
 	status = ignore
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
+	recommends = qttools
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = dev
-	status = ignore
+	branch = 6.1
+	status = additionalLibrary
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.0
+	branch = 6.1
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.0
+	branch = 6.1
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.0
+	branch = 6.1
 	status = addon
 [submodule "qt5compat"]
-	depends = qtbase
+	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.0
+	branch = 6.1
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase qttools
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.0
+	branch = 6.1
 	status = additionalLibrary
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative qttools
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.0
+	branch = 6.1
 	status = additionalLibrary
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative qtquickcontrols2 qttools
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.0
+	branch = 6.1
 	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 6.0.1
+    VERSION 6.1.0
     DESCRIPTION "Qt Libraries"
     HOMEPAGE_URL "https://qt.io/"
     LANGUAGES CXX C ASM

README

@@ -1,134 +0,0 @@
-HOW TO BUILD QT5
-================
-
-
- Synopsis
- ========
-
-   System requirements
-   ------------------
-
-    - Perl 5.8 or later
-    - Python 2.7 or later
-    - C++ compiler supporting the C++11 standard
-
-     For other platform specific requirements,
-     please see section "Setting up your machine" on:
-     http://wiki.qt.io/Get_The_Source
-
-   Licensing:
-   ----------
-
-    Opensource users:
-
-        <license>        = -opensource
-
-    Commercial users:
-
-        <license>        = -commercial
-
-   Linux, Mac:
-   -----------
-
-     cd <path>/<source_package>
-     ./configure -prefix $PWD/qtbase <license> -nomake tests
-     make -j 4
-
-   Windows:
-   --------
-
-     Open a command prompt.
-     Ensure that the following tools can be found in the path:
-     * Supported compiler (Visual Studio 2012 or later,
-        MinGW-builds gcc 4.9 or later)
-     * Perl version 5.12 or later   [http://www.activestate.com/activeperl/]
-     * Python version 2.7 or later  [http://www.activestate.com/activepython/]
-     * Ruby version 1.9.3 or later  [http://rubyinstaller.org/]
-
-     cd <path>\<source_package>
-     configure -prefix %CD%\qtbase <license> -nomake tests
-     nmake // jom // mingw32-make
-
-     To accelerate the bootstrap of qmake with MSVC, it may be useful to pass
-     "-make-tool jom" on the configure command line. If you do not use jom,
-     adding "/MP" to the CL environment variable is a good idea.
-
- More details follow.
-
- Build!
- ======
-
- A typical `configure; make' build process is used.
-
- Some relevant configure options (see configure -help):
-
- -release              Compile and link Qt with debugging turned off.
- -debug                Compile and link Qt with debugging turned on.
- -nomake tests         Disable building of tests to speed up compilation
- -nomake examples      Disable building of examples to speed up compilation
- -confirm-license      Automatically acknowledge the LGPL 2.1 license.
-
- Example for a release build:
- (adjust the `-jN' parameter as appropriate for your system)
-
-   ./configure -prefix $PWD/qtbase <license>
-   make -j4
-
- Example for a developer build:
- (enables more autotests, builds debug version of libraries, ...)
-
-   ./configure -developer-build <license>
-   make -j4
-
- See output of `./configure -help' for documentation on various options to
- configure.
-
- The above examples will build whatever Qt5 modules have been enabled by
- default in the build system.
-
- It is possible to build selected modules with their dependencies by doing
- a `make module-<foo>'.  For example, to build only qtdeclarative,
- and the modules it depends on:
-
-   ./configure -prefix $PWD/qtbase <license>
-   make -j4 module-qtdeclarative
-
- This can save a lot of time if you are only interested in a subset of Qt5.
-
-
- Hints
- =====
-
- The submodule repository qtrepotools contains useful scripts for
- developers and release engineers. Consider adding qtrepotools/bin
- to your PATH environment variable to access them.
-
- The qt5_tool in qtrepotools has some more features which may be of interest.
- Try `qt5_tool --help'.
-
-
- Building Qt5 from git
- =====================
- See http://wiki.qt.io/Building_Qt_5_from_Git and README.git
- for more information.
- See http://wiki.qt.io/Qt_5 for the reference platforms.
-
-
- Documentation
- =============
-
- After configuring and compiling Qt, building the documentation is possible by running
- "make docs".
-
- After having built the documentation, you need to install it with the following
- command:
-
-    make install_docs
-
- The documentation is installed in the path set to $QT_INSTALL_DOCS.
- Running "qmake -query" will list the value of QT_INSTALL_DOCS.
-
- Information about Qt 5's documentation is located in qtbase/doc/README
- or in the following page: http://wiki.qt.io/Qt5DocumentationProject
-
- Note: Building the documentation is only tested on desktop platforms.

README.md

@@ -0,0 +1,131 @@
+HOW TO BUILD Qt6
+================
+
+
+Synopsis
+========
+
+System requirements
+------------------
+
+* CMake 3.18 or later
+* Perl 5.8 or later
+* Python 2.7 or later
+* C++ compiler supporting the C++17 standard
+
+It's recommended to have ninja 1.8 or later installed.
+
+For other platform specific requirements,
+please see section "Setting up your machine" on:
+http://wiki.qt.io/Get_The_Source
+
+Linux, Mac:
+-----------
+
+````
+cd <path>/<source_package>
+./configure -prefix $PWD/qtbase
+cmake --build .
+````
+
+Windows:
+--------
+
+1. Open a command prompt.
+2. Ensure that the following tools can be found in the path:
+ * Supported compiler (Visual Studio 2019 or later, or MinGW-builds gcc 8.1 or later)
+ * Perl version 5.12 or later   [http://www.activestate.com/activeperl/]
+ * Python version 2.7 or later  [http://www.activestate.com/activepython/]
+ * Ruby version 1.9.3 or later  [http://rubyinstaller.org/]
+
+````
+cd <path>\<source_package>
+configure -prefix %CD%\qtbase
+cmake --build .
+````
+
+More details follow.
+
+Build!
+======
+
+Qt is built with CMake, and a typical
+`configure && cmake --build .` build process is used.
+
+If ninja is installed, it is automatically chosen as CMake generator.
+
+Some relevant configure options (see configure -help):
+
+* `-release` Compile and link Qt with debugging turned off.
+* `-debug` Compile and link Qt with debugging turned on.
+
+Example for a release build:
+
+````
+./configure -prefix $PWD/qtbase
+cmake --build .
+````
+
+Example for a developer build:
+(enables more autotests, builds debug version of libraries, ...)
+
+````
+./configure -developer-build
+cmake --build .
+````
+
+ See output of `./configure -help` for documentation on various options to
+ configure.
+
+ The above examples will build whatever Qt modules have been enabled
+ by default in the build system.
+
+ It is possible to build selected repositories with their dependencies by doing
+ a `ninja <repo-name>/all'.  For example, to build only qtdeclarative,
+ and the modules it depends on:
+
+````
+./configure
+ninja qtdeclarative/all
+````
+
+This can save a lot of time if you are only interested in a subset of Qt.
+
+
+Hints
+=====
+
+The submodule repository `qtrepotools` contains useful scripts for
+developers and release engineers. Consider adding qtrepotools/bin
+to your `PATH` environment variable to access them.
+
+
+Building Qt from git
+=====================
+See http://wiki.qt.io/Building_Qt_6_from_Git and README.git
+for more information.
+See http://wiki.qt.io/Qt_6 for the reference platforms.
+
+
+Documentation
+=============
+
+After configuring and compiling Qt, building the documentation is possible by running
+
+```
+cmake --build . --target docs
+```
+
+After having built the documentation, you need to install it with the following
+command:
+
+```
+cmake --build . --target install_docs
+```
+
+The documentation is installed in the path specified with the
+configure argument `-docdir`.
+
+Information about Qt's documentation is located in qtbase/doc/README
+
+Note: Building the documentation is only tested on desktop platforms.

cmake/QtTopLevelHelpers.cmake

@@ -131,6 +131,15 @@ function(qt_internal_checkout module revision)
         RESULT_VARIABLE git_result
         ${swallow_output}
     )
+    if (git_result EQUAL 128)
+        message(WARNING "${git_output}, trying detached checkout")
+        execute_process(
+            COMMAND "git" "checkout" "--detach" "${revision}"
+            WORKING_DIRECTORY "./${module}"
+            RESULT_VARIABLE git_result
+            ${swallow_output}
+        )
+    endif()
     if (git_result)
         message(FATAL_ERROR "Failed to check '${module}' out to '${revision}': ${git_output}")
     endif()

coin/module_config.yaml

@@ -24,13 +24,13 @@ instructions:
     - type: Group
       instructions:
         - type: ExecuteCommand
-          command: "{{.Env.ENV_PREFIX}} cmake --build . --target qttools/all --parallel -v"
+          command: "{{.Env.ENV_PREFIX}} cmake --build . --target qtbase/src/plugins/platforms/all qtbase/src/plugins/sqldrivers/all qttools/all --parallel -v"
           maxTimeInSeconds: 12000
           maxTimeBetweenOutput: 1200
           userMessageOnFailure: >
             Failed to build sources.
         - type: ExecuteCommand
-          command: "{{.Env.ENV_PREFIX}} cmake --build . --target generate_docs -v"
+          command: "{{.Env.ENV_PREFIX}} cmake --build . --target docs -v"
           maxTimeInSeconds: 12000
           maxTimeBetweenOutput: 1200
           userMessageOnFailure: >

coin/platform_configs/cmake_platforms.yaml

@@ -1,93 +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', '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.1-x86_64'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'InsignificantTests']
-    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-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']
--
-    Id: 'macos-10.14-host'
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Features: ['Packaging', 'Sccache']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..'
-    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'
-    Compiler: 'Clang'
-    Features: ['DisableTests', 'Sccache']
-    Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -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'
-        ]
--
-    Id: 'macos-10.15-host'
-    Template: 'qtci-macos-10.15-x86_64-100'
-    Compiler: 'Clang'
-    Features: ['Packaging', 'Sccache', 'InsignificantTests']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode12.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..'
-    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.15-x86_64-100'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'InsignificantTests']
-    Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode12.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -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'
-        ]
 -
     Template: 'qtci-windows-10-x86_64-52'
     Compiler: 'MSVC2019'
@@ -99,47 +14,10 @@ Configurations:
         '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.1-host'
-    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
+    Id: 'CentOS-8.3-host'
+    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
     Compiler: 'GCC'
     Features: ['Packaging', '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-macos-10.14-x86_64'
-    Target os: 'IOS_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'macos-10.14-host'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
-    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}}'
-    ]
--
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
-    Features: ['Sccache', 'InsignificantTests']
-    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}}']

coin/platform_configs/cmake_platforms_qemu.yaml

@@ -6,13 +6,13 @@ Configurations:
     Target arch: 'armv7'
     Compiler: 'GCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'InsignificantTests']
+    Features: ['Sccache']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi-;DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
-        'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../../environment-setup-armv7at2hf-neon-poky-linux-gnueabi',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
+        'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
         "QT_CMAKE_DIR=/opt/cmake-3.19.2/bin",
         'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
-        'GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
+        'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
         'QT_QUICK_BACKEND=software',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TARGET_TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
@@ -22,13 +22,13 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'GCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'InsignificantTests']
+    Features: ['Sccache']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-;DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
-        'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/../../environment-setup-aarch64-poky-linux',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
+        'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
         "QT_CMAKE_DIR=/opt/cmake-3.19.2/bin",
         'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
-        'GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
+        'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
         'QT_QUICK_BACKEND=software',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TARGET_TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
@@ -38,12 +38,13 @@ Configurations:
     Target arch: 'mips64'
     Compiler: 'GCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'InsignificantTests', 'DisableTests']
+    Features: ['Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux-;DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
-        'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/../../environment-setup-mips64r2-poky-linux',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
+        'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
         "QT_CMAKE_DIR=/opt/cmake-3.19.2/bin",
         'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
+        'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
         'QT_QUICK_BACKEND=software',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TARGET_TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']

coin/platform_configs/cmake_platforms_target_android_host_linux.yaml

@@ -1,46 +1,91 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'arm64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'CentOS-8.1-host'
+    Platform dependency: 'CentOS-8.3-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-CentOS-8.1-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'armv7'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'CentOS-8.1-host'
+    Platform dependency: 'CentOS-8.3-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-CentOS-8.1-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'CentOS-8.1-host'
+    Platform dependency: 'CentOS-8.3-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-CentOS-8.1-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'CentOS-8.1-host'
+    Platform dependency: 'CentOS-8.3-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']
+-
+    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/cmake_platforms_target_android_host_macos.yaml

@@ -6,7 +6,7 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-10.14-host'
+    Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
     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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
@@ -17,7 +17,7 @@ Configurations:
     Target arch: 'armv7'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-10.14-host'
+    Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
     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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
@@ -28,7 +28,7 @@ Configurations:
     Target arch: 'x86'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-10.14-host'
+    Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
     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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
@@ -39,7 +39,7 @@ Configurations:
     Target arch: 'x86_64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-10.14-host'
+    Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
     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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',

coin/platform_configs/default.yaml

@@ -1,88 +1,5 @@
 Version: 2
 Configurations:
--
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'MSVC2019'
-    Features: ['UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -headersclean -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl'
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['UseLegacyInstructions', 'DisableTests']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl'
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-warnings-are-errors -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl'
--
-    Template: 'qtci-linux-openSUSE-15.1-x86_64'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten'
--
-    Template: 'qtci-linux-SLES-15_SP2-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl'
--
-    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -headersclean -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -openssl -qt-pcre -qt-harfbuzz -R . QMAKE_LFLAGS_APP+=-s'
--
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Features: ['UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -headersclean -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
--
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
--
-    Template: 'qtci-macos-10.14-x86_64'
-    Target os: 'IOS_ANY'
-    Target arch: 'multi'
-    Compiler: 'Clang'
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang'
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QEMU'
-    Target arch: 'armv7'
-    Compiler: 'GCC'
-    Features: ['UseLegacyInstructions', 'InsignificantTests']
-    Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors'
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QEMU'
-    Target arch: 'arm64'
-    Compiler: 'GCC'
-    Features: ['UseLegacyInstructions', 'InsignificantTests']
-    Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors'
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QEMU'
-    Target arch: 'mips64'
-    Compiler: 'GCC'
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Environment variables: ['QT_QUICK_BACKEND=software']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64r2-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64r2-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors'
--
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
 -
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'

coin/platform_configs/flashing-wizard.yaml

@@ -13,7 +13,12 @@ Configurations:
         Features: ['Packaging', 'UseLegacyInstructions']
         Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
     -
-        Template: 'qtci-linux-CentOS-8.1-x86_64-50'
+        Template: 'qtci-linux-CentOS-8.3-x86_64-50'
+        Compiler: 'GCC'
+        Features: ['Packaging', 'UseLegacyInstructions']
+        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
+    -
+        Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
         Compiler: 'GCC'
         Features: ['Packaging', 'UseLegacyInstructions']
         Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'

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

@@ -0,0 +1,20 @@
+Version: 2
+Configurations:
+    -
+        Id: 'macos-10.14-x86_64-developer-build-tests'
+        Template: 'qtci-macos-10.14-x86_64'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
+    -
+        Id: 'macos-10.15-x86_64-developer-build-tests'
+        Template: 'qtci-macos-10.15-x86_64-102'
+        Compiler: 'Clang'
+        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', 'InsignificantTests']
+        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'

coin/platform_configs/macos.yaml

@@ -0,0 +1,13 @@
+Version: 2
+Configurations:
+    # Build with latest Xcode
+    -
+        Id: 'macos-latest-xcode-x86_64-packaging-build'
+        Template: 'qtci-macos-11.0-x86_64-102'
+        Compiler: 'Clang'
+        Features: ['Packaging', 'Sccache', 'DoNotRunTests']
+        Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..'
+        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/qdb.yaml

@@ -1,28 +1,3 @@
 Version: 2
-Module only: True
-Configurations:
-    -
-        Template: 'qtci-windows-10-x86_64-52'
-        Compiler: 'MSVC2015'
-        Target arch: 'x86'
-        Features: ['Packaging', 'UseLegacyInstructions']
-        Configure arguments: '-qmake -opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%'
-    -
-        Template: 'qtci-windows-10-x86_64-52'
-        Compiler: 'MSVC2015'
-        Features: ['Packaging', 'UseLegacyInstructions']
-        Configure arguments: '-qmake -opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%'
-    -
-        Template: 'qtci-linux-CentOS-8.1-x86_64-50'
-        Compiler: 'GCC'
-        Features: ['Packaging', 'UseLegacyInstructions']
-        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
-    -
-        Template: 'qtci-macos-10.13-x86_64-2'
-        Compiler: 'Clang'
-        Features: ['Packaging']
-        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'GCC'
-        Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
+Include: [cmake_platforms.yaml]
+Configurations: []

coin/platform_configs/qtactiveqt.yaml

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

coin/platform_configs/qtbase.yaml

@@ -1,34 +1,28 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml,
+    macos-developer-build-tests.yaml
+]
 Configurations:
 -
-    Template: 'qtci-linux-openSUSE-15.1-x86_64'
-    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten'
--
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Features: ['UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
--
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Features: ['Sccache']
-    Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -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'
-        ]
--
-    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'CentOS-8.1-host'
+    Platform dependency: 'CentOS-8.3-host'
     Features: ['Packaging', 'Sccache', 'AndroidTestRun']
     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/qtcharts.yaml

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

coin/platform_configs/qtdatavis3d.yaml

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

coin/platform_configs/qtdeclarative.yaml

@@ -1,17 +1,6 @@
 Version: 2
-Include: [cmake_platforms.yaml]
-Configurations:
--
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Features: ['UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
--
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Features: ['Sccache']
-    Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -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'
-        ]
+Include: [
+    cmake_platforms.yaml,
+    macos-developer-build-tests.yaml
+]
+Configurations: []

coin/platform_configs/qtdeviceutilities.yaml

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

coin/platform_configs/qtlocation.yaml

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

coin/platform_configs/qtlottie.yaml

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

coin/platform_configs/qtsaferenderer.yaml

@@ -13,7 +13,12 @@ Configurations:
     Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
     Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
 -
-    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
     Compiler: 'GCC'
     Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
     Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'

coin/platform_configs/qtscxml.yaml

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

coin/platform_configs/qtsdk.yaml

@@ -1,15 +0,0 @@
--
-    Template: 'qtci-windows-10-x86-4'
-    Compiler: 'MSVC2019'
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
-    Features: ['UseLegacyInstructions']
--
-    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
-    Compiler: 'GCC'
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests'
-    Features: ['UseLegacyInstructions']
--
-    Template: 'qtci-windows-8.1-x86'
-    Compiler: 'MSVC2015'
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'

coin/platform_configs/qtserialbus.yaml

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

coin/platform_configs/qtserialport.yaml

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

coin/platform_configs/qtspeech.yaml

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

coin/platform_configs/qtwebengine.yaml

@@ -22,7 +22,7 @@ Configurations:
     Features: ['DisableTests', 'UseLegacyInstructions']
     Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
 -
-    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
     Compiler: 'GCC'
     Features: ['UseLegacyInstructions']
     Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -headersclean -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz -R . QMAKE_LFLAGS_APP+=-s'

coin/platform_configs/tqtc-qt-config-gui.yaml

@@ -1,28 +0,0 @@
-Version: 2
-Module only: True
-Configurations:
-    -
-        Template: 'qtci-windows-10-x86_64-52'
-        Compiler: 'MSVC2019'
-        Features: ['Packaging', 'UseLegacyInstructions']
-        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
-    -
-        Template: 'qtci-windows-10-x86_64-52'
-        Compiler: 'MSVC2019'
-        Target arch: 'x86'
-        Features: ['Packaging', 'UseLegacyInstructions']
-        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
-    -
-        Template: 'qtci-linux-CentOS-8.1-x86_64-50'
-        Compiler: 'GCC'
-        Features: ['Packaging', 'UseLegacyInstructions']
-        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
-    -
-        Template: 'qtci-macos-10.13-x86_64-2'
-        Compiler: 'Clang'
-        Features: ['Packaging', 'UseLegacyInstructions']
-        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'GCC'
-        Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

coin/platform_configs/tqtc-qt-rta.yaml

@@ -1,9 +1,3 @@
 Version: 2
 Include: [cmake_platforms.yaml]
-Configurations:
--
-    Template: 'qtci-windows-10-x86-4'
-    Compiler: 'MSVC2019'
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
-    Features: ['UseLegacyInstructions']
-
+Configurations: []

coin/pre-provisioning/qtci-linux-CentOS-8.3-x86_64/README_MANUAL_INSTALLATIONS

@@ -1,11 +1,11 @@
-### CENTOS 8.1 ###
+### CENTOS 8.3 ###
 Hard Disk: 500G
 Network: CI
 Video Card: Total Video Memory: 64MB
 Boot options/Firmware: BIOS
 
 Language: English (United States)
-Time & Date: Europe/Helsinki
+Time & Date: Etc/Coordinated Universal Time
 Software Selection: Server with GUI
 Network & Host..: Connect
 
@@ -26,20 +26,25 @@ Connect Your Online Accounts: Skip
  Devices:
     * Displays: Resolution 1280 x 800
  Details:
-    * Time Zone: GMT
+    * Time Zone: UTC
+       * run "sudo timedatectl set-timezone Etc/UTC"
     * Users: Automatic login on
 
 # Add user to sudoers
 Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
 
-# Fetch and run coin-setup
-Download http://coin/coin/binary/linux_386/coin-setup
-
-run 'sudo ./coin-setup'
-
 Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub
-grub2-mkconfig -o /etc/grub2.cfg
-grub2-mkconfig -o /boot/grub2/grub.cfg
+sudo grub2-mkconfig -o /etc/grub2.cfg
+sudo grub2-mkconfig -o /boot/grub2/grub.cfg
+
+# Add support for virtio driver
+su
+echo "add_drivers+=\"virtio-blk\"" >> /etc/dracut.conf.d/virtio.conf
+dracut -f
+
+# Fetch and run coin-setup
+Download http://coin/coin/binary/linux_amd64/coin-setup
+run './coin-setup'
 
 Reboot
 

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

@@ -0,0 +1,7 @@
+Add accessibility settings:
+/Volumes/Macintosh\ HD/usr/bin/sqlite3 "/Volumes/Macintosh HD/Library/Application Support/com.apple.TCC/TCC.db" <<"EOF"
+insert into access (service,client,client_type,allowed,prompt_count,indirect_object_identifier,flags,last_modified) values ("kTCCServiceAccessibility","com.froglogic.squish.ide.product",0,1,1,"UNSEEN",0,1612871478)
+
+insert into access (service,client,client_type,allowed,prompt_count,indirect_object_identifier,flags,last_modified) values ("kTCCServiceAccessibility","/Users/qt/bootstrap-agent",1,1,1,"UNSEEN",0,1612871478);
+EOF
+

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

@@ -0,0 +1,8 @@
+Add accessibility settings:
+/Volumes/Macintosh\ HD/usr/bin/sqlite3 "/Volumes/Macintosh HD/Library/Application Support/com.apple.TCC/TCC.db" <<"EOF"{{insert into access (service,client,client_type,auth_value,auth_reason,auth_version,indirect_object_identifier_type,indirect_object_code_identity,last_modified) values }}
+('kTCCServiceAccessibility','com.froglogic.squish.ide.product',0,2,4,1,0,0,1612867994);
+
+{{insert into access (service,client,client_type,auth_value,auth_reason,auth_version,indirect_object_identifier_type,indirect_object_code_identity,last_modified) values }}
+('kTCCServiceAccessibility','/Library/Java/JavaVirtualMachines/jdk1.8.0_102.jdk/Contents/Home/jre/bin/java',1,2,4,1,0,0,1612867994);
+
+EOF

coin/provisioning/common/linux/gcc.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## 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.
@@ -57,7 +57,7 @@ function InstallGCC() {
     suffixVersion=$(echo "$version" | cut -d "." -f1,2)
     sourceFile="gcc-$version.tar.xz"
     cachedUrl="http://ci-files01-hki.intra.qt.io/input/gcc/$sourceFile"
-    officialUrl="ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/gcc.gnu.org/pub/gcc/releases/gcc-$version/$sourceFile"
+    officialUrl="https://gcc.gnu.org/pub/gcc/releases/gcc-$version/gcc-$version.tar.xz"
 
     targetFile="$tmpFolder/$sourceFile"
     buildFolder="$HOME/gcc_build"

coin/provisioning/common/linux/sccache.sh

@@ -38,6 +38,6 @@ set -ex
 source "${BASH_SOURCE%/*}/../unix/sccache.sh"
 
 targetArch=x86_64-unknown-linux-musl
-targetVersion=0.2.13-alpha-0
-sha1=0cb28f7408e5246bc71132f27d86301c30e16c74
+targetVersion=0.2.14
+sha1=281680c0fc2c09173e94d12ba45d9f1b8e62e5b3
 installSccache "$targetArch" "$targetVersion" "$sha1"

coin/provisioning/common/macos/java.sh

@@ -46,7 +46,7 @@ url=ci-files01-hki.intra.qt.io:/hdd/www/input/mac
 
 echo "Mounting $targetFile"
 sudo mkdir -p /Volumes/files
-sudo mount "$url" /Volumes/files
+sudo mount -o locallocks "$url" /Volumes/files
 
 sudo cp "/Volumes/files/$targetFile" /tmp
 sudo umount /Volumes/files

coin/provisioning/common/macos/sccache.sh

@@ -38,6 +38,6 @@ set -ex
 source "${BASH_SOURCE%/*}/../unix/sccache.sh"
 
 targetArch=x86_64-apple-darwin
-targetVersion=0.2.13-alpha-0
-sha1=8fe82ddc05a25debc314ea1a8cda665cddb90f72
+targetVersion=0.2.14
+sha1=764bc1664c0ff616d9980a6d127175d0a2041781
 installSccache "$targetArch" "$targetVersion" "$sha1"

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

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+# This script will install Conan
+# Note! Python3 is required for Conan installation
+
+# Install Conan to Python user install directory (typically ~./local/)
+pip3 install conan --user
+

coin/provisioning/common/unix/libclang-v100-dyn.sh

@@ -78,5 +78,6 @@ fi
 sudo mv /usr/local/libclang "$destination"
 rm -rf $zip
 
+
 echo "export LLVM_DYNAMIC_LIBS_100=$destination" >> ~/.bash_profile
 echo "libClang for QtForPython= $version" >> ~/versions.txt

coin/provisioning/common/unix/libclang.sh

@@ -47,18 +47,23 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
 
-libclang_version=10.0
+libclang_version=11.0
 
 if uname -a |grep -q Darwin; then
     version=$libclang_version
     url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-mac.7z"
     url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-mac.7z"
-    sha1="6e019c428511e74c5d46d0ddca79d8e804b67f8a"
+    sha1="2ea23914089df532385a527861feb010a867000b"
+elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat"; then
+    version=$libclang_version
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
+    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
+    sha1="eeb9b9bed81308cc4c7a7ac177e15baec7214d5e"
 else
     version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
-    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
-    sha1="08f352d411e4b47c2a259c3b120d7cb2db01e41d"
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
+    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
+    sha1="57ebaac89bbe51a661f31a13c5e3829e34aa8b80"
 fi
 
 zip="/tmp/libclang.7z"

coin/provisioning/common/unix/squishInstall.sh

@@ -78,7 +78,11 @@ fi
 targetFileMount="$mountFolder"/"$compressedFolder"
 
 echo "Mounting $preBuildCacheUrl to $mountFolder"
-sudo mount "$preBuildCacheUrl" "$mountFolder"
+if uname -a |grep -q Darwin; then
+   sudo mount -o locallocks "$preBuildCacheUrl" "$mountFolder"
+else
+   sudo mount "$preBuildCacheUrl" "$mountFolder"
+fi
 echo "Create $installFolder if needed"
 if [ !  -d "$installFolder" ]; then
     sudo mkdir "$installFolder"

coin/provisioning/common/windows/3dstudio_3rdparty.ps1

@@ -7,6 +7,6 @@ $url = "http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win
 Download $url $url $zip
 Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1"
 Extract-7Zip $zip C:\Utils\Qt3DStudio3rdparty
-Remove-Item -Path $zip
+Remove "$zip"
 
 Set-EnvironmentVariable "QT3DSTUDIO_3RDPARTY_DIR" "C:/Utils/Qt3DStudio3rdparty"

coin/provisioning/common/windows/cmake.ps1

@@ -41,7 +41,7 @@ $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $v
 $cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip"
 
 Write-Host "Removing old cmake"
-Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue
+Remove "C:\CMake"
 
 Download $officialurl $cachedurl $zip
 Verify-Checksum $zip "5e42a287610a619c3a150376d9aaad31282cdcd4"

coin/provisioning/common/windows/dxsdk.ps1

@@ -14,6 +14,6 @@ Verify-Checksum $package_path $sdkChecksumSha1 sha1
 Write-Host "Installing DirectX SDK"
 Run-Executable $package_path "/u"
 
-Remove-Item -Path $package_path
+Remove "$package_path"
 
 Write-Output "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt

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

@@ -67,14 +67,14 @@ try {
     Download $breakpad_tar_url $breakpad_tar_url $targetBreakpad
     Verify-Checksum $targetBreakpad $breakpad_tar_sha
     Extract-tar_gz $targetBreakpad $installFolder
-    Remove-Item -Path $targetBreakpad
+    Remove "$targetBreakpad"
     # linux-syscall-support
     Download $linux_syscall_support_tar_url $linux_syscall_support_tar_url $targetSyscall
     Verify-Checksum $targetSyscall $linux_syscall_support_tar_sha
     Extract-tar_gz $targetSyscall "$env:tmp\"
     New-Item -ItemType directory -Path "$installFolder\breakpad\third_party\lss"
     Get-ChildItem -Path "$env:tmp\linux-syscall-support\*" -Recurse | Move-Item -Destination "$installFolder\breakpad\third_party\lss"
-    Remove-Item -Path $targetSyscall
+    Remove "$targetSyscall"
 }
 catch {
     Write-Host "Cached download failed: Attempping fallback method eg git."

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

@@ -57,6 +57,6 @@ Verify-Checksum $dependsPackage $sha1
 Extract-7Zip $dependsPackage $TARGETDIR
 
 Write-Host "Cleaning $dependsPackage.."
-Remove-Item -Recurse -Force -Path "$dependsPackage"
+Remove "$dependsPackage"
 
 Write-Output "Dependency Walker = $version" >> ~\versions.txt

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

@@ -61,7 +61,7 @@ function InstallMinGW
     Set-EnvironmentVariable "$envvar" ("$targetdir\mingw" + $win_arch.Substring($win_arch.get_Length()-2))
 
     Write-Host "Cleaning $mingwPackage.."
-    Remove-Item -Recurse -Force -Path "$mingwPackage"
+    Remove "$mingwPackage"
 
     Write-Output "MinGW = $version $release" >> ~\versions.txt
 

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

@@ -77,6 +77,6 @@ if ((Test-Path $url_cache_prebuilt)) {
 }
 
 Write-Host "Cleaning $PackagePath.."
-Remove-Item -Recurse -Force -Path "$PackagePath"
+Remove "$PackagePath"
 
 Write-Output "msys2 = $version" >> ~\versions.txt

coin/provisioning/common/windows/install-notepad++.ps1

@@ -52,7 +52,7 @@ Verify-Checksum $nppPackage $sha1
 Run-Executable "$nppPackage" "/S"
 
 Write-Host "Cleaning $nppPackage.."
-Remove-Item -Recurse -Force -Path "$nppPackage"
+Remove "$nppPackage"
 
 Write-Output "Notepad++ = $version" >> ~\versions.txt
 

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

@@ -57,7 +57,7 @@ if(![System.IO.File]::Exists("$installationFolder\bin\protoc.exe")){
     exit 1
 }
 
-Remove-Item "$zip"
+Remove "$zip"
 
 Add-Path "$installationFolder\bin"
 Set-EnvironmentVariable PROTOBUF_INCLUDE "$installationFolder\include"

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

@@ -52,6 +52,6 @@ Verify-Checksum $rubyPackage $sha1
 Run-Executable $rubyPackage "/dir=C:\Ruby-$version$arch /tasks=modpath /verysilent"
 
 Write-Host "Cleaning $rubyPackage.."
-Remove-Item -Recurse -Force -Path "$rubyPackage"
+Remove "$rubyPackage"
 
 Write-Output "Ruby = $version" >> ~\versions.txt

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

@@ -35,8 +35,8 @@
 
 param(
     [string]$arch="x86_64-pc-windows-msvc",
-    [string]$version="0.2.13-alpha-0",
-    [string]$sha1="39ee0b0b98aa20c54a75ba1cb3116ea694e83c38"
+    [string]$version="0.2.14",
+    [string]$sha1="bbdceb59d6fd7b6a3af02fb36f65c8bf324757b0"
 )
 
 . "$PSScriptRoot\helpers.ps1"

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

@@ -56,7 +56,7 @@ Verify-Checksum $7zPackage $sha1
 Run-Executable $7zPackage "/S","/D=$7zTargetLocation"
 
 Write-Host "Cleaning $7zPackage.."
-Remove-Item -Recurse -Force -Path "$7zPackage"
+Remove "$7zPackage"
 
 Add-Path $7zTargetLocation
 

coin/provisioning/common/windows/install-strawberry-perl.ps1

@@ -53,6 +53,6 @@ Verify-Checksum $strawberryPackage $sha1
 Run-Executable "msiexec" "/quiet /i $strawberryPackage INSTALLDIR=C:\strawberry REBOOT=REALLYSUPPRESS"
 
 Write-Host "Cleaning $strawberryPackage.."
-Remove-Item -Recurse -Force -Path "$strawberryPackage"
+Remove "$strawberryPackage"
 
 Write-Output "strawberry = $version" >> ~\versions.txt

coin/provisioning/common/windows/libclang-v100-dyn.ps1

@@ -47,3 +47,4 @@ if ( $toolchain -eq "vs2019" ) {
 install $sha1 $baseDestination-$archVer
 
 Set-EnvironmentVariable "LLVM_DYNAMIC_LIBS_100" ($baseDestination + "-_ARCH_")
+

coin/provisioning/common/windows/libclang.ps1

@@ -5,7 +5,7 @@ param(
 )
 . "$PSScriptRoot\helpers.ps1"
 
-$libclang_version="10.0"
+$libclang_version="11.0"
 Write-Output "libClang = $libclang_version" >> ~/versions.txt
 
 # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
@@ -32,27 +32,27 @@ function install() {
     Verify-Checksum $zip $sha1
     Extract-7Zip $zip C:\Utils\
     Rename-Item C:\Utils\libclang $destination
-    Remove-Item -Force -Path $zip
+    Remove "$zip"
 }
 
 $toolchainSuffix = ""
 
 if ( $toolchain -eq "vs2019" ) {
     if ( $archVer -eq 64 ) {
-        $sha1 = "6e1b3e6d38803a3bf088e521f4f4feb1ca44bac3"
+        $sha1 = "ff0a30c881691068c14fbed9239b3583c8c45c6a"
     }
     else {
-        $sha1 = "36fcdc3155eef3636d99ed591f12e73d7a9a2e0c"
+        $sha1 = ""
     }
     $toolchainSuffix = "msvc"
 }
 
 if ( $toolchain -eq "mingw" ) {
     if ( $archVer -eq 64 ) {
-        $sha1 = "34daf2324d190de49f8e4005afeb39a7d70c5842"
+        $sha1 = "40141a788b1ccb615544e18da27cd95b4986217b"
     }
     else {
-        $sha1 = "3d7c809ab12c9293df8ffd9343cee68f184c8612"
+        $sha1 = ""
     }
     $toolchainSuffix = "mingw"
 }
@@ -64,7 +64,7 @@ if ( $setDefault ) {
 }
 Set-EnvironmentVariable ("LLVM_INSTALL_DIR_${toolchainSuffix}") ($baseDestination + "-$archVer")
 
-if ( $libclang_version -eq "100" ) {
+if ( $libclang_version -eq "110" ) {
     # This is a hacked static build of libclang which requires special
     # handling on the qdoc side.
     Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1"

coin/provisioning/common/windows/mesa_llvmpipe.ps1

@@ -53,7 +53,7 @@ function Extract-Mesa
     Verify-Checksum $package $sha1
     Extract-7Zip $package $targetFolder
     Write-Host "Removing $package"
-    Remove-Item -Path $package
+    Remove "$package"
 }
 
 if (Is64BitWinHost) {

coin/provisioning/common/windows/mqtt_broker.ps1

@@ -46,6 +46,6 @@ Verify-Checksum $zip $sha1
 
 Write-Host "MQTT: Installing $zip..."
 Extract-7Zip $zip C:\Utils
-Remove-Item -Path $zip
+Remove "$zip"
 
 Set-EnvironmentVariable "MQTT_TEST_BROKER_LOCATION" "C:\Utils\paho.mqtt.testing-$commitSHA\interoperability\startbroker.py"

coin/provisioning/common/windows/msvc-2013-update5.ps1

@@ -45,6 +45,6 @@ Write-Host "Installing Update 5 for Visual Studio $version..."
 Run-Executable "$package" "/norestart /passive"
 
 Write-Host "Removing $package ..."
-Remove-Item $package
+Remove "$package"
 
 Write-Output "Visual Studio = $version" >> ~\versions.txt

coin/provisioning/common/windows/msys.ps1

@@ -11,6 +11,6 @@ $destination = "C:\msys"
 
 Download $url $url $zip
 Verify-Checksum $zip $sha1
-C:\Utils\sevenzip\7z.exe x $zip -oC:\
+Extract-7Zip $zip C:\
 Set-EnvironmentVariable "MSYS_PATH" "$destination\\1.0\\bin"
 Write-Output "Msys = $version" >> ~/versions.txt

coin/provisioning/common/windows/mysql.ps1

@@ -57,7 +57,7 @@ function DownloadAndInstall
     $zipDir = [io.path]::GetFileNameWithoutExtension($package)
     Extract-7Zip $package $installPath "$zipDir\lib $zipDir\bin $zipDir\share $zipDir\include"
 
-    Remove-Item -Path $package
+    Remove "$package"
 }
 
 if (Is64BitWinHost) {

coin/provisioning/common/windows/ninja.ps1

@@ -6,7 +6,7 @@ Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win
 Verify-Checksum $zip "E01093F6533818425F8EFB0843CED7DCAABEA3B2"
 
 Extract-7Zip $zip C:\Utils\Ninja
-Remove-Item -Path $zip
+Remove "$zip"
 
 Add-Path "C:\Utils\Ninja"
 

coin/provisioning/common/windows/opcua_unifiedautomation.ps1

@@ -53,7 +53,7 @@ function DownloadAndInstallUA
 
     Write-Host "UACPPSDK: Extracting $zip..."
     Extract-7Zip $zip (Get-DefaultDownloadLocation)
-    Remove-Item -Path $zip
+    Remove "$zip"
 
     $executable = (Get-DefaultDownloadLocation) + "$InstallerFileName.exe"
     # We cannot call the installer as the x86 and x64 versions of the installer are not
@@ -65,7 +65,7 @@ function DownloadAndInstallUA
     #Remove-Item $executable
 
     Extract-7Zip $executable $Destination
-    Remove-Item $executable
+    Remove "$executable"
 }
 
 #x86 version

coin/provisioning/common/windows/openssl.ps1

@@ -56,7 +56,7 @@ if (Is64BitWinHost) {
     Run-Executable "$packagex64" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder"
 
     Write-Host "Remove downloaded $packagex64 ..."
-    Remove-Item -Path $packagex64
+    Remove "$packagex64"
 
     Set-EnvironmentVariable "OPENSSL_CONF_x64" "$installFolder\bin\openssl.cfg"
     Set-EnvironmentVariable "OPENSSL_INCLUDE_x64" "$installFolder\include"
@@ -83,7 +83,7 @@ Write-Host "Installing $packagex86 ..."
 Run-Executable "$packagex86" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder"
 
 Write-Host "Remove downloaded $packagex86 ..."
-Remove-Item -Path $packagex86
+Remove "$packagex86"
 
 Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\bin\openssl.cfg"
 Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include"

coin/provisioning/common/windows/postgresql.ps1

@@ -55,10 +55,10 @@ if (Is64BitWinHost) {
     Extract-7Zip $packagex64 $installFolder "pgsql\lib pgsql\bin pgsql\share pgsql\include"
 
     Write-Host "Remove downloaded $packagex64 ..."
-    Remove-Item -Path $packagex64
+    Remove $packagex64
     # Remove pthread.h file so it won't be used in mingw builds (QTBUG-79555)
-    Remove-item -Path "$installFolder\pgsql\include\pthread.h"
-    Remove-item -Path "$installFolder\pgsql\include\unistd.h"
+    Remove "$installFolder\pgsql\include\pthread.h"
+    Remove "$installFolder\pgsql\include\unistd.h"
 
     Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x64" "$installFolder\pgsql\include"
     Set-EnvironmentVariable "POSTGRESQL_LIB_x64" "$installFolder\pgsql\lib"
@@ -83,10 +83,10 @@ Write-Host "Installing $packagex86 ..."
 Extract-7Zip $packagex86 $installFolder "pgsql\lib pgsql\bin pgsql\share pgsql\include"
 
 Write-Host "Remove downloaded $packagex86 ..."
-Remove-Item -Path $packagex86
+Remove $packagex86
 # Remove pthread.h file so it won't be used in mingw builds (QTBUG-79555)
-Remove-item -Path "$installFolder\pgsql\include\pthread.h"
-Remove-item -Path "$installFolder\pgsql\include\unistd.h"
+Remove "$installFolder\pgsql\include\pthread.h"
+Remove "$installFolder\pgsql\include\unistd.h"
 
 Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x86" "$installFolder\pgsql\include"
 Set-EnvironmentVariable "POSTGRESQL_LIB_x86" "$installFolder\pgsql\lib"

coin/provisioning/common/windows/python.ps1

@@ -82,8 +82,7 @@ while ($stop -ne $true)
 # We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB
 Write-Host "Changing allowZip64 value to 'True'..."
 (Get-Content $targetDir\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content $targetDir\lib\zipfile.py
-Write-Host "Remove $package..."
-Remove-Item -Path $package
+Remove "$package"
 
 # When installing 32 bit python to 64 bit host, we want to keep only default python in path
 # For cross-compilation we export some helper env variable

coin/provisioning/common/windows/python3.ps1

@@ -60,8 +60,7 @@ Download $externalUrl $internalUrl $package
 Verify-Checksum $package $sha1
 Write-Host "Installing $package..."
 Run-Executable "$package" "/q TargetDir=$install_path"
-Write-Host "Remove $package..."
-Remove-Item -Path $package
+Remove "$package"
 
 # For cross-compilation we export some helper env variable
 if (($archVer -eq 32) -And (Is64BitWinHost)) {

coin/provisioning/common/windows/squish-coco.ps1

@@ -45,4 +45,4 @@ Download $url $url $installer
 Verify-Checksum $installer $sha1
 Run-Executable $installer "/S"
 Run-Executable "C:\Program Files\squishcoco\cocolic.exe" "--license-server=Qt-SRV-33.intra.qt.io:49344"
-Remove-Item -Force -Path $installer
+Remove "$installer"

coin/provisioning/common/windows/telegraf_password.ps1

@@ -31,13 +31,15 @@
 ##
 #############################################################################
 
+. "$PSScriptRoot\helpers.ps1"
+
 $auth_file = "C:\Users\qt\work\influxdb\coin_vms_writer.auth"
 
 # Provisioning should run even without the secrets repository
 if (Test-Path $auth_file) {
     $auth_content = Get-Content $auth_file
     $influxdb_password = $auth_content.Substring($auth_content.LastIndexOf(':') + 1)
-    Remove-Item $auth_file
+    Remove "$auth_file"
 } else {
     $influxdb_password = "no_password_provided"
 }

coin/provisioning/common/windows/vulkansdk.ps1

@@ -43,6 +43,6 @@ Copy-Item $url_cache $vulkanPackage
 Run-Executable $vulkanPackage "/S"
 
 Write-Host "Cleaning $vulkanPackage.."
-Remove-Item -Recurse -Force -Path "$vulkanPackage"
+Remove "$vulkanPackage"
 
 Write-Output "Vulkan SDK = $version" >> ~\versions.txt

coin/provisioning/common/windows/win10sdk.ps1

@@ -45,6 +45,6 @@ Verify-Checksum $package $sha1
 Run-Executable $package "/features + /q"
 
 Write-Host "Cleaning $package.."
-Remove-Item -Recurse -Force -Path "$package"
+Remove "$package"
 
 Write-Output "Windows 10 SDK = 10.0.16229.91" >> ~\versions.txt

coin/provisioning/common/windows/winrtrunner.ps1

@@ -7,6 +7,6 @@ $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\winrtrunner\winr
 Download $url $url_cache $zip
 Verify-Checksum $zip "93548e8c3fb8fded2474996ef5e0163f489ce8cf"
 Extract-7Zip $zip C:\Utils\winrtrunner
-Remove-Item -Path $zip
+Remove "$zip"
 
 Set-EnvironmentVariable "CI_WINRTRUNNER_PATH" "C:\Utils\winrtrunner"

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

@@ -52,3 +52,8 @@ sudo timedatectl set-timezone Etc/UTC
 gsettings set org.gnome.desktop.screensaver lock-enabled false
 # disable blank screen power saving
 gsettings set org.gnome.desktop.session idle-delay 0
+
+# Set Wayland enable as false. CentOS may start using Wayland instead of x-session randomly if this is not set
+echo "Setting Wayland enable as false"
+sudo sed -i 's/#WaylandEnable=false/WaylandEnable=false/g' /etc/gdm/custom.conf
+

coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-enable-repos.sh

@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+set -ex
+
+sudo rm -f /etc/yum.repos.d/*.repo
+
+sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC
+[BaseOS]
+name = Qt Centos-8 - Base
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/centos/8/BaseOS/x86_64/os/
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+enabled = 1
+gpgcheck = 1
+
+[AppStream]
+name = Qt Centos-8 - AppStream
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/centos/8/AppStream/x86_64/os/
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+enabled = 1
+gpgcheck = 1
+
+[PowerTools]
+name = Qt Centos-8 - PowerTools
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/centos/8/PowerTools/x86_64/os/
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+enabled = 1
+gpgcheck = 1
+
+[epel]
+name = Qt Centos-8 - EPEL
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/centos/epel/8/Everything/x86_64/
+enabled = 1
+gpgcheck = 1
+gpgkey = http://repo-clones.ci.qt.io/repos/centos/epel/RPM-GPG-KEY-EPEL-8
+
+[epel-playground]
+name = Qt Centos-8 - EPEL Playground
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/centos/epel/playground/8/Everything/x86_64/os/
+enabled = 1
+gpgcheck = 1
+gpgkey = http://repo-clones.ci.qt.io/repos/centos/epel/RPM-GPG-KEY-EPEL-8
+EOC
+
+sudo yum clean all
+# As well as this fetching the repository data, we also get a printout of the used repos
+sudo yum repolist

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

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