Update submodules on '6.0.0' in qt/qt5

Change-Id: Ib34b5ed1199121b5050367868c5349941c360a71 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-12-21 23:48:23 +08:00 · 2020-12-08 15:42:58 +02:00 · 2020-12-08 05:36:14 +02:00 · 2020-12-05 05:25:35 +00:00 · 2020-12-04 16:13:13 +02:00 · 2020-12-02 08:39:00 +02:00
328 changed files with 1096 additions and 3305 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,27 +1,27 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.1.0
+	branch = 6.0.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.1.0
+	branch = 6.0.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.1.0
+	branch = 6.0.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.1.0
-	status = addon
+	branch = dev
+	status = ignore
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -34,7 +34,7 @@
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.1.0
+	branch = 6.0.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.1.0
+	branch = 6.0.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.1.0
+	branch = 6.0.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -99,6 +99,12 @@
 	url = ../qtfeedback.git
 	branch = master
 	status = ignore
+[submodule "qtdocgallery"]
+	depends = qtdeclarative
+	path = qtdocgallery
+	url = ../qtdocgallery.git
+	branch = master
+	status = ignore
 [submodule "qtpim"]
 	depends = qtdeclarative
 	path = qtpim
@@ -117,21 +123,21 @@
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.1.0
+	branch = 6.0.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.1.0
-	status = addon
+	branch = dev
+	status = ignore
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.1.0
-	status = addon
+	branch = dev
+	status = ignore
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
@@ -223,7 +229,7 @@
 	recommends = qtimageformats qtgraphicaleffects
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 6.1.0
+	branch = 6.0.0
 	status = essential
 [submodule "qtpurchasing"]
 	depends = qtbase
@@ -237,22 +243,22 @@
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.1.0
-	status = addon
+	branch = dev
+	status = ignore
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.1.0
-	status = addon
+	branch = dev
+	status = ignore
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.1.0
-	status = addon
+	branch = dev
+	status = ignore
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -264,8 +270,8 @@
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.1.0
-	status = addon
+	branch = dev
+	status = ignore
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
@@ -277,8 +283,8 @@
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.1.0
-	status = addon
+	branch = dev
+	status = ignore
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -297,47 +303,29 @@
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.1.0
-	status = addon
+	branch = dev
+	status = ignore
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.1.0
+	branch = 6.0.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.1.0
+	branch = 6.0.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.1.0
+	branch = 6.0.0
 	status = addon
 [submodule "qt5compat"]
-	depends = qtbase qtdeclarative
+	depends = qtbase
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.1.0
+	branch = 6.0.0
 	status = deprecated
-[submodule "qtcoap"]
-	depends = qtbase qttools
-	path = qtcoap
-	url = ../qtcoap.git
-	branch = 6.1.0
-	status = addon
-[submodule "qtmqtt"]
-	depends = qtbase qtdeclarative qttools
-	path = qtmqtt
-	url = ../qtmqtt.git
-	branch = 6.1.0
-	status = addon
-[submodule "qtopcua"]
-	depends = qtbase qtdeclarative qtquickcontrols2 qttools
-	path = qtopcua
-	url = ../qtopcua.git
-	branch = 6.1.0
-	status = addon
--- a/CMakeLists.txt
+++ b/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.1.0
+    VERSION 6.0.0
    DESCRIPTION "Qt Libraries"
    HOMEPAGE_URL "https://qt.io/"
    LANGUAGES CXX C ASM
--- a/134
+++ b/134
@@ -0,0 +1,134 @@
+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.
--- a/README.md
+++ b/README.md
@@ -1,131 +0,0 @@
-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.
--- a/cmake/QtTopLevelHelpers.cmake
+++ b/cmake/QtTopLevelHelpers.cmake
@@ -108,9 +108,8 @@ function(qt_internal_sort_module_dependencies modules out_all_ordered dependenci
                "${${module_dependencies_list_var_name}}" PARENT_SCOPE)
        if(NOT module_depends)
            list(APPEND no_dependencies "${module}")
-        else()
-            set(ordered "${out_ordered}")
        endif()
+        set(ordered "${out_ordered}")
    endforeach()
    if (no_dependencies)
        list(APPEND ordered "${no_dependencies}")
@@ -121,28 +120,20 @@ endfunction()

 # does what it says, but also updates submodules
 function(qt_internal_checkout module revision)
-    set(swallow_output "") # unless VERBOSE, eat git output, show it in case of error
-    if (NOT VERBOSE)
-        list(APPEND swallow_output "OUTPUT_VARIABLE" "git_output" "ERROR_VARIABLE" "git_output")
-    endif()
    message(NOTICE "Checking '${module}' out to revision '${revision}'")
    execute_process(
        COMMAND "git" "checkout" "${revision}"
        WORKING_DIRECTORY "./${module}"
        RESULT_VARIABLE git_result
-        ${swallow_output}
+        OUTPUT_VARIABLE git_stdout
+        ERROR_VARIABLE git_stderr
    )
-    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}
-        )
+    if (VERBOSE)
+        message(NOTICE ${git_stdout})
    endif()
    if (git_result)
-        message(FATAL_ERROR "Failed to check '${module}' out to '${revision}': ${git_output}")
+        message(WARNING "${git_stdout}")
+        message(FATAL_ERROR "Failed to check '${module}' out to '${revision}': ${git_stderr}")
    endif()
    execute_process(
        COMMAND "git" "submodule" "update"
@@ -155,11 +146,6 @@ endfunction()

 # clones or creates a worktree for $dependency, using the source of $dependent
 function(qt_internal_get_dependency dependent dependency)
-    set(swallow_output "") # unless VERBOSE, eat git output, show it in case of error
-    if (NOT VERBOSE)
-        list(APPEND swallow_output "OUTPUT_VARIABLE" "git_output" "ERROR_VARIABLE" "git_output")
-    endif()
-
    set(gitdir "")
    set(remote "")

@@ -174,10 +160,6 @@ function(qt_internal_get_dependency dependent dependency)
    )
    string(FIND "${git_stdout}" "${module}" index)
    string(SUBSTRING "${git_stdout}" 0 ${index} gitdir)
-    string(FIND "${gitdir}" ".git/modules" index)
-    if(index GREATER -1) # submodules have not been absorbed
-        string(SUBSTRING "${gitdir}" 0 ${index} gitdir)
-    endif()
    message(DEBUG "Will look for clones in ${gitdir}")

    execute_process(
@@ -192,44 +174,33 @@ function(qt_internal_get_dependency dependent dependency)
    string(SUBSTRING "${git_stdout}" 0 ${index} remote)
    message(DEBUG "Will clone from ${remote}")

-    if(EXISTS "${gitdir}.gitmodules" AND NOT EXISTS "${gitdir}${dependency}/.git")
-        # super repo exists, but the submodule we need does not - try to initialize
-        message(NOTICE "Initializing submodule '${dependency}' from ${gitdir}")
-        execute_process(
-            COMMAND "git" "submodule" "update" "--init" "${dependency}"
-            WORKING_DIRECTORY "${gitdir}"
-            RESULT_VARIABLE git_result
-            ${swallow_output}
-        )
-        if (git_result)
-            # ignore errors, fall back to an independent clone instead
-            message(WARNING "Failed to initialize submodule '${dependency}' from ${gitdir}")
-        endif()
-    endif()
-
    if(EXISTS "${gitdir}${dependency}")
        # for the module we want, there seems to be a clone parallel to what we have
-        message(NOTICE "Adding worktree for ${dependency} from ${gitdir}${dependency}")
+        message(DEBUG "Adding worktree for ${dependency} from ${gitdir}${dependency}")
        execute_process(
-            COMMAND "git" "worktree" "add" "--detach" "${CMAKE_CURRENT_SOURCE_DIR}/${dependency}"
+            COMMAND "git" "worktree" "add" "${CMAKE_CURRENT_SOURCE_DIR}/${dependency}"
            WORKING_DIRECTORY "${gitdir}/${dependency}"
            RESULT_VARIABLE git_result
-            ${swallow_output}
+            OUTPUT_VARIABLE git_stdout
+            ERROR_VARIABLE git_stderr
        )
        if (git_result)
-            message(FATAL_ERROR "Failed to check '${module}' out to '${revision}': ${git_output}")
+            message(WARNING "${git_stdout}")
+            message(FATAL_ERROR "Failed to create worktree for '${dependency}': ${git_stderr}")
        endif()
    else()
-        # we don't find the existing clone, so clone from the same remote
-        message(NOTICE "Cloning ${dependency} from ${remote}${dependency}.git")
+        # we don't find the existing clone, so clone from the saame remote
+        message(DEBUG "Cloning ${dependency} from ${remote}${dependency}.git")
        execute_process(
            COMMAND "git" "clone" "${remote}${dependency}.git"
            WORKING_DIRECTORY "."
            RESULT_VARIABLE git_result
-            ${swallow_output}
+            OUTPUT_VARIABLE git_stdout
+            ERROR_VARIABLE git_stderr
        )
        if (git_result)
-            message(FATAL_ERROR "Failed to check '${module}' out to '${revision}': ${git_output}")
+            message(WARNING "${git_stdout}")
+            message(FATAL_ERROR "Failed to clone '${dependency}': ${git_stderr}")
        endif()
    endif()
 endfunction()
--- a/cmake/qt_attribution.json
+++ b/cmake/qt_attribution.json
@@ -2,7 +2,6 @@
    "Id": "cmake_topological_sort",
    "Name": "CMake Topological Sort",
    "QDocModule": "qt",
-    "QtParts": ["tools"],
    "QtUsage": "Used in the CMake super build project file",
    "Files": "TopologicalSort.cmake",

--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -24,13 +24,13 @@ instructions:
    - type: Group
      instructions:
        - type: ExecuteCommand
-          command: "{{.Env.ENV_PREFIX}} cmake --build . --target qtbase/src/plugins/platforms/all qtbase/src/plugins/sqldrivers/all qttools/all --parallel -v"
+          command: "{{.Env.ENV_PREFIX}} cmake --build . --target qttools/all --parallel -v"
          maxTimeInSeconds: 12000
          maxTimeBetweenOutput: 1200
          userMessageOnFailure: >
            Failed to build sources.
        - type: ExecuteCommand
-          command: "{{.Env.ENV_PREFIX}} cmake --build . --target docs -v"
+          command: "{{.Env.ENV_PREFIX}} cmake --build . --target generate_docs -v"
          maxTimeInSeconds: 12000
          maxTimeBetweenOutput: 1200
          userMessageOnFailure: >
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -3,8 +3,7 @@ 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
+    cmake_platforms_target_android_host_windows.yaml
    ]
 Configurations:
 -
@@ -22,14 +21,6 @@ Configurations:
    Environment variables: [
        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests']
-    Configure arguments: '-DFEATURE_developer_build=ON -DINPUT_opengl=no -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-    Environment variables: [
-        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
@@ -46,50 +37,60 @@ Configurations:
    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.2-x86_64-50'
+    Template: 'qtci-linux-openSUSE-15.1-x86_64'
    Compiler: 'GCC'
-    Features: ['Sccache']
+    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-openSUSE-15.2-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY'
-    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
    Template: 'qtci-linux-SLES-15_SP2-x86_64-50'
    Compiler: 'GCC'
    Features: ['Sccache', 'DisableTests']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_WITH_PCH=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
-    Template: 'qtci-windows-10-x86_64-52'
+    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_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 -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-windows-10-x86_64-51'
    Compiler: 'MSVC2019'
    Features: ['Packaging', 'Sccache', "DebugAndRelease"]
-    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
    Environment variables: [
        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
    ]
 -
-    Template: 'qtci-windows-10-x86_64-52'
+    Template: 'qtci-windows-10-x86_64-51'
    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'
+    Features: ['InsignificantTests', '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 -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
    Environment variables: [
        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
-    Id: 'CentOS-8.3-host'
-    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
+    Id: 'CentOS-8.1-host'
+    Template: 'qtci-linux-CentOS-8.1-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'
+    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 -DINPUT_bundled_xcb_xinput=yes -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']
 -
@@ -98,12 +99,12 @@ Configurations:
    Target arch: 'arm64'
    Compiler: 'Clang'
    Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
+    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=']
+    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DBUILD_WITH_PCH=OFF', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
 -
    Id: 'Windows10-Mingw8-x64-host'
-    Template: 'qtci-windows-10-x86_64-52'
+    Template: 'qtci-windows-10-x86_64-51'
    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}}\..'
@@ -113,52 +114,3 @@ Configurations:
        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
    ]
-
-    Id: 'Windows10-LLVM-x64-host'
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'Clang'
-    Features: ['Sccache']
-    Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
-    Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'LLVM_INSTALL_DIR=C:\llvm-mingw']
-
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
-    Features: ['Sccache', '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}}']
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QNX_710'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'DisableTests']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QNX_710'
-    Target arch: 'arm64'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'DisableTests']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QNX_710'
-    Target arch: 'armv7'
-    Compiler: 'GCC'
-    Target compiler: 'QCC'
-    Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'DisableTests']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
--- a/coin/platform_configs/cmake_platforms_qemu.yaml
+++ b/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']
+    Features: ['Sccache', 'InsignificantTests']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -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",
+        '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',
+        "QT_CMAKE_DIR=/opt/cmake-3.19.0/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
-        'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
+        'GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/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']
+    Features: ['Sccache', 'InsignificantTests']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -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",
+        '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',
+        "QT_CMAKE_DIR=/opt/cmake-3.19.0/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
-        'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
+        'GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/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,13 +38,12 @@ Configurations:
    Target arch: 'mips64'
    Compiler: 'GCC'
    Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'DisableTests']
+    Features: ['Sccache', 'InsignificantTests', 'DisableTests']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -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",
+        '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',
+        "QT_CMAKE_DIR=/opt/cmake-3.19.0/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']
--- a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
@@ -1,45 +1,45 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
    Target os: 'Android_ANY'
    Target arch: 'arm64'
    Compiler: 'GCC'
    Target compiler: 'Clang'
-    Platform dependency: 'CentOS-8.3-host'
+    Platform dependency: 'CentOS-8.1-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.3-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
    Target os: 'Android_ANY'
    Target arch: 'armv7'
    Compiler: 'GCC'
    Target compiler: 'Clang'
-    Platform dependency: 'CentOS-8.3-host'
+    Platform dependency: 'CentOS-8.1-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.3-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
    Target os: 'Android_ANY'
    Target arch: 'x86'
    Compiler: 'GCC'
    Target compiler: 'Clang'
-    Platform dependency: 'CentOS-8.3-host'
+    Platform dependency: 'CentOS-8.1-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.3-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
    Target os: 'Android_ANY'
    Target arch: 'x86_64'
    Compiler: 'GCC'
    Target compiler: 'Clang'
-    Platform dependency: 'CentOS-8.3-host'
+    Platform dependency: 'CentOS-8.1-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',
--- a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml
+++ b/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-latest-xcode-x86_64-packaging-build'
+    Platform dependency: 'macos-10.14-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 -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-latest-xcode-x86_64-packaging-build'
+    Platform dependency: 'macos-10.14-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 -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-latest-xcode-x86_64-packaging-build'
+    Platform dependency: 'macos-10.14-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 -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-latest-xcode-x86_64-packaging-build'
+    Platform dependency: 'macos-10.14-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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
--- a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml
@@ -1,7 +1,7 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-windows-10-x86_64-52'
+    Template: 'qtci-windows-10-x86_64-51'
    Target os: 'Android_ANY'
    Target arch: 'arm64'
    Compiler: 'Mingw'
@@ -13,7 +13,7 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -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-windows-10-x86_64-52'
+    Template: 'qtci-windows-10-x86_64-51'
    Target os: 'Android_ANY'
    Target arch: 'armv7'
    Compiler: 'Mingw'
@@ -25,7 +25,7 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -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-windows-10-x86_64-52'
+    Template: 'qtci-windows-10-x86_64-51'
    Target os: 'Android_ANY'
    Target arch: 'x86'
    Compiler: 'Mingw'
@@ -37,7 +37,7 @@ Configurations:
        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -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-windows-10-x86_64-52'
+    Template: 'qtci-windows-10-x86_64-51'
    Target os: 'Android_ANY'
    Target arch: 'x86_64'
    Compiler: 'Mingw'
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -1,5 +1,105 @@
 Version: 2
 Configurations:
+-
+    Template: 'qtci-windows-10-x86_64-51'
+    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-macos-10.14-x86_64'
+    Target os: 'Android_ANY'
+    Target arch: 'multi'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Features: ['DisableTests', 'UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r21d -android-ndk-host darwin-x86_64'
+-
+    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-51'
+    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-windows-10-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'multi'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
+    Target compiler: 'Clang'
+    Features: ['DisableTests', 'UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r21d'
 -
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
--- a/coin/platform_configs/flashing-wizard.yaml
+++ b/coin/platform_configs/flashing-wizard.yaml
@@ -2,23 +2,18 @@ Version: 2
 Module only: True
 Configurations:
    -
-        Template: 'qtci-windows-10-x86_64-52'
+        Template: 'qtci-windows-10-x86_64-51'
        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'
+        Template: 'qtci-windows-10-x86_64-51'
        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 -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.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'
+        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'
--- a/coin/platform_configs/macos-developer-build-tests.yaml
+++ b/coin/platform_configs/macos-developer-build-tests.yaml
@@ -1,20 +0,0 @@
-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'
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -1,46 +0,0 @@
-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'
-            ]
-
-    # Then run tests on all supported deployment targets
-    -
-        Id: 'macos-10.14-x86_64-tests'
-        Template: 'qtci-macos-10.14-x86_64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
-    -
-        Id: 'macos-10.15-x86_64-tests'
-        Template: 'qtci-macos-10.15-x86_64-102'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'InsignificantTests']
-        Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
-    -
-        Id: 'macos-11-x86_64-tests'
-        Template: 'qtci-macos-11.0-x86_64-102'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'InsignificantTests']
-        Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
-
-    # Build developer builds for all modules, but only run tests for qtbase and declarative.
-    # See macos-developer-build-tests.yaml for the tests
-    -
-        Id: 'macos-latest-xcode-x86_64-developer-build'
-        Template: 'qtci-macos-11.0-x86_64-102'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'DoNotRunTests']
-        Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-        Environment variables: [
-            'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-            'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-            ]
--- a/coin/platform_configs/qdb.yaml
+++ b/coin/platform_configs/qdb.yaml
@@ -1,3 +1,28 @@
 Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
+Module only: True
+Configurations:
+    -
+        Template: 'qtci-windows-10-x86_64-51'
+        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-51'
+        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']
--- a/coin/platform_configs/qt-creator.yaml
+++ b/coin/platform_configs/qt-creator.yaml
@@ -1,45 +0,0 @@
-Version: 2
-Module only: True
-Configurations:
-
-    Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
-    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-    Environment variables: [
-        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
-    ]
-    Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
-
-    Template: 'qtci-windows-10-x86-4'
-    Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
-    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-    Environment variables: [
-        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
-    ]
-    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'x86']
-
-    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'DisableTests']
-    Configure arguments: '-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'
-    Compiler: 'Clang'
-    Features: ['Packaging', 'DisableTests', 'Sccache', 'DebugAndRelease']
-    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'
-        ]
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'LicenseCheck']
--- a/coin/platform_configs/qtactiveqt.yaml
+++ b/coin/platform_configs/qtactiveqt.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -1,17 +1,23 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    macos-developer-build-tests.yaml
-]
+Include: [cmake_platforms.yaml]
 Configurations:
 -
-    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86'
+    Template: 'qtci-linux-openSUSE-15.1-x86_64'
+    Target os: 'WebAssembly'
    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'CentOS-8.3-host'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun']
+    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: [
-        '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']
+        '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'
+        ]
--- a/coin/platform_configs/qtcharts.yaml
+++ b/coin/platform_configs/qtcharts.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtdatavis3d.yaml
+++ b/coin/platform_configs/qtdatavis3d.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtdeclarative.yaml
+++ b/coin/platform_configs/qtdeclarative.yaml
@@ -1,6 +1,17 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    macos-developer-build-tests.yaml
-]
-Configurations: []
+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'
+        ]
--- a/coin/platform_configs/qtdeviceutilities.yaml
+++ b/coin/platform_configs/qtdeviceutilities.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtlocation.yaml
+++ b/coin/platform_configs/qtlocation.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtlottie.yaml
+++ b/coin/platform_configs/qtlottie.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -1,24 +1,19 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-windows-10-x86_64-52'
+    Template: 'qtci-windows-10-x86_64-51'
    Compiler: 'Mingw'
    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
    Features: ['UseLegacyInstructions']
 -
-    Template: 'qtci-windows-10-x86_64-52'
+    Template: 'qtci-windows-10-x86_64-51'
    Compiler: 'Mingw'
    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
    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.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'
+    Template: 'qtci-linux-CentOS-8.1-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'
--- a/coin/platform_configs/qtscxml.yaml
+++ b/coin/platform_configs/qtscxml.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtsdk.yaml
+++ b/coin/platform_configs/qtsdk.yaml
@@ -0,0 +1,15 @@
+-
+    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'
--- a/coin/platform_configs/qtserialbus.yaml
+++ b/coin/platform_configs/qtserialbus.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtserialport.yaml
+++ b/coin/platform_configs/qtserialport.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtspeech.yaml
+++ b/coin/platform_configs/qtspeech.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtwebengine.yaml
+++ b/coin/platform_configs/qtwebengine.yaml
@@ -2,7 +2,7 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-10-x86_64-52'
+    Template: 'qtci-windows-10-x86_64-51'
    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'
@@ -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.3-x86_64-50'
+    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 -qt-pcre -openssl -qt-harfbuzz -R . QMAKE_LFLAGS_APP+=-s'
--- a/coin/platform_configs/qtwebkit.yaml
+++ b/coin/platform_configs/qtwebkit.yaml
@@ -1,7 +1,7 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-windows-10-x86_64-52'
+    Template: 'qtci-windows-10-x86_64-51'
    Compiler: 'Mingw'
    Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
    Features: ['Packaging', UseLegacyInstructions']
--- a/coin/platform_configs/tqtc-qt-config-gui.yaml
+++ b/coin/platform_configs/tqtc-qt-config-gui.yaml
@@ -0,0 +1,28 @@
+Version: 2
+Module only: True
+Configurations:
+    -
+        Template: 'qtci-windows-10-x86_64-51'
+        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-51'
+        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']
--- a/coin/platform_configs/tqtc-qt-rta.yaml
+++ b/coin/platform_configs/tqtc-qt-rta.yaml
@@ -1,3 +1,11 @@
 Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
+Configurations:
+-   Template: 'qtci-windows-8.1-x86_64'
+    Compiler: 'MSVC2013'
+    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'
+-
+    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']
--- a/coin/pre-provisioning/qtci-linux-CENTOS-8.1-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-CENTOS-8.1-x86_64/README_MANUAL_INSTALLATIONS
@@ -1,11 +1,11 @@
-### CENTOS 8.3 ###
+### CENTOS 8.1 ###
 Hard Disk: 500G
 Network: CI
 Video Card: Total Video Memory: 64MB
 Boot options/Firmware: BIOS

 Language: English (United States)
-Time & Date: Etc/Coordinated Universal Time
+Time & Date: Europe/Helsinki
 Software Selection: Server with GUI
 Network & Host..: Connect

@@ -26,25 +26,20 @@ Connect Your Online Accounts: Skip
 Devices:
    * Displays: Resolution 1280 x 800
 Details:
-    * Time Zone: UTC
-       * run "sudo timedatectl set-timezone Etc/UTC"
+    * Time Zone: GMT
    * Users: Automatic login on

 # Add user to sudoers
 Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt

-Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub
-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'
+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

 Reboot

--- a/coin/pre-provisioning/qtci-macos-10.15-x86_64/README
+++ b/coin/pre-provisioning/qtci-macos-10.15-x86_64/README
@@ -1,7 +0,0 @@
-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
-
--- a/coin/pre-provisioning/qtci-macos-11.0-x86_64/README
+++ b/coin/pre-provisioning/qtci-macos-11.0-x86_64/README
@@ -1,8 +0,0 @@
-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
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS
@@ -1,5 +1,12 @@
 # List about manual pre-installations to Tier1 image:

+Virtual Hardware:
+CPU: 4
+Memory: 8 GB
+Hard Disk: 550 GB
+CI_NW
+Video Card - total memory: 32MB
+
 VM Options:
 Boot options/Firmware: BIOS

@@ -11,14 +18,6 @@ Windows 10 Enterprise
 Region: Finland
 Keyboard layout: United Kingdom

-* Don't use online speech recognition
-* Let Microsoft and apps use your location: no
-* Find my devicer: no
-* Send diagnostic data to Microsoft: Send required diagnostic data
-* Imporve inking & typing: no
-* Get tailored expreriences with diagnostic data: no
-* Let apps use advertising ID: no
-
 * VMware tools (complete) installed
 * Resolution set to 1280x800
 * Coin-setup:
@@ -46,7 +45,12 @@ Keyboard layout: United Kingdom
 * (Restart Windows)
 * Google Chrome installed for RTA
 * Virus & threat protection settings:
-   * Check that there's no active antivirus providers
-* From 'Region Settings'
-   * Set Regional format: English (United States)
+   - Real-time protection -> off
+   - Cloud-delivered protection -> off
+   - Automatic sample submission -> off
+   - Tamper protection -> off
+* Virus & threat protection notifications:
+   - Get informational notifications -> off
+   - Account protection notifications -> off
 * Activate Windows
+
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1
@@ -1,6 +1,6 @@
 ###########################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -44,6 +44,18 @@
 Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F"
 Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableRoutinelyTakingAction /T REG_dWORD /D 1 /F"

+# 'Windows Defender Cache Maintenance' - "Periodic maintenance task."
+DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance"
+
+# 'Windows Defender Cleanup' - "Periodic cleanup task."
+DisableSchedulerTask "Windows Defender\Windows Defender Cleanup"
+
+# 'Windows Defender Scheduled Scan' - "Periodic scan task."
+DisableSchedulerTask "Windows Defender\Windows Defender Scheduled Scan"
+
+# 'Windows Defender Verification' - "Periodic verification task."
+DisableSchedulerTask "Windows Defender\Windows Defender Verification"
+
 # Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports."
 DisableSchedulerTask "Windows Error Reporting\QueueReporting"

--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1
@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 #############################################################################
 ##
 ## Copyright (C) 2018 The Qt Company Ltd.
@@ -33,11 +31,22 @@
 ##
 #############################################################################

-# Install Git Large File Storage
+# Visual Studio $version was installed manually using $installer.
+$version = "2015 update 3"
+$version_number ="14.0.25420.1"
+$installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978.exe"

-set -ex
+# default plus following components were selected:
+# * Visual C++
+#   - Common Tools for Visual C++ 2015
+# * Universal Windows App Development Tools
+#   - Tools (1.4.1) and Windows SDK (10.0.14393)
+#   - Windows 10 SDK (10.0.10586)
+#   - Windows 10 SDK (10.0.10240)
+# * Common Tools
+#   -Visual Studio Extensibility Tools Update 3

-curl -L https://packagecloud.io/github/git-lfs/gpgkey | sudo apt-key add -
-sudo apt-add-repository 'deb https://packagecloud.io/github/git-lfs/ubuntu/ xenial main'
-sudo apt update
-sudo apt install git-lfs
+# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer
+$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe"
+
+echo "Visual Studio = $version version $version_number" >> ~\versions.txt
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt
@@ -1,18 +0,0 @@
-# Visual Studio $version was installed manually using $installer.
-$version = "2015 update 3"
-$version_number ="14.0.25420.1"
-$installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978.exe"
-
-# default plus following components were selected:
-# * Programming Languages
-#    * Visual C++
-#       - Common Tools for Visual C++ 2015
-# * Universal Windows App Development Tools
-#   - Tools (1.4.1) and Windows SDK (10.0.14393)
-#   - Windows 10 SDK (10.0.10586)
-#   - Windows 10 SDK (10.0.10240)
-# * Common Tools
-#   -Visual Studio Extensibility Tools Update 3
-
-# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer
-$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe"
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt
@@ -2,13 +2,13 @@

 $version = "2019"
 # Current version was manually upgraded from the installer
-$version_number = "16.8.1"
+$version_number = "16.6.2"
 $installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe"

 MSVC 2019 build tools (default installation, no additional selections).
    * Install after MSVC2019 is installed!
    * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
-    * Version: 16.8.1
+    * Version: 16.6.2

 Installed MSVC-2019 Components:

@@ -38,10 +38,10 @@ Text Template Transformation
 C# and Visual Basic Roslyn compilers
 C++ 2019 Redistributable Update
 C++ Cmake tools for Windows
-C++/CLI support for v142 build tools /14.28)
+C++/CLI support for v142 build tools /14.26)
 MSBuild
 MSVC v142 - VS 2019 C++ ARM build tools (v14.20)
-MSVC v142 - VS 2019 C++ ARM build tools (v14.28)
+MSVC v142 - VS 2019 C++ ARM build tools (v14.26)
 MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20)
 MSVC v142 - VS 2019 C++ ARM64 build tools (v14.26)
 MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20)
@@ -57,7 +57,7 @@ Razor Language Services
 Graphics debugger and GPU profiler for DirectX
 Image and 3D model editors
 C++ ATL for latest v142 build tools (x86 & x64)
-TypeScript 4.0 SDK
+TypeScript 3.8 SDK
 Windows 10 SDK (10.0.16299.0)
 Windows 10 SDK (10.0.17134.0)
 Windows 10 SDK (10.0.17763.0)
--- a/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt
+++ b/coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt
@@ -4,22 +4,18 @@ Our vanilla images are pre-installed in VMware where we have networking availabl
 use the VMware installed vmxnet3 NIC to fetch VirtIO drivers, install them, and only then switch
 to using the VirtIO NIC in KVM.

-NOTE! Install these Virtio drivers in Opennebula when using Windows 10 20H2
-* Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.185-2/virtio-win-0.1.185.iso
-    cache: http://ci-files01-hki.ci.local/input/windows/virtio/virtio-win-0.1.185.iso
-* Mount virtio-win-0.1.185.iso by double clicking it.
+* Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win-0.1.171.iso
+* Mount virtio-win-0.1.171.iso by double clicking it.
 * Right click 'E:\NetKVM\w10\amd64\netkvm.inf' and select Install
 * Right click 'E:\Balloon\w10\amd64\balloon.inf' and select Install
+
 * Right click 'E:\vioscsi\w10\amd64\vioscsi.inf' and select Install
-* Right click 'E:\vioserial\w10\amd64\vioser.inf' and select Install
-* Navigate to E:\guest-agent directory and double click qemu-ga-x86_64

 Because vioscsi does not install the entries in windows registry before we actually
 have a VirtIO device installed, and we can't boot with a VirtIO device before
 the driver is installed, we have to blindly install the registry entries:

 * Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg
-    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg

 However, we've seen that the Owner in the registry can be wrong. This entry
 sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -53,13 +53,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android"

 toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
-ndkVersion="r22b"
+ndkVersion="r21d"
 ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
-sdkBuildToolsVersion="29.0.3"
-sdkApiLevel="android-29"
+sdkBuildToolsVersion="28.0.3"
+sdkApiLevel="android-28"

 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
-ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc"
+ndkSha1="bcf4023eb8cb6976a4c7cff0a8a8f145f162bf4d"

 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
--- a/coin/provisioning/common/linux/cmake_linux.sh
+++ b/coin/provisioning/common/linux/cmake_linux.sh
@@ -43,10 +43,10 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

 majorminorversion="3.19"
-version="3.19.2"
+version="3.19.0"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz"
 AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz"
-SHA1="61c79765a5a8a44a6b94d1c87c489500f170c1c9"
+SHA1="e2da8449626d9fd8ed1c0eb4babaab6d535f7e72"
 targetFolder="/opt/cmake-$version"
 appPrefix="cmake-$version-Linux-x86_64"

--- a/coin/provisioning/common/linux/gcc.sh
+++ b/coin/provisioning/common/linux/gcc.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -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="https://gcc.gnu.org/pub/gcc/releases/gcc-$version/gcc-$version.tar.xz"
+    officialUrl="ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/gcc.gnu.org/pub/gcc/releases/gcc-$version/$sourceFile"

    targetFile="$tmpFolder/$sourceFile"
    buildFolder="$HOME/gcc_build"
--- a/coin/provisioning/common/linux/openssl_for_android_linux.sh
+++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,18 +33,14 @@
 ##
 #############################################################################

-# This script install prebuilt OpenSSL which was built against Android NDK 21.
-# OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories
-
+# This script install OpenSSL from sources.
+# Requires GCC and Perl to be in PATH.
 set -ex
 # shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-version="1.1.1g"
-: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 21
-# Source built requires GCC and Perl to be in PATH.
 exports_file="/tmp/export.sh"
 # source previously made environmental variables.
 if uname -a |grep -q "Ubuntu"; then
@@ -56,6 +52,8 @@ else
    grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file
    rm -rf "$exports_file"
 fi
+
+version="1.1.1g"
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
@@ -69,14 +67,7 @@ TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin
 cd "$opensslHome"
 PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
 PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
-'
-prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_g_for-android-ndk-21.tar.gz"
-targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
-sha="2998e1a3bc9aa4bc7475d1be270db9f4109fca00"
-DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
-tar -xzf "$targetFile" -C "${HOME}"

-opensslHome="${HOME}/openssl/android/openssl-${version}"
 SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"

 echo "OpenSSL for Android = $version" >> ~/versions.txt
--- a/coin/provisioning/qtci-macos-10.15-x86_64/40-qnx700.sh
+++ b/coin/provisioning/qtci-macos-10.15-x86_64/40-qnx700.sh
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash

 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -35,22 +35,33 @@

 # This script installs QNX 7.

+set -ex
+
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
 targetFolder="/opt/"
-sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-linux.tar.xz"
+sha1="9fb115b2c84b8e7b6016a51cc421a763bda298a1"
 folderName="qnx700"
+targetFile="qnx700.tar.xz"
+wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
+echo "$sha1  $targetFile" | sha1sum --check
+if [ ! -d "$targetFolder" ]; then
+    mkdir -p $targetFolder
+fi
+sudo tar -C $targetFolder -Jxf $targetFile
+sudo chown -R qt:users "$targetFolder"/"$folderName"

-sudo mkdir -p "$targetFolder"
-
-echo "Extracting QNX 7"
-sudo tar -C "$targetFolder" -Jxf $sourceFile
-
-sudo chown -R qt:wheel "$targetFolder"/"$folderName"
-
-# Verify that we have last file in zip
+# Verify that we have last file in tar
 if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
-    exit 1
+    echo "Installation failed!"
+    exit -1
 fi

+rm -rf $targetFile
+
 # Set env variables
-echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc
+SetEnvVar "QNX_700" "$targetFolder$folderName"
+
 echo "QNX SDP = 7.0.0" >> ~/versions.txt
--- a/coin/provisioning/common/linux/qnx_710.sh
+++ b/coin/provisioning/common/linux/qnx_710.sh
@@ -1,89 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2021 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script installs QNX 7.
-
-set -ex
-
-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
-DownloadAndExtract () {
-    url=$1
-    sha=$2
-    file=$3
-    folder=$4
-
-    DownloadURL "$url" "$url" "$sha" "$file"
-    sudo tar -C $folder -Jxf $file
-
-    rm -rf $file
-}
-
-targetFolder="/opt/"
-folderName="qnx710"
-targetPath="$targetFolder$folderName"
-
-if [ ! -d "$targetFolder" ]; then
-    mkdir -p $targetFolder
-fi
-
-# QNX SDP
-sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx710-20201027-linux.tar.xz"
-targetFile="qnx710.tar.xz"
-sha1="fa9eb0f4247504a546cb014784646847eb6c8114"
-DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
-
-# Toolchain files
-sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx-toolchains.tar.xz"
-targetFile="qnx-toolchains.tar.xz"
-sha1="d8a97605d80a2296f98caba3854557ca0dd5d7d3"
-DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetPath"
-
-sudo chown -R qt:users "$targetPath"
-
-# Verify that we have last files in tars
-if [ ! -f $targetPath/qnxsdp-env.sh ] || [ ! -f $targetPath/qnx-toolchain-x8664.cmake ]
-then
-    echo "QNX toolchain installation failed!"
-    exit -1
-fi
-
-# Set env variables
-SetEnvVar "QNX_710" "$targetPath"
-
-echo "QNX SDP = 7.1.0" >> ~/versions.txt
--- a/coin/provisioning/common/linux/sccache.sh
+++ b/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.14
-sha1=281680c0fc2c09173e94d12ba45d9f1b8e62e5b3
+targetVersion=0.2.13-alpha-0
+sha1=0cb28f7408e5246bc71132f27d86301c30e16c74
 installSccache "$targetArch" "$targetVersion" "$sha1"
--- a/coin/provisioning/common/macos/cmake.sh
+++ b/coin/provisioning/common/macos/cmake.sh
@@ -43,11 +43,11 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

 majorminorversion="3.19"
-version="3.19.2"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-macos-universal.tar.gz"
-AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-macos-universal.tar.gz"
-SHA1="753c72931e9c76c969255c197781635e7110e363"
-appPrefix="cmake-$version-macos-universal"
+version="3.19.0"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Darwin-x86_64.tar.gz"
+AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Darwin-x86_64.tar.gz"
+SHA1="856906e435d24a609e76f3c5162a4129e3319531"
+appPrefix="cmake-$version-Darwin-x86_64"

 InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"

--- a/coin/provisioning/common/macos/disable-notifications_and_warnings.sh
+++ b/coin/provisioning/common/macos/disable-notifications_and_warnings.sh
@@ -4,4 +4,4 @@ echo "Unload notificationcenterui.plist"
 launchctl unload -w /System/Library/LaunchAgents/com.apple.notificationcenterui.plist

 echo "Remove 32-bit warnings"
-rm -f ~/Library/Preferences/com.apple.coreservices.uiagent.plist
+rm ~/Library/Preferences/com.apple.coreservices.uiagent.plist
--- a/coin/provisioning/common/macos/disable_net_lso.sh
+++ b/coin/provisioning/common/macos/disable_net_lso.sh
@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2021 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-echo """<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-    <key>Label</key>
-    <string>net_tcp_tso_off</string>
-    <key>MachServices</key>
-    <dict>
-        <key>net_tcp_tso_off</key>
-        <true/>
-    </dict>
-    <key>Program</key>
-    <string>/usr/sbin/sysctl</string>
-    <key>ProgramArguments</key>
-    <array>
-        <string>/usr/sbin/sysctl</string>
-        <string>net.inet.tcp.tso=0</string>
-    </array>
-    <key>UserName</key>
-    <string>root</string>
-    <key>GroupName</key>
-    <string>wheel</string>
-    <key>KeepAlive</key>
-    <true/>
-    <key>RunAtLoad</key>
-    <true/>
-</dict>
-</plist>
-""" | sudo tee -a /Library/LaunchDaemons/net_tcp_tso_off.plist
--- a/coin/provisioning/common/macos/disable_spotlight.sh
+++ b/coin/provisioning/common/macos/disable_spotlight.sh
@@ -35,8 +35,4 @@

 # Disable spotlight and and stop indexing
 sudo mdutil -a -i off
-sudo mdutil -a -i off /
-# Disable spotlight indexing /Volumes
-sudo mdutil -i off /Volumes
-# Erase spotlight index
-sudo mdutil -E /
+sudo defaults write /.Spotlight-V100/VolumeConfiguration Exclusions -array "/Volumes"
--- a/coin/provisioning/common/macos/install_xcode.sh
+++ b/coin/provisioning/common/macos/install_xcode.sh
@@ -51,8 +51,6 @@ function InstallXCode() {
    echo "Uncompressing and installing '$sourceFile'"
    if [[ $sourceFile =~ tar ]]; then
        cd /Applications/ && sudo tar -zxf "$sourceFile"
-    elif [[ $sourceFile =~ "xip" ]]; then
-        cd /Applications/ && xip -x "$sourceFile"
    else
        xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)
    fi
--- a/coin/provisioning/common/macos/java.sh
+++ b/coin/provisioning/common/macos/java.sh
@@ -45,11 +45,10 @@ url=ci-files01-hki.intra.qt.io:/hdd/www/input/mac
 # url_alt=http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-macosx-x64.dmg

 echo "Mounting $targetFile"
-sudo mkdir -p /Volumes/files
-sudo mount -o locallocks "$url" /Volumes/files
+sudo mount "$url" /Volumes

-sudo cp "/Volumes/files/$targetFile" /tmp
-sudo umount /Volumes/files
+sudo cp "/Volumes/$targetFile" /tmp
+sudo umount /Volumes
 sudo hdiutil attach "/tmp/$targetFile"

 echo Installing JDK
--- a/coin/provisioning/common/macos/macos-version.sh
+++ b/coin/provisioning/common/macos/macos-version.sh
@@ -44,6 +44,8 @@ sw_vers >> ~/versions.txt
 echo "***** All installed packages *****" >> ~/versions.txt
 echo "***** HomeBrew *****" >> ~/versions.txt
 brew list --versions >> ~/versions.txt
+echo "***** HomeBrew Casks*****" >> ~/versions.txt
+brew cask list --versions >> ~/versions.txt
 echo "***** Apple's installer *****" >> ~/versions.txt
 pkgutil --pkgs >> ~/versions.txt
 echo "*********************************************" >> ~/versions.txt
--- a/coin/provisioning/common/macos/nodejs.sh
+++ b/coin/provisioning/common/macos/nodejs.sh
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2021 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# shellcheck source=./../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-
-# This script will install Nodejs
-
-version="14.16.1"
-urlCache="http://ci-files01-hki.ci.local/input/nodejs/node-v$version.pkg"
-urlOffcial="https://nodejs.org/dist/v$version/node-v$version.pkg"
-sha1="4720274971c40fe51b2c647060f77c45fb4949a7"
-
-DownloadURL $urlCache $urlOffcial $sha1 "/tmp"
-sudo installer -pkg node-v$version.pkg -target /
-
- echo "Nodejs = $version" >> ~/versions.txt
-
--- a/coin/provisioning/common/macos/pip.sh
+++ b/coin/provisioning/common/macos/pip.sh
@@ -1,18 +1,11 @@
 #!/usr/bin/env bash

-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-
 function InstallPip {

    python=$1

    # Will install pip utility for python
-    if [[ $python == "python2.7" ]]; then
-        DownloadURL "http://ci-files01-hki.intra.qt.io/input/mac/python27/get-pip.py" "https://bootstrap.pypa.io/2.7/get-pip.py" "c4c5f74586cffe49804f167d95d1710b9750ddf0"
-    else
-        DownloadURL "http://ci-files01-hki.intra.qt.io/input/mac/get-pip.py" "https://bootstrap.pypa.io/get-pip.py" "209ddf0bb8d1cf06a1f17dd9f21970c76b3d2be2"
-    fi
+    curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
    sudo "$python" get-pip.py
    rm get-pip.py
 }
--- a/coin/provisioning/common/macos/sccache.sh
+++ b/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.14
-sha1=764bc1664c0ff616d9980a6d127175d0a2041781
+targetVersion=0.2.13-alpha-0
+sha1=8fe82ddc05a25debc314ea1a8cda665cddb90f72
 installSccache "$targetArch" "$targetVersion" "$sha1"
--- a/coin/provisioning/common/macos/screenresolution.sh
+++ b/coin/provisioning/common/macos/screenresolution.sh
@@ -1,74 +0,0 @@
-#!/bin/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$
-##
-#############################################################################
-
-# Install screenresolution and set correct resolution at boot
-
-brew install screenresolution
-
-sudo tee -a /usr/local/bin/set_resolution.sh <<"EOF"
-#!/bin/bash
-sleep 20
-/usr/local/bin/screenresolution set 1280x800x32@0
-EOF
-
-
-sudo chmod a+x /usr/local/bin/set_resolution.sh
-
-
-sudo tee -a ~/Library/LaunchAgents/screenresolution.plist <<"EOF"
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-    <dict>
-        <key>Label</key>
-        <string>org.qt.io.screenresolution</string>
-        <key>ProgramArguments</key>
-        <array>
-            <string>/usr/local/bin/set_resolution.sh</string>
-        </array>
-        <key>RunAtLoad</key>
-        <true/>
-        <key>KeepAlive</key>
-        <false/>
-        <key>LaunchOnlyOnce</key>
-        <true/>
-        <key>StandardErrorPath</key>
-        <string>/tmp/screenresolution.err</string>
-        <key>StandardOutPath</key>
-        <string>/tmp/screenresolution.out</string>
-    </dict>
-</plist>
-EOF
-
--- a/coin/provisioning/common/macos/telegraf-coin.conf
+++ b/coin/provisioning/common/macos/telegraf-coin.conf
@@ -54,4 +54,4 @@
 # Monitor I/O latency
 [[inputs.exec]]
  data_format = "influx"
-  commands = [ "/usr/local/bin/telegraf-ioping.sh /" ]
+  commands = [ "/usr/bin/telegraf-ioping.sh /" ]
--- a/coin/provisioning/common/macos/telegraf-ioping.sh
+++ b/coin/provisioning/common/macos/telegraf-ioping.sh
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Measure I/O latency once, return data in InfluxDB format
-#
-# Run one ioping command for read, and one for write.
-# Each one sends 3 requests and reports the minimum time, in nanoseconds.
-# (Because of limitations of ioping, we can't just send one request and get
-#  the number back in the batch format. Additionally, the number seems to be
-#  fluctuating quite a bit so taking the smallest number out of 3 requests is
-#  stabilising it a bit.)
-
-
-set -e
-
-[ x"$1" = x ] && echo "$0 takes a path as a first argument" && exit 1
-
-# Try to run in high priority to avoid slow-downs because of
-# factors other than I/O.
-renice  -n -10 -p $$  >/dev/null 2>&1 ||  true
-
-
-rlatency="$(/usr/local/bin/ioping -B -k -c 3 -i 0.1     "$1" | cut -d " " -f 5)"
-wlatency="$(/usr/local/bin/ioping -B -k -c 3 -i 0.1 -W  "$1" | cut -d " " -f 5)"
-
-printf "ioping,path=$1 read_latency_ns=%u,write_latency_ns=%u\n"  \
-       $rlatency  $wlatency
--- a/coin/provisioning/common/macos/telegraf_install.sh
+++ b/coin/provisioning/common/macos/telegraf_install.sh
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-#############################################################################
-##
-## Copyright (C) 2019 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-
-# This script installs telegraf and ioping and our script telegraf-ioping.sh
-# to the /usr/bin directory.
-#
-# The reasons we don't install to /usr/local/bin are:
-# 1. On SLES and RHEL, the PATH of sudo (secure_path setting in /etc/sudoers)
-#    does not include /usr/local/bin.
-# 2. On macOS /usr/local/bin does not even exist early in provisioning.
-
-
-######################## BOILERPLATE ###########################
-set -e
-
-
-PROVISIONING_DIR="$(dirname "$0")/../../"
-. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
-
-. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
-
-is_script_executed telegraf_install.sh  \
-    || fatal "Script telegraf_install.sh should be executed, not sourced"
-
-################################################################
-
-
-[ "$PROVISIONING_OS" = linux ]  \
-    && ioping_sha256=259abf04bcb84f4126ff97c04b6651e1cf5ea6d8a9ff364c769a26c95b6eeb44  \
-    || ioping_sha256=55de6a2f1a5343e0ce8df31d82d47a9e79c7e612edbc6dfb39b5fc6fb358b2e3
-DownloadURL "http://ci-files01-hki.intra.qt.io/input/ioping/ioping.${PROVISIONING_OS}-${PROVISIONING_ARCH}"  \
-    ''  "$ioping_sha256"  ioping
-/usr/bin/sudo mkdir -p /usr/local/bin/
-$CMD_INSTALL -m 755 ./ioping /usr/local/bin/
-rm -f ioping
-
-# 2. Install custom ioping monitoring script
-$CMD_INSTALL -m 755  "$PROVISIONING_DIR"/common/macos/telegraf-ioping.sh  /usr/local/bin/
-
-# 3. Download and install telegraf
-
-[ x"$PROVISIONING_OS"   = xmacos ] && os=darwin || os=linux
-[ x"$PROVISIONING_ARCH" = xx86   ] && arch=i386 || arch=amd64
-package_filename=telegraf-1.12.6_${os}_${arch}.tar.gz
-package_sha256_list="$PROVISIONING_DIR"/common/shared/telegraf/telegraf_packages.sha256.txt
-package_sha256=$(sed -n "s/.*$package_filename *//p" "$package_sha256_list")
-
-DownloadURL  \
-    http://ci-files01-hki.intra.qt.io/input/telegraf/"$package_filename"  \
-    https://dl.influxdata.com/telegraf/releases/"$package_filename"  \
-    "$package_sha256"  \
-    telegraf.tar.gz
-
-tar -xzf ./telegraf.tar.gz -C /tmp
-telegraf_binary=$(find /tmp/telegraf* -name telegraf -type f | grep /bin/ | head -1)
-$CMD_INSTALL -m 755  "$telegraf_binary"  /usr/local/bin/
-rm -rf /tmp/telegraf*
-
-# 4. Edit config file with passwords
-"$PROVISIONING_DIR"/common/unix/telegraf_password.sh
-
-# 5. Start telegraf in background (-b) and with retaining the environment (-E)
-#    in order to report as hostname = $COIN_UNIQUE_JOB_ID.
-/usr/bin/sudo -b -E telegraf --config /etc/telegraf-coin.conf >/dev/null 2>&1
-
-echo DONE: "Installed and started telegraf: $package_filename"
--- a/coin/provisioning/common/unix/install-conan.sh
+++ b/coin/provisioning/common/unix/install-conan.sh
@@ -1,8 +0,0 @@
-#!/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
-
--- a/coin/provisioning/common/unix/libclang-v100-dyn.sh
+++ b/coin/provisioning/common/unix/libclang-v100-dyn.sh
@@ -1,83 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $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$
-##
-#############################################################################
-
-# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
-# The Clang library (C-bindings), version 3.9 or higher is required for building.
-
-# This same script is used to provision libclang to Linux and macOS.
-# In case of Linux, we expect to get the values as args
-set -e
-
-# shellcheck source=./check_and_set_proxy.sh
-source "${BASH_SOURCE%/*}/check_and_set_proxy.sh"
-# shellcheck source=./SetEnvVar.sh
-source "${BASH_SOURCE%/*}/SetEnvVar.sh"
-# shellcheck source=./DownloadURL.sh
-source "${BASH_SOURCE%/*}/DownloadURL.sh"
-
-libclang_version=10.0
-
-if uname -a |grep -q Darwin; then
-    version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-mac.7z"
-    sha1="0fe1fa50b1b469d2c05acc3a3468bc93a66f1e5a"
-    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/dynamic/libclang-release_${version//\./}-based-mac.7z"
-elif test -f /etc/redhat-release || /etc/centos-release; then
-    version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
-    sha1="1d2e265502fc0832a854f989d757105833fbd179"
-    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/dynamic/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
-else
-    version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/dynamic/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
-    sha1="c1580acb3a82e193acf86f18afb52427c5e67de8"
-    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
-fi
-
-zip="/tmp/libclang.7z"
-destination="/usr/local/libclang-dynlibs-$version"
-
-DownloadURL $url_cached $url $sha1 $zip
-if command -v 7zr &> /dev/null; then
-    sudo 7zr x $zip -o/usr/local/
-else
-    sudo 7z x $zip -o/usr/local/
-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
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -47,23 +47,18 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"

-libclang_version=11.0
+libclang_version=10.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="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"
+    sha1="6e019c428511e74c5d46d0ddca79d8e804b67f8a"
 else
    version=$libclang_version
-    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"
+    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"
 fi

 zip="/tmp/libclang.7z"
--- a/coin/provisioning/common/unix/squishInstall.sh
+++ b/coin/provisioning/common/unix/squishInstall.sh
@@ -41,20 +41,19 @@ set -ex
 # This script will fetch and extract pre-buildt squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)

-version="6.7-20210318-1241"
-qtBranch="60x"
+version="6.6.1"
+qtBranch="515x"
 installFolder="/opt"
 squishFolder="$installFolder/squish"
 preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable"
-licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/515x/.squish-3-license"
+licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/.squish-3-license"
 licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a"
 if uname -a |grep -q Darwin; then
-     version="6.7-20210301-1401"
     compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz"
-     sha1="562d065ed810f03cb0dad4cf81a4fc688bc813ec"
+     sha1="9fff9a7cb037214d21f47f2cc53747885fd1f2ae"
 else
     compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz"
-     sha1="80b3f36e760963a6989a49c79818bf8671d1932a"
+     sha1="3a50052caafa3ca583b7edf754227999d7185ffa"
 fi

 mountFolder="/tmp/squish"
@@ -78,11 +77,7 @@ fi
 targetFileMount="$mountFolder"/"$compressedFolder"

 echo "Mounting $preBuildCacheUrl to $mountFolder"
-if uname -a |grep -q Darwin; then
-   sudo mount -o locallocks "$preBuildCacheUrl" "$mountFolder"
-else
-   sudo mount "$preBuildCacheUrl" "$mountFolder"
-fi
+sudo mount "$preBuildCacheUrl" "$mountFolder"
 echo "Create $installFolder if needed"
 if [ !  -d "$installFolder" ]; then
    sudo mkdir "$installFolder"
@@ -101,8 +96,7 @@ sudo mv "$installFolder/rta_squish_$version" "$squishFolder"
 if uname -a |grep -q "Ubuntu"; then
    if [ ! -e "/usr/lib/tcl8.6" ]; then
        sudo mkdir /usr/lib/tcl8.6
-        #this needs to be copied only to squish_for_qt6
-        sudo cp "$squishFolder/squish_for_qt6/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
+        sudo cp "$squishFolder/squish_for_qt/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
    fi
 fi

@@ -114,27 +108,18 @@ sudo chown qt:$usersGroup "$HOME/.squish-3-license"

 echo "Set commands for environment variables in .bashrc"
 if uname -a |grep -q "Ubuntu"; then
-    echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.profile
-    echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.profile
+    echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.profile
+    echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.profile
 else
-    echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.bashrc
-    echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.bashrc
+    echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc
+    echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc
 fi

-echo "Verifying Squish, available installations:"
-ls -la $squishFolder
-
-if "$squishFolder/squish_for_qt5/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
-  echo "Squish for Qt5 installation tested successfully"
+echo "Verifying Squish"
+if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
+    echo "Squish for Qt installation tested successfully"
 else
-  echo "Squish for Qt5 test failed! Package wasn't installed correctly."
-  exit 1
-fi
-if "$squishFolder/squish_for_qt6/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
-  echo "Squish for Qt6 installation tested successfully"
-else
-  echo "Squish for Qt6 test failed! Package wasn't installed correctly."
-  exit 1
+    echo "Squish for Qt test failed! Package wasn't installed correctly."
+    exit 1
 fi

-
--- a/coin/provisioning/common/windows/3dstudio_3rdparty.ps1
+++ b/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 "$zip"
+Remove-Item -Path $zip

 Set-EnvironmentVariable "QT3DSTUDIO_3RDPARTY_DIR" "C:/Utils/Qt3DStudio3rdparty"
--- a/coin/provisioning/common/windows/android-openssl.ps1
+++ b/coin/provisioning/common/windows/android-openssl.ps1
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -47,55 +47,45 @@ if (Is64BitWinHost) {

 $version = "1.1.1g"
 $zip = Get-DownloadLocation ("openssl-$version.tar.gz")
-$prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip")
 $sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997"
-$prebuilt_sha1 = "d799f54e402c00eaa2633d54df1e8295bfac3d7b"
 $destination = "C:\Utils\openssl-android-master"
-$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip"

 # msys unix style paths
-$ndkPath = "/c/Utils/Android/android-ndk-r22b"
+$ndkPath = "/c/Utils/Android/android-ndk-r21d"
 $openssl_path = "/c/Utils/openssl-android-master"
 $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin"
-if ((Test-Path $prebuilt_url)) {
-    Download $prebuilt_url $prebuilt_url $prebuilt_zip
-    Verify-Checksum $prebuilt_zip $prebuilt_sha1
-    Extract-7Zip $prebuilt_zip C:\Utils
-    Remove $prebuilt_zip
-} else {
-    Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
-    Verify-Checksum $zip $sha1
+Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
+Verify-Checksum $zip $sha1

-    Extract-7Zip $zip C:\Utils\tmp
-    Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp
-    Move-Item C:\Utils\tmp\openssl-${version} $destination
-    Remove "$zip"
+Extract-7Zip $zip C:\Utils\tmp
+Extract-7Zip C:\Utils\tmp\openssl-$version.tar C:\Utils\tmp
+Move-Item C:\Utils\tmp\openssl-${version} $destination
+Remove-Item -Path $zip

-    Write-Host "Configuring OpenSSL $version for Android..."
-    Push-Location $destination
-    # $ must be escaped in powershell...
+Write-Host "Configuring OpenSSL $version for Android..."
+Push-Location $destination
+# $ must be escaped in powershell...

-    function CheckExitCode {
+function CheckExitCode {

-        param (
-            $p
-        )
+    param (
+        $p
+    )

-        if ($p.ExitCode) {
-            Write-host "Process failed with exit code: $($p.ExitCode)"
-            exit 1
-        }
+    if ($p.ExitCode) {
+        Write-host "Process failed with exit code: $($p.ExitCode)"
+        exit 1
    }
-
-    $configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
-    CheckExitCode $configure
-
-    $make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"")
-    CheckExitCode $make
-
-    Pop-Location
-    Remove-item C:\Utils\tmp -Recurse -Confirm:$false
 }

+$configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"")
+CheckExitCode $configure
+
+$make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_HOME=$ndkPath PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"")
+CheckExitCode $make
+
+Pop-Location
+
 Set-EnvironmentVariable "OPENSSL_ANDROID_HOME" "$destination"
+Remove-item C:\Utils\tmp -Recurse -Confirm:$false
 Write-Output "Android OpenSSL = $version" >> ~/versions.txt
--- a/coin/provisioning/common/windows/android.ps1
+++ b/coin/provisioning/common/windows/android.ps1
@@ -40,10 +40,10 @@
 # That's why we need to use Andoid-21 API version in Qt 5.9.

 # NDK
-$ndkVersion = "r22b"
+$ndkVersion = "r21d"
 $ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86_64.zip"
 $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86_64.zip"
-$ndkChecksum = "96ba1a049303cf6bf3ee84cfd64d6bcd43486a50"
+$ndkChecksum = "99175ce1210258f2280568cd340e0666c69955c7"
 $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion"
 $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"

--- a/coin/provisioning/common/windows/cmake.ps1
+++ b/coin/provisioning/common/windows/cmake.ps1
@@ -34,17 +34,17 @@
 . "$PSScriptRoot\helpers.ps1"

 $majorminorversion = "3.19"
-$version = "3.19.2"
+$version = "3.19.0"

 $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip")
 $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip"
 $cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip"

 Write-Host "Removing old cmake"
-Remove "C:\CMake"
+Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue

 Download $officialurl $cachedurl $zip
-Verify-Checksum $zip "5e42a287610a619c3a150376d9aaad31282cdcd4"
+Verify-Checksum $zip "fac77ed3eca52168b15c30979ee43310a3cb968e"

 Extract-7Zip $zip C:
 $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"
--- a/coin/provisioning/common/windows/disable-netadapterlso.ps1
+++ b/coin/provisioning/common/windows/disable-netadapterlso.ps1
@@ -1,3 +1,2 @@
-Get-NetAdapter | Disable-NetAdapterLso
+Disable-NetAdapterLso Ethernet
 Start-Sleep -s 15  # Give windows some time to adjust network settings
-Get-NetAdapter
--- a/coin/provisioning/common/windows/dxsdk.ps1
+++ b/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 "$package_path"
+Remove-Item -Path $package_path

 Write-Output "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt
--- a/coin/provisioning/common/windows/install-azure-tool.ps1
+++ b/coin/provisioning/common/windows/install-azure-tool.ps1
@@ -1,40 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2020 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-. "$PSScriptRoot\helpers.ps1"
-
-# This script will install Azure singtool using Dotnet SDK
-$dotnet = "C:\Program Files\dotnet\dotnet.exe"
-
-$version = "2.0.17"
-Run-Executable "$dotnet" "tool install --global AzureSignTool --version $version"
-
--- a/coin/provisioning/common/windows/install-breakpad.ps1
+++ b/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 "$targetBreakpad"
+    Remove-Item -Path $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 "$targetSyscall"
+    Remove-Item -Path $targetSyscall
 }
 catch {
    Write-Host "Cached download failed: Attempping fallback method eg git."
--- a/coin/provisioning/common/windows/install-dependencywalker.ps1
+++ b/coin/provisioning/common/windows/install-dependencywalker.ps1
@@ -57,6 +57,6 @@ Verify-Checksum $dependsPackage $sha1
 Extract-7Zip $dependsPackage $TARGETDIR

 Write-Host "Cleaning $dependsPackage.."
-Remove "$dependsPackage"
+Remove-Item -Recurse -Force -Path "$dependsPackage"

 Write-Output "Dependency Walker = $version" >> ~\versions.txt
--- a/coin/provisioning/common/windows/install-dotnet.ps1
+++ b/coin/provisioning/common/windows/install-dotnet.ps1
@@ -1,59 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2020 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-. "$PSScriptRoot\helpers.ps1"
-
-# This script will install Dotnet SDK which is required for Azure installation
-
-$version = "2.1"
-if (Is64BitWinHost) {
-    $urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x64.exe"
-    $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/c980b6fb-e570-4c73-b344-e4dae6573777/f844ac1a4c6ea5de7227a701786126fd/dotnet-sdk-2.1.809-win-x64.exe"
-    $sha1 = "343e80c2ab558a30696dbe03ad2288bf435d5cd8"
-} else {
-    $urlCache = "http://ci-files01-hki.intra.qt.io/input/windows/dotnet-sdk-2.1.809-win-x86.exe"
-    $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/cf86a2f3-f6b2-4959-8e41-cf84b0d2f294/a61e834f56abe2dc2e12599e1a60c10b/dotnet-sdk-2.1.809-win-x86.exe"
-    $sha1 = "b38a4e1392f17aed110508a1687f1c65b9d86161"
-}
-$installer = "C:\Windows\Temp\dotnet-sdk-$version.exe"
-
-Write-Host "Installing Dotnet SDK $version"
-Download $urlOfficial $urlCache $installer
-Verify-Checksum $installer $sha1
-Run-Executable "$installer" "/install /passive"
-Prepend-Path "C:\Program Files\dotnet"
-Remove $installer
-
-Write-Output "Dotnet SDK = $version" >> ~/versions.txt
-
-
-
--- a/coin/provisioning/common/windows/install-mingw.ps1
+++ b/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 "$mingwPackage"
+    Remove-Item -Recurse -Force -Path "$mingwPackage"

    Write-Output "MinGW = $version $release" >> ~\versions.txt

--- a/coin/provisioning/common/windows/install-msys2.ps1
+++ b/coin/provisioning/common/windows/install-msys2.ps1
@@ -77,6 +77,6 @@ if ((Test-Path $url_cache_prebuilt)) {
 }

 Write-Host "Cleaning $PackagePath.."
-Remove "$PackagePath"
+Remove-Item -Recurse -Force -Path "$PackagePath"

 Write-Output "msys2 = $version" >> ~\versions.txt
--- a/coin/provisioning/common/windows/install-notepad++.ps1
+++ b/coin/provisioning/common/windows/install-notepad++.ps1
@@ -52,7 +52,7 @@ Verify-Checksum $nppPackage $sha1
 Run-Executable "$nppPackage" "/S"

 Write-Host "Cleaning $nppPackage.."
-Remove "$nppPackage"
+Remove-Item -Recurse -Force -Path "$nppPackage"

 Write-Output "Notepad++ = $version" >> ~\versions.txt

--- a/coin/provisioning/common/windows/install-protobuf.ps1
+++ b/coin/provisioning/common/windows/install-protobuf.ps1
@@ -57,7 +57,7 @@ if(![System.IO.File]::Exists("$installationFolder\bin\protoc.exe")){
    exit 1
 }

-Remove "$zip"
+Remove-Item "$zip"

 Add-Path "$installationFolder\bin"
 Set-EnvironmentVariable PROTOBUF_INCLUDE "$installationFolder\include"
--- a/coin/provisioning/common/windows/install-ruby.ps1
+++ b/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 "$rubyPackage"
+Remove-Item -Recurse -Force -Path "$rubyPackage"

 Write-Output "Ruby = $version" >> ~\versions.txt
--- a/coin/provisioning/common/windows/install-sccache.ps1
+++ b/coin/provisioning/common/windows/install-sccache.ps1
@@ -35,8 +35,8 @@

 param(
    [string]$arch="x86_64-pc-windows-msvc",
-    [string]$version="0.2.14",
-    [string]$sha1="bbdceb59d6fd7b6a3af02fb36f65c8bf324757b0"
+    [string]$version="0.2.13-alpha-0",
+    [string]$sha1="39ee0b0b98aa20c54a75ba1cb3116ea694e83c38"
 )

 . "$PSScriptRoot\helpers.ps1"
--- a/coin/provisioning/common/windows/install-sevenzip.ps1
+++ b/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 "$7zPackage"
+Remove-Item -Recurse -Force -Path "$7zPackage"

 Add-Path $7zTargetLocation

--- a/coin/provisioning/common/windows/install-strawberry-perl.ps1
+++ b/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 "$strawberryPackage"
+Remove-Item -Recurse -Force -Path "$strawberryPackage"

 Write-Output "strawberry = $version" >> ~\versions.txt
--- a/coin/provisioning/common/windows/libclang-v100-dyn.ps1
+++ b/coin/provisioning/common/windows/libclang-v100-dyn.ps1
@@ -1,50 +0,0 @@
-param(
-    [Int32]$archVer=32,
-    [string]$toolchain="vs2019",
-    [bool]$setDefault=$true
-)
-. "$PSScriptRoot\helpers.ps1"
-
-$libclang_version="10.0"
-Write-Output "libClang for QtForPython = $libclang_version" >> ~/versions.txt
-
-# PySide versions following Qt6 use a C++ parser based on Clang (http://clang.org/).
-# The Clang library (C-bindings), version 8.0 or higher is required for building.
-
-# Starting from Qt 5.11 QDoc requires Clang to parse C++
-
-$baseDestination = "C:\Utils\libclang-" + $libclang_version + "-dynlibs-" + $toolchain
-$libclang_version = $libclang_version -replace '["."]'
-
-function install() {
-
-    param(
-        [string]$sha1=$1,
-        [string]$destination=$2
-    )
-
-    $zip = "c:\users\qt\downloads\libclang-dyn.7z"
-
-    $script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z"
-    $script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/dynamic/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z"
-
-    Download $OfficialUrl $CachedUrl $zip
-    Verify-Checksum $zip $sha1
-    Extract-7Zip $zip C:\Utils\
-    Rename-Item C:\Utils\libclang $destination
-    Remove-Item -Force -Path $zip
-}
-
-if ( $toolchain -eq "vs2019" ) {
-    if ( $archVer -eq 64 ) {
-        $sha1 = "B2C4F24B2388AEBAA6B8FCE3AE4E63D34D1517FE"
-    }
-    else {
-        $sha1 = "b970f51df255a27e0fdb7b665e70ed5281257f40"
-    }
-}
-
-install $sha1 $baseDestination-$archVer
-
-Set-EnvironmentVariable "LLVM_DYNAMIC_LIBS_100" ($baseDestination + "-_ARCH_")
-
--- a/coin/provisioning/common/windows/libclang.ps1
+++ b/coin/provisioning/common/windows/libclang.ps1
@@ -5,7 +5,7 @@ param(
 )
 . "$PSScriptRoot\helpers.ps1"

-$libclang_version="11.0"
+$libclang_version="10.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 "$zip"
+    Remove-Item -Force -Path $zip
 }

 $toolchainSuffix = ""

 if ( $toolchain -eq "vs2019" ) {
    if ( $archVer -eq 64 ) {
-        $sha1 = "ff0a30c881691068c14fbed9239b3583c8c45c6a"
+        $sha1 = "6e1b3e6d38803a3bf088e521f4f4feb1ca44bac3"
    }
    else {
-        $sha1 = ""
+        $sha1 = "36fcdc3155eef3636d99ed591f12e73d7a9a2e0c"
    }
    $toolchainSuffix = "msvc"
 }

 if ( $toolchain -eq "mingw" ) {
    if ( $archVer -eq 64 ) {
-        $sha1 = "40141a788b1ccb615544e18da27cd95b4986217b"
+        $sha1 = "34daf2324d190de49f8e4005afeb39a7d70c5842"
    }
    else {
-        $sha1 = ""
+        $sha1 = "3d7c809ab12c9293df8ffd9343cee68f184c8612"
    }
    $toolchainSuffix = "mingw"
 }
@@ -64,7 +64,7 @@ if ( $setDefault ) {
 }
 Set-EnvironmentVariable ("LLVM_INSTALL_DIR_${toolchainSuffix}") ($baseDestination + "-$archVer")

-if ( $libclang_version -eq "110" ) {
+if ( $libclang_version -eq "100" ) {
    # This is a hacked static build of libclang which requires special
    # handling on the qdoc side.
    Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1"
--- a/coin/provisioning/common/windows/mesa_llvmpipe.ps1
+++ b/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 "$package"
+    Remove-Item -Path $package
 }

 if (Is64BitWinHost) {
--- a/coin/provisioning/common/windows/mqtt_broker.ps1
+++ b/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 "$zip"
+Remove-Item -Path $zip

 Set-EnvironmentVariable "MQTT_TEST_BROKER_LOCATION" "C:\Utils\paho.mqtt.testing-$commitSHA\interoperability\startbroker.py"
--- a/coin/provisioning/common/windows/msvc-2013-update5.ps1
+++ b/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 "$package"
+Remove-Item $package

 Write-Output "Visual Studio = $version" >> ~\versions.txt
--- a/coin/provisioning/common/windows/msys.ps1
+++ b/coin/provisioning/common/windows/msys.ps1
@@ -11,6 +11,6 @@ $destination = "C:\msys"

 Download $url $url $zip
 Verify-Checksum $zip $sha1
-Extract-7Zip $zip C:\
+C:\Utils\sevenzip\7z.exe x $zip -oC:\
 Set-EnvironmentVariable "MSYS_PATH" "$destination\\1.0\\bin"
 Write-Output "Msys = $version" >> ~/versions.txt
--- a/coin/provisioning/common/windows/mysql.ps1
+++ b/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 "$package"
+    Remove-Item -Path $package
 }

 if (Is64BitWinHost) {
--- a/coin/provisioning/common/windows/ninja.ps1
+++ b/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 "$zip"
+Remove-Item -Path $zip

 Add-Path "C:\Utils\Ninja"

--- a/coin/provisioning/common/windows/nodejs.ps1
+++ b/coin/provisioning/common/windows/nodejs.ps1
@@ -37,25 +37,25 @@
 # Needed by QtWebengine

 $version = "12.18.0"
-if (Is64BitWinHost) {
-    $arch = "x64"
+$package = "C:\Windows\temp\nodejs-$version.zip"
+$targetFolder = "C:\Utils\nodejs"
+$arch = "$((Get-WmiObject Win32_Processor).AddressWidth)"
+$externalUrl = "https://nodejs.org/dist/v$version/node-v$version-win-x$arch.zip"
+$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/node-v$version-win-x$arch.zip"
+
+if ( $arch -eq 64 ) {
    $sha1 = "457b1527d249ee471a9445953a906cb10c75378d"
 } else {
-    $arch = "x86"
    $sha1 = "58801900f5bddca9c00feed6b84fed729426fc92"
-}

-$package = "C:\Windows\temp\nodejs-$version.zip"
-$targetFolder = "C:\Utils"
-$installFolder = "C:\Utils\node-v$version-win-$arch"
-$externalUrl = "https://nodejs.org/dist/v$version/node-v$version-win-$arch.zip"
-$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/node-v$version-win-$arch.zip"
+}

 Write-Host "Installing Node.js"
 Download $externalUrl $internalUrl $package
 Verify-Checksum $package $sha1
+mkdir $targetFolder
 Extract-7Zip $package $targetFolder
-Add-Path $installFolder
+Add-Path $targetFolder
 Remove $package

 Write-Output "Node.js = $version" >> ~/versions.txt
--- a/coin/provisioning/common/windows/opcua_unifiedautomation.ps1
+++ b/coin/provisioning/common/windows/opcua_unifiedautomation.ps1
@@ -53,7 +53,7 @@ function DownloadAndInstallUA

    Write-Host "UACPPSDK: Extracting $zip..."
    Extract-7Zip $zip (Get-DefaultDownloadLocation)
-    Remove "$zip"
+    Remove-Item -Path $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 "$executable"
+    Remove-Item $executable
 }

 #x86 version
--- a/coin/provisioning/common/windows/openssl.ps1
+++ b/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 "$packagex64"
+    Remove-Item -Path $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 "$packagex86"
+Remove-Item -Path $packagex86

 Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\bin\openssl.cfg"
 Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include"
--- a/coin/provisioning/common/windows/postgresql.ps1
+++ b/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 $packagex64
+    Remove-Item -Path $packagex64
    # Remove pthread.h file so it won't be used in mingw builds (QTBUG-79555)
-    Remove "$installFolder\pgsql\include\pthread.h"
-    Remove "$installFolder\pgsql\include\unistd.h"
+    Remove-item -Path "$installFolder\pgsql\include\pthread.h"
+    Remove-item -Path "$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 $packagex86
+Remove-Item -Path $packagex86
 # Remove pthread.h file so it won't be used in mingw builds (QTBUG-79555)
-Remove "$installFolder\pgsql\include\pthread.h"
-Remove "$installFolder\pgsql\include\unistd.h"
+Remove-item -Path "$installFolder\pgsql\include\pthread.h"
+Remove-item -Path "$installFolder\pgsql\include\unistd.h"

 Set-EnvironmentVariable "POSTGRESQL_INCLUDE_x86" "$installFolder\pgsql\include"
 Set-EnvironmentVariable "POSTGRESQL_LIB_x86" "$installFolder\pgsql\lib"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Qt Submodule Update Bot	4e43ed1f93	Update submodules on '6.0.0' in qt/qt5 Change-Id: Ib34b5ed1199121b5050367868c5349941c360a71 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-12-08 15:42:58 +02:00
Qt Submodule Update Bot	967da52b1c	Update submodules on '6.0.0' in qt/qt5 Change-Id: I73fc23f5c510bb104e5705dad19e18bd7a1b8466 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-12-08 05:36:14 +02:00
Qt Submodule Update Bot	78410d7e8b	Update submodules on '6.0.0' in qt/qt5 Change-Id: Id0ba767da51533b5e7682bf7d15f1936b34ef067 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2020-12-05 05:25:35 +00:00
Qt Submodule Update Bot	4fce413129	Update submodules on '6.0.0' in qt/qt5 Change-Id: Ib646e5d8e700db8f8c20eaddc23544d250494014 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-12-04 16:13:13 +02:00
Qt Submodule Update Bot	44038b3013	Update submodules on '6.0.0' in qt/qt5 Change-Id: If507fcffdc24ba4b76171e0893b1cf3dfdcdbd20 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-12-02 08:39:00 +02:00
Qt Submodule Update Bot	c3589e86f9	Update submodules on '6.0.0' in qt/qt5 Change-Id: I543de9da44047d81a4f6e4d6d5de47ba79187036 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-12-01 17:23:22 +02:00
Qt Submodule Update Bot	0265978b8f	Update submodules on '6.0.0' in qt/qt5 Change-Id: I5ba552975fe99090eb87c56e4a9c4e0fadd95e78 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-12-01 07:36:07 +02:00
Simo Fält	32d8d76755	Add platform configs for Pyside-setup While default.txt contains configs with UseLegacyInstructions it can't be used by pyside-setup, while it falls back to COIN's legacy module class. Pick-to: 6.0 Pick-to: dev Change-Id: I5d2856344b817f6085ba66643f47803ccee29b06 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2020-11-30 20:50:20 +02:00
Qt Submodule Update Bot	22b5b2915f	Update submodules on '6.0.0' in qt/qt5 Change-Id: Ibbe5ef3da6845a69dda7474e38bbe4ba7cb13bf4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-11-30 18:40:15 +02:00
Qt Submodule Update Bot	ae6a9f6c9d	Update submodules on '6.0.0' in qt/qt5 Change-Id: Ia9577887bba72d5cd92f322ec843e99b8c9daf1f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2020-11-27 12:04:20 +02:00
Toni Saario	0848b04307	Add upload for the documentation artifact The upload for the documentation was missing. Pick-to: 6.0 Pick-to: dev Change-Id: I9f1df81ecee3bbf6dd1128d24ae4fd2717bb3dcb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>	2020-11-27 10:03:39 +00:00
Qt Submodule Update Bot	2a036a7594	Update submodules on '6.0.0' in qt/qt5 Change-Id: Ia0ce3a76059380e2caaf7ef9052b29f6d79dce26 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2020-11-24 21:27:20 +02:00
Joerg Bornemann	87269f4353	CMake: Adapt to new QT_BUILD_TESTS variable Pick-to: dev 6.0 Change-Id: Ib35e164a8628ffc7d1429ba4756a27d4b98977e2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>	2020-11-24 11:46:36 +01:00
Qt Submodule Update Bot	3b38bcd815	Update submodules on '6.0.0' in qt/qt5 Change-Id: I5ba81437528081a2879b7ae8d3de0802818fbe0d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2020-11-24 12:46:31 +02:00
Alexandru Croitor	88272f607c	CMake: Update provisioned CMake to version 3.19.0 Change-Id: I9c5be93146882d5593bbe46811a653d6b2a88aee Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit `6b46bc3b7b`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2020-11-20 20:09:49 +00:00
Jani Heikkinen	59bab92561	Adjust submodule branches Change-Id: Iccda1dd392e64f8bc4fa0dc66ef964c36312e26a	2020-11-20 11:24:35 +02:00