Add targets for qtsaferenderer

Task-number: COIN-619 Change-Id: I928f297001d0cb0a9870cb81b78e927512fa19aa Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Update submodules on '5.15.2' in qt/qt5
2025-12-29 19:35:37 +08:00 · 2020-11-18 11:23:45 +02:00 · 2020-11-12 09:11:49 +00:00 · 2020-11-10 10:35:45 +00:00 · 2020-10-27 07:31:20 +02:00 · 2020-10-24 23:45:48 +02:00
485 changed files with 28799 additions and 2380 deletions
--- a/.commit-template
+++ b/.commit-template
@@ -17,10 +17,6 @@
 #Task-number: 
 #Coverity-Id: 
 #
-# Add a space-separated list of target branches that the change should
-# be cherry-picked to automatically.
-#Pick-to: 
-#
 # ==[ Please wrap at 72 characters ]===================================|
 #
 # Remember to read http://wiki.qt.io/Commit_Policy
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,53 +1,60 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.0.0
+	branch = 5.15.2
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.0.0
+	branch = 5.15.2
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.0.0
+	branch = 5.15.2
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
+[submodule "qtscript"]
+	depends = qtbase
+	recommends = qttools
+	path = qtscript
+	url = ../qtscript.git
+	branch = 5.15.2
+	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.0.0
+	branch = 5.15.2
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = deprecated
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.0.0
+	branch = 5.15.2
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +62,7 @@
 	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.0.0
+	branch = 5.15.2
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -68,7 +75,7 @@
 	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
-	branch = dev
+	branch = master
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
@@ -76,15 +83,15 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -116,100 +123,100 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.0.0
+	branch = 5.15.2
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
-	recommends = qtdeclarative qtshadertools
+	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = essential
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
@@ -222,110 +229,98 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtquickcontrols2"]
-	depends = qtdeclarative
-	recommends = qtimageformats qtgraphicaleffects
+	depends = qtgraphicaleffects
+	recommends = qtimageformats
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 6.0.0
+	branch = 5.15.2
 	status = essential
 [submodule "qtpurchasing"]
 	depends = qtbase
 	recommends = qtdeclarative qtandroidextras
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = dev
-	status = ignore
+	branch = 5.15.2
+	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.0.0
+	branch = 5.15.2
 	status = addon
 [submodule "qtquick3d"]
-	depends = qtbase qtdeclarative qtshadertools
+	depends = qtbase qtdeclarative
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.0.0
+	branch = 5.15.2
 	status = addon
-[submodule "qtshadertools"]
-	depends = qtbase
-	path = qtshadertools
-	url = ../qtshadertools.git
-	branch = 6.0.0
-	status = addon
-[submodule "qt5compat"]
-	depends = qtbase
-	path = qt5compat
-	url = ../qt5compat.git
-	branch = 6.0.0
-	status = deprecated
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,89 +0,0 @@
-set(__qt6_qtbase_src_path "${CMAKE_CURRENT_SOURCE_DIR}/qtbase")
-
-include("${__qt6_qtbase_src_path}/.cmake.conf")
-include("${__qt6_qtbase_src_path}/cmake/QtCMakeVersionHelpers.cmake")
-qt_internal_check_for_suitable_cmake_version()
-qt_internal_get_computed_minimum_cmake_version(__qt_minimum_cmake_version)
-cmake_minimum_required(VERSION ${__qt_minimum_cmake_version})
-
-include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")
-
-project(Qt
-    VERSION 6.0.0
-    DESCRIPTION "Qt Libraries"
-    HOMEPAGE_URL "https://qt.io/"
-    LANGUAGES CXX C ASM
-)
-
-# Required so we can call ctest from the root build directory
-enable_testing()
-
-set(qt_module_prop_prefix "__qt_prop_")
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-if (NOT QT_BUILD_STANDALONE_TESTS)
-    list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake")
-    list(APPEND CMAKE_MODULE_PATH
-        "${__qt6_qtbase_src_path}/cmake/3rdparty/extra-cmake-modules/find-modules")
-    list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake/3rdparty/kwin")
-endif()
-
-include("QtTopLevelHelpers")
-include(ECMOptionalAddSubdirectory)
-
-# Also make sure the CMake config files do not recreate the already-existing targets
-if (NOT QT_BUILD_STANDALONE_TESTS)
-    set(QT_NO_CREATE_TARGETS TRUE)
-endif()
-set(QT_SUPERBUILD TRUE)
-
-# Get submodule list if not already defined
-if (NOT BUILD_SUBMODULES)
-    qt_internal_find_modules(BUILD_SUBMODULES)
-endif()
-
-set(qt_module_dependency_map_prefix "__qt_module_dependencies_")
-qt_internal_sort_module_dependencies("${BUILD_SUBMODULES}" BUILD_SUBMODULES
-                                     "${qt_module_dependency_map_prefix}")
-
-foreach(module IN LISTS BUILD_SUBMODULES)
-    # Check for unmet dependencies
-    if(NOT DEFINED BUILD_${module} OR BUILD_${module})
-        message(NOTICE "Check dependencies of '${module}'")
-        foreach(dep IN LISTS "${qt_module_dependency_map_prefix}${module}")
-            if (dep STREQUAL "qtbase")
-                # Always available skip
-                continue()
-            endif()
-            if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${dep}/CMakeLists.txt")
-                message(FATAL_ERROR "Module '${module}' depends on '${dep}', but ${dep}'s \
-                CMakeLists.txt couldn't be found.\nNote: Use '-skip ${module}' to exclude it \
-                from build.\n")
-            endif()
-            if(DEFINED BUILD_${dep} AND NOT BUILD_${dep})
-                message(FATAL_ERROR "Module '${module}' depends on '${dep}', but '${dep}' \
-                will not be built.\nNote: Use '-skip ${module}' to exclude it from build.\n")
-            endif()
-        endforeach()
-    endif()
-endforeach()
-
-foreach(module IN LISTS BUILD_SUBMODULES)
-    message(NOTICE "Configuring '${module}'")
-    ecm_optional_add_subdirectory("${module}")
-
-    if(module STREQUAL "qtbase")
-        if (NOT QT_BUILD_STANDALONE_TESTS)
-            list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/lib/cmake")
-            list(APPEND CMAKE_FIND_ROOT_PATH "${QtBase_BINARY_DIR}")
-        endif()
-    endif()
-endforeach()
-
-if(NOT QT_BUILD_STANDALONE_TESTS)
-    # Display a summary of everything
-    include(QtBuildInformation)
-    include(QtPlatformSupport)
-    qt_print_feature_summary()
-    qt_print_build_instructions()
-endif()
--- a/3
+++ b/3
@@ -59,9 +59,6 @@ ContinuationIndentWidth: 8
 # No indentation for namespaces.
 NamespaceIndentation: None

-# Allow indentation for preprocessing directives (if/ifdef/endif). https://reviews.llvm.org/rL312125
-IndentPPDirectives: AfterHash
-
 # Horizontally align arguments after an open bracket.
 # The coding style does not specify the following, but this is what gives
 # results closest to the existing code.
--- a/cmake/ECMOptionalAddSubdirectory.cmake
+++ b/cmake/ECMOptionalAddSubdirectory.cmake
@@ -1,73 +0,0 @@
-#.rst:
-# ECMOptionalAddSubdirectory
-# --------------------------
-#
-# Make subdirectories optional.
-#
-# ::
-#
-#   ecm_optional_add_subdirectory(<dir>)
-#
-# This behaves like add_subdirectory(), except that it does not complain if the
-# directory does not exist.  Additionally, if the directory does exist, it
-# creates an option to allow the user to skip it. The option will be named
-# BUILD_<dir>.
-#
-# This is useful for "meta-projects" that combine several mostly-independent
-# sub-projects.
-#
-# If the CMake variable DISABLE_ALL_OPTIONAL_SUBDIRECTORIES is set to TRUE for
-# the first CMake run on the project, all optional subdirectories will be
-# disabled by default (but can of course be enabled via the respective options).
-# For example, the following will disable all optional subdirectories except the
-# one named "foo":
-#
-# .. code-block:: sh
-#
-#   cmake -DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE -DBUILD_foo=TRUE myproject
-#
-# Since pre-1.0.0.
-
-#=============================================================================
-# Copyright 2007 Alexander Neundorf <neundorf@kde.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-function(ECM_OPTIONAL_ADD_SUBDIRECTORY _dir)
-  get_filename_component(_fullPath ${_dir} ABSOLUTE)
-  if(EXISTS ${_fullPath}/CMakeLists.txt)
-    if(DISABLE_ALL_OPTIONAL_SUBDIRECTORIES)
-      set(_DEFAULT_OPTION_VALUE FALSE)
-    else()
-      set(_DEFAULT_OPTION_VALUE TRUE)
-    endif()
-    if(DISABLE_ALL_OPTIONAL_SUBDIRS  AND NOT DEFINED  BUILD_${_dir})
-      set(_DEFAULT_OPTION_VALUE FALSE)
-    endif()
-    option(BUILD_${_dir} "Build directory ${_dir}" ${_DEFAULT_OPTION_VALUE})
-    if(BUILD_${_dir})
-      add_subdirectory(${_dir})
-    endif()
-  endif()
-endfunction()
--- a/cmake/QtSynchronizeRepo.cmake
+++ b/cmake/QtSynchronizeRepo.cmake
@@ -1,3 +0,0 @@
-include(cmake/QtTopLevelHelpers.cmake)
-
-qt_internal_sync_to(${SYNC_TO_MODULE} ${SYNC_TO_BRANCH})
--- a/cmake/QtTopLevelHelpers.cmake
+++ b/cmake/QtTopLevelHelpers.cmake
@@ -1,282 +0,0 @@
-# Populates $out_module_list with all subdirectories that have a CMakeLists.txt file
-function(qt_internal_find_modules out_module_list)
-    set(module_list "")
-    file(GLOB directories LIST_DIRECTORIES true RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *)
-    foreach(directory IN LISTS directories)
-        if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${directory}"
-           AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${directory}/CMakeLists.txt")
-            list(APPEND module_list "${directory}")
-        endif()
-    endforeach()
-    message(DEBUG "qt_internal_find_modules: ${module_list}")
-    set(${out_module_list} "${module_list}" PARENT_SCOPE)
-endfunction()
-
-# poor man's yaml parser, populating $out_dependencies with all dependencies
-# in the $depends_file
-# Each entry will be in the format dependency/sha1
-function(qt_internal_parse_dependencies depends_file out_dependencies)
-    file(STRINGS "${depends_file}" lines)
-    set(dependencies "")
-    set(dependency "")
-    foreach(line IN LISTS lines)
-        if(line STREQUAL "dependencies:")
-            set(found_dependencies 1)
-        elseif(found_dependencies)
-            if(line MATCHES "^    ref: (.*)$")
-                set(revision "${CMAKE_MATCH_1}")
-                list(APPEND dependencies ${dependency}/${revision})
-                set(dependency "")
-            elseif (line MATCHES "^  (.*):$")
-                if(dependency)
-                    message(FATAL_ERROR "Format error in ${depends_file} - ${dependency} does not specify revision!")
-                endif()
-                set(dependency "${CMAKE_MATCH_1}")
-                # dependencies are specified with relative path to this module
-                string(REPLACE "../" "" dependency ${dependency})
-            endif()
-        endif()
-    endforeach()
-    message(DEBUG "qt_internal_parse_dependencies for ${depends_file}: ${dependencies} ${revisions}")
-    set(${out_dependencies} "${dependencies}" PARENT_SCOPE)
-endfunction()
-
-# Load $module and populate $out_ordered with the submodules based on their dependencies
-# $ordered carries already sorted dependencies; $out_has_dependencies is left empty
-# if there are no dependencies, otherwise set to 1; Save list of dependencies for $module into
-# $out_module_dependencies. List may contain duplicates, since function checks max depth
-# dependencies.
-# Function calls itself recursively if a dependency is found that is not yet in $ordered.
-function(qt_internal_add_module_dependencies module ordered out_ordered out_has_dependencies
-                                             out_module_dependencies out_revisions)
-    set(depends_file "${CMAKE_CURRENT_SOURCE_DIR}/${module}/dependencies.yaml")
-    if(NOT EXISTS "${depends_file}")
-        set(${out_has_dependencies} "" PARENT_SCOPE)
-        return()
-    endif()
-    set(${out_has_dependencies} "1" PARENT_SCOPE)
-    set(dependencies "")
-    qt_internal_parse_dependencies("${depends_file}" dependencies)
-    # module hasn't been seen yet, append it
-    list(FIND ordered "${module}" pindex)
-    if (pindex EQUAL -1)
-        list(LENGTH ordered pindex)
-        list(APPEND ordered "${module}")
-        list(APPEND revisions "HEAD")
-    endif()
-    set(modules_dependencies "")
-    foreach(dependency IN LISTS dependencies)
-        string(FIND "${dependency}" "/" splitindex REVERSE)
-        string(SUBSTRING "${dependency}" ${splitindex} -1 revision)
-        string(SUBSTRING "${revision}" 1 -1 revision)
-        string(SUBSTRING "${dependency}" 0 ${splitindex} dependency)
-        list(APPEND modules_dependencies "${dependency}")
-        list(FIND ordered "${dependency}" dindex)
-        if (dindex EQUAL -1)
-            # dependency hasnt' been seen yet - load it
-            list(INSERT ordered ${pindex} "${dependency}")
-            list(INSERT revisions ${pindex} "${revision}")
-            qt_internal_add_module_dependencies(${dependency} "${ordered}" ordered has_dependency
-                                                "${out_module_dependencies}" revisions)
-        elseif(dindex GREATER pindex)
-            # otherwise, make sure it is before module
-            list(REMOVE_AT ordered ${dindex})
-            list(REMOVE_AT revisions ${dindex})
-            list(INSERT ordered ${pindex} "${dependency}")
-            list(INSERT revisions ${pindex} "${revision}")
-        endif()
-    endforeach()
-    set(${out_ordered} "${ordered}" PARENT_SCOPE)
-    set(${out_module_dependencies} ${${out_module_dependencies}} ${modules_dependencies} PARENT_SCOPE)
-    set(${out_revisions} "${revisions}" PARENT_SCOPE)
-endfunction()
-
-# populates $out_all_ordered with the sequence of the modules that need
-# to be built in order to build $modules; dependencies for each module are populated
-# in variables with specified in $dependencies_map_prefix prefix
-function(qt_internal_sort_module_dependencies modules out_all_ordered dependencies_map_prefix)
-    set(ordered "")
-    foreach(module IN LISTS modules)
-        set(out_ordered "")
-        if(NOT dependencies_map_prefix)
-            message(FATAL_ERROR "dependencies_map_prefix is not provided")
-        endif()
-        set(module_dependencies_list_var_name "${dependencies_map_prefix}${module}")
-        qt_internal_add_module_dependencies(${module} "${ordered}" out_ordered module_depends
-                                            "${module_dependencies_list_var_name}" revisions)
-        set(${module_dependencies_list_var_name}
-                "${${module_dependencies_list_var_name}}" PARENT_SCOPE)
-        if(NOT module_depends)
-            list(APPEND no_dependencies "${module}")
-        endif()
-        set(ordered "${out_ordered}")
-    endforeach()
-    if (no_dependencies)
-        list(APPEND ordered "${no_dependencies}")
-    endif()
-    message(DEBUG "qt_internal_parse_dependencies sorted ${modules}: ${ordered}")
-    set(${out_all_ordered} "${ordered}" PARENT_SCOPE)
-endfunction()
-
-# does what it says, but also updates submodules
-function(qt_internal_checkout module revision)
-    message(NOTICE "Checking '${module}' out to revision '${revision}'")
-    execute_process(
-        COMMAND "git" "checkout" "${revision}"
-        WORKING_DIRECTORY "./${module}"
-        RESULT_VARIABLE git_result
-        OUTPUT_VARIABLE git_stdout
-        ERROR_VARIABLE git_stderr
-    )
-    if (VERBOSE)
-        message(NOTICE ${git_stdout})
-    endif()
-    if (git_result)
-        message(WARNING "${git_stdout}")
-        message(FATAL_ERROR "Failed to check '${module}' out to '${revision}': ${git_stderr}")
-    endif()
-    execute_process(
-        COMMAND "git" "submodule" "update"
-        WORKING_DIRECTORY "./${module}"
-        RESULT_VARIABLE git_result
-        OUTPUT_VARIABLE git_stdout
-        ERROR_VARIABLE git_stderr
-    )
-endfunction()
-
-# clones or creates a worktree for $dependency, using the source of $dependent
-function(qt_internal_get_dependency dependent dependency)
-    set(gitdir "")
-    set(remote "")
-
-    # try to read the worktree source
-    execute_process(
-        COMMAND "git" "rev-parse" "--git-dir"
-        WORKING_DIRECTORY "./${dependent}"
-        RESULT_VARIABLE git_result
-        OUTPUT_VARIABLE git_stdout
-        ERROR_VARIABLE git_stderr
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    string(FIND "${git_stdout}" "${module}" index)
-    string(SUBSTRING "${git_stdout}" 0 ${index} gitdir)
-    message(DEBUG "Will look for clones in ${gitdir}")
-
-    execute_process(
-        COMMAND "git" "remote" "get-url" "origin"
-        WORKING_DIRECTORY "./${dependent}"
-        RESULT_VARIABLE git_result
-        OUTPUT_VARIABLE git_stdout
-        ERROR_VARIABLE git_stderr
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    string(FIND "${git_stdout}" "${dependent}.git" index)
-    string(SUBSTRING "${git_stdout}" 0 ${index} remote)
-    message(DEBUG "Will clone from ${remote}")
-
-    if(EXISTS "${gitdir}${dependency}")
-        # for the module we want, there seems to be a clone parallel to what we have
-        message(DEBUG "Adding worktree for ${dependency} from ${gitdir}${dependency}")
-        execute_process(
-            COMMAND "git" "worktree" "add" "${CMAKE_CURRENT_SOURCE_DIR}/${dependency}"
-            WORKING_DIRECTORY "${gitdir}/${dependency}"
-            RESULT_VARIABLE git_result
-            OUTPUT_VARIABLE git_stdout
-            ERROR_VARIABLE git_stderr
-        )
-        if (git_result)
-            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 saame remote
-        message(DEBUG "Cloning ${dependency} from ${remote}${dependency}.git")
-        execute_process(
-            COMMAND "git" "clone" "${remote}${dependency}.git"
-            WORKING_DIRECTORY "."
-            RESULT_VARIABLE git_result
-            OUTPUT_VARIABLE git_stdout
-            ERROR_VARIABLE git_stderr
-        )
-        if (git_result)
-            message(WARNING "${git_stdout}")
-            message(FATAL_ERROR "Failed to clone '${dependency}': ${git_stderr}")
-        endif()
-    endif()
-endfunction()
-
-# evaluates the dependencies for $module, and checks all dependencies
-# out so that it is a consistent set
-function(qt_internal_sync_to module)
-    if(ARGN)
-        set(revision "${ARGV1}")
-        # special casing "." as the target module - checkout all out to $revision
-        if("${module}" STREQUAL ".")
-            qt_internal_find_modules(modules)
-            foreach(module IN LISTS modules)
-                qt_internal_checkout("${module}" "${revision}")
-            endforeach()
-            return()
-        endif()
-    else()
-        set(revision "HEAD")
-    endif()
-    qt_internal_checkout("${module}" "${revision}")
-
-    set(revision "")
-    set(checkedout "1")
-    # Load all dependencies for $module, then iterate over the dependencies in reverse order,
-    # and check out the first that isn't already at the required revision.
-    # Repeat everything (we need to reload dependencies after each checkout) until no more checkouts
-    # are done.
-    while(${checkedout})
-        set(dependencies "")
-        set(revisions "")
-        set(prefix "")
-        qt_internal_add_module_dependencies(${module} "${dependencies}" dependencies has_dependencies prefix revisions)
-        message(DEBUG "${module} dependencies: ${dependencies}")
-        message(DEBUG "${module} revisions   : ${revisions}")
-
-        if (NOT has_dependencies)
-            message(NOTICE "Module ${module} has no dependencies")
-            return()
-        endif()
-
-        list(LENGTH dependencies count)
-        math(EXPR count "${count} - 1")
-        set(checkedout 0)
-        foreach(i RANGE ${count} 0 -1 )
-            list(GET dependencies ${i} dependency)
-            list(GET revisions ${i} revision)
-            if ("${revision}" STREQUAL "HEAD")
-                message(DEBUG "Not changing checked out revision of ${dependency}")
-                continue()
-            endif()
-
-            if(NOT EXISTS "./${dependency}")
-                message(DEBUG "No worktree for '${dependency}' found in '${CMAKE_CURRENT_SOURCE_DIR}'")
-                qt_internal_get_dependency("${module}" "${dependency}")
-            endif()
-
-            execute_process(
-                COMMAND "git" "rev-parse" "HEAD"
-                WORKING_DIRECTORY "./${dependency}"
-                RESULT_VARIABLE git_result
-                OUTPUT_VARIABLE git_stdout
-                ERROR_VARIABLE git_stderr
-                OUTPUT_STRIP_TRAILING_WHITESPACE
-            )
-            if (git_result)
-                message(WARNING "${git_stdout}")
-                message(FATAL_ERROR "Failed to get current HEAD of '${dependency}': ${git_stderr}")
-            endif()
-            if ("${git_stdout}" STREQUAL "${revision}")
-                continue()
-            endif()
-
-            qt_internal_checkout("${dependency}" "${revision}")
-            set(checkedout 1)
-            break()
-        endforeach()
-    endwhile()
-endfunction()
--- a/cmake/TopologicalSort.cmake
+++ b/cmake/TopologicalSort.cmake
@@ -1,148 +0,0 @@
-##############################################################################
-# @file  TopologicalSort.cmake
-# @brief CMake implementation of topological sorting algorithm.
-#
-# Perform a reverse topological sort on the given LIST.
-#
-#   topological_sort(my_list "MY_" "_EDGES")
-#
-# LIST is the name of a variable containing a list of elements to be
-# sorted in reverse topological order. Each element in the list has a
-# set of outgoing edges (for example, those other list elements that
-# it depends on). In the resulting reverse topological ordering
-# (written back into the variable named LIST), an element will come
-# later in the list than any of the elements that can be reached by
-# following its outgoing edges and the outgoing edges of any vertices
-# they target, recursively. Thus, if the edges represent dependencies
-# on build targets, for example, the reverse topological ordering is
-# the order in which one would build those targets.
-#
-# For each element E in this list, the edges for E are contained in
-# the variable named ${PREFIX}${E}${SUFFIX}. If no such variable
-# exists, then it is assumed that there are no edges. For example, if
-# my_list contains a, b, and c, one could provide a dependency graph
-# using the following variables:
-#
-#     MY_A_EDGES     b
-#     MY_B_EDGES
-#     MY_C_EDGES     a b
-#
-#  With the involcation of topological_sort shown above and these
-#  variables, the resulting reverse topological ordering will be b, a, c.
-#
-# @verbatim
-##############################################################################
-# Modified from Boost Utilities
-#
-# Copyright 2010 Kitware, Inc.
-##############################################################################
-# Copyright 2007 Douglas Gregor <doug.gregor@gmail.com>
-# Copyright 2007 Troy Straszheim
-#
-# Distributed under the Boost Software License, Version 1.0.
-##############################################################################
-# Boost Software License - Version 1.0 - August 17th, 2003
-#
-# Permission is hereby granted, free of charge, to any person or organization
-# obtaining a copy of the software and accompanying documentation covered by
-# this license (the "Software") to use, reproduce, display, distribute,
-# execute, and transmit the Software, and to prepare derivative works of the
-# Software, and to permit third-parties to whom the Software is furnished to
-# do so, all subject to the following:
-#
-# The copyright notices in the Software and this entire statement, including
-# the above license grant, this restriction and the following disclaimer,
-# must be included in all copies of the Software, in whole or in part, and
-# all derivative works of the Software, unless such copies or derivative
-# works are solely in the form of machine-executable object code generated by
-# a source language processor.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-# SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-# FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-##############################################################################
-# @endverbatim
-#
-# @ingroup CMakeUtilities
-##############################################################################
-
-function(topological_sort LIST PREFIX SUFFIX)
-  # Clear the stack and output variable
-  set(VERTICES "${${LIST}}")
-  set(STACK)
-  set(${LIST})
-
-  # Loop over all of the vertices, starting the topological sort from
-  # each one.
-  foreach(VERTEX ${VERTICES})
-
-    # If we haven't already processed this vertex, start a depth-first
-    # search from where.
-    if (NOT FOUND_${VERTEX})
-      # Push this vertex onto the stack with all of its outgoing edges
-      string(REPLACE ";" " " NEW_ELEMENT
-        "${VERTEX};${${PREFIX}${VERTEX}${SUFFIX}}")
-      list(APPEND STACK ${NEW_ELEMENT})
-
-      # We've now seen this vertex
-      set(FOUND_${VERTEX} TRUE)
-
-      # While the depth-first search stack is not empty
-      list(LENGTH STACK STACK_LENGTH)
-      while(STACK_LENGTH GREATER 0)
-        # Remove the vertex and its remaining out-edges from the top
-        # of the stack
-        list(GET STACK -1 OUT_EDGES)
-        list(REMOVE_AT STACK -1)
-
-        # Get the source vertex and the list of out-edges
-        separate_arguments(OUT_EDGES)
-        list(GET OUT_EDGES 0 SOURCE)
-        list(REMOVE_AT OUT_EDGES 0)
-
-        # While there are still out-edges remaining
-        list(LENGTH OUT_EDGES OUT_DEGREE)
-        while (OUT_DEGREE GREATER 0)
-          # Pull off the first outgoing edge
-          list(GET OUT_EDGES 0 TARGET)
-          list(REMOVE_AT OUT_EDGES 0)
-
-          if (NOT FOUND_${TARGET})
-            # We have not seen the target before, so we will traverse
-            # its outgoing edges before coming back to our
-            # source. This is the key to the depth-first traversal.
-
-            # We've now seen this vertex
-            set(FOUND_${TARGET} TRUE)
-
-            # Push the remaining edges for the current vertex onto the
-            # stack
-            string(REPLACE ";" " " NEW_ELEMENT
-              "${SOURCE};${OUT_EDGES}")
-            list(APPEND STACK ${NEW_ELEMENT})
-
-            # Setup the new source and outgoing edges
-            set(SOURCE ${TARGET})
-            set(OUT_EDGES
-              ${${PREFIX}${SOURCE}${SUFFIX}})
-          endif(NOT FOUND_${TARGET})
-
-          list(LENGTH OUT_EDGES OUT_DEGREE)
-        endwhile (OUT_DEGREE GREATER 0)
-
-        # We have finished all of the outgoing edges for
-        # SOURCE; add it to the resulting list.
-        list(APPEND ${LIST} ${SOURCE})
-
-        # Check the length of the stack
-        list(LENGTH STACK STACK_LENGTH)
-      endwhile(STACK_LENGTH GREATER 0)
-    endif (NOT FOUND_${VERTEX})
-  endforeach(VERTEX)
-
-  set(${LIST} ${${LIST}} PARENT_SCOPE)
-endfunction(topological_sort)
--- a/cmake/TopologicalSort_LICENSE.txt
+++ b/cmake/TopologicalSort_LICENSE.txt
@@ -1,23 +0,0 @@
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--- a/cmake/qt_attribution.json
+++ b/cmake/qt_attribution.json
@@ -1,13 +0,0 @@
-{
-    "Id": "cmake_topological_sort",
-    "Name": "CMake Topological Sort",
-    "QDocModule": "qt",
-    "QtUsage": "Used in the CMake super build project file",
-    "Files": "TopologicalSort.cmake",
-
-    "Description": "CMake implementation of the topological sort algorithm",
-    "License": "Boost Software License - Version 1.0",
-    "LicenseFile": "TopologicalSort_LICENSE.txt",
-    "Copyright": "Copyright 2010 Kitware, Inc."
-}
-
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -1,53 +0,0 @@
-version: 2
-accept_configuration:
-  condition: property
-  property: features
-  not_contains_value: Disable
-
-instructions:
-  Build:
-    - !include "{{qt/qtbase}}/prepare_building_env.yaml"
-    - type: MakeDirectory
-      directory: .git
-    - type: SetBuildDirectory
-      directory: "{{.SourceDir}}"
-    - type: ChangeDirectory
-      directory: "{{.BuildDir}}"
-    - type: ExecuteCommand
-      command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -DQT_BUILD_TESTS=OFF {{.SourceDir}}"
-      executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
-      maxTimeInSeconds: 6000
-      maxTimeBetweenOutput: 1200
-      userMessageOnFailure: >
-        Failed to call cmake.
-
-    - type: Group
-      instructions:
-        - type: ExecuteCommand
-          command: "{{.Env.ENV_PREFIX}} cmake --build . --target qttools/all --parallel -v"
-          maxTimeInSeconds: 12000
-          maxTimeBetweenOutput: 1200
-          userMessageOnFailure: >
-            Failed to build sources.
-        - type: ExecuteCommand
-          command: "{{.Env.ENV_PREFIX}} cmake --build . --target generate_docs -v"
-          maxTimeInSeconds: 12000
-          maxTimeBetweenOutput: 1200
-          userMessageOnFailure: >
-            Failed to generate docs.
-        - type: MakeDirectory
-          directory: "{{.BuildDir}}/qtbase/doc/global"
-        - type: UploadArtifact
-          archiveDirectory: '{{.BuildDir}}/doc'
-          transferType: UploadModuleDocumentation
-          maxTimeInSeconds: 1800
-          maxTimeBetweenOutput: 1800
-      enable_if:
-        condition: property
-        property: features
-        contains_value: "Documentation"
-
-  Test:
-    - type: EnvironmentVariable
-      variableName: Dummy
-      variableValue: dummy
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -1,116 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms_qemu.yaml,
-    cmake_platforms_target_android_host_linux.yaml,
-    cmake_platforms_target_android_host_macos.yaml,
-    cmake_platforms_target_android_host_windows.yaml
-    ]
-Configurations:
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache']
-    Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_widgets=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests']
-    Configure arguments: '-DFEATURE_developer_build=ON -DFEATURE_gui=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-    Environment variables: [
-        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'Documentation']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
-    Id: 'Ubuntu-20.04-host'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
-    Template: 'qtci-linux-openSUSE-15.1-x86_64'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'InsignificantTests']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
-    Template: 'qtci-linux-SLES-15_SP2-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -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']
-
-    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 -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-51'
-    Compiler: 'MSVC2019'
-    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.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_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']
-
-    Template: 'qtci-macos-10.14-x86_64'
-    Target os: 'IOS_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'macos-10.14-host'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
-    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DBUILD_WITH_PCH=OFF', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
-
-    Id: 'Windows10-Mingw8-x64-host'
-    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}}\..'
-    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}}'
-    ]
--- a/coin/platform_configs/cmake_platforms_qemu.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu.yaml
@@ -1,49 +0,0 @@
-Version: 2
-Configurations:
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QEMU'
-    Target arch: 'armv7'
-    Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-20.04-host'
-    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.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=/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']
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QEMU'
-    Target arch: 'arm64'
-    Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-20.04-host'
-    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_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=/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']
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QEMU'
-    Target arch: 'mips64'
-    Compiler: 'GCC'
-    Platform dependency: 'Ubuntu-20.04-host'
-    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_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}}',
-        '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,46 +0,0 @@
-Version: 2
-Configurations:
-
-    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.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.1-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'armv7'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    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.1-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    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.1-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    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',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-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
@@ -1,46 +0,0 @@
-Version: 2
-Configurations:
-
-    Template: 'qtci-macos-10.14-x86_64'
-    Target os: 'Android_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    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',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
-    Template: 'qtci-macos-10.14-x86_64'
-    Target os: 'Android_ANY'
-    Target arch: 'armv7'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    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',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
-    Template: 'qtci-macos-10.14-x86_64'
-    Target os: 'Android_ANY'
-    Target arch: 'x86'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    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',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
-    Template: 'qtci-macos-10.14-x86_64'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    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',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-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,50 +0,0 @@
-Version: 2
-Configurations:
-
-    Template: 'qtci-windows-10-x86_64-51'
-    Target os: 'Android_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'Windows10-Mingw8-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests']
-    Environment variables: [
-        'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
-        '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-51'
-    Target os: 'Android_ANY'
-    Target arch: 'armv7'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'Windows10-Mingw8-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests']
-    Environment variables: [
-        'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
-        '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-51'
-    Target os: 'Android_ANY'
-    Target arch: 'x86'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'Windows10-Mingw8-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests']
-    Environment variables: [
-        'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
-        '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-51'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'Windows10-Mingw8-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests']
-    Environment variables: [
-        'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
-        '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}} -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']
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -2,105 +2,149 @@ Version: 2
 Configurations:
 -
    Template: 'qtci-windows-10-x86_64-51'
+    Compiler: 'MSVC2015'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -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% -qt-zlib'
+-
+    Template: 'qtci-windows-7-x86-3'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -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% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib'
+-
+    Template: 'qtci-windows-10-x86_64-51'
+    Target arch: 'x86'
    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'
+    Features: ['Packaging']
+    Configure arguments: '-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% -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-windows-10-x86_64-51'
+    Compiler: 'MSVC2015'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-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_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', 'DisableTests']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl'
+    Template: 'qtci-windows-10-x86_64-51'
+    Target os: 'WinRT_10'
+    Target arch: 'x86'
+    Compiler: 'MSVC2015'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015'
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-windows-10-x86_64-51'
+    Target os: 'WinRT_10'
+    Target arch: 'armv7'
+    Compiler: 'MSVC2015'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015'
+-
+    Template: 'qtci-windows-10-x86_64-51'
+    Compiler: 'MSVC2019'
+    Features: ['Packaging']
+    Configure arguments: '-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% -qt-zlib'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
    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'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'GCC'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'GCC'
+    Features: ['OutOfSourceBuild', 'Documentation']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+
+-
+    Template: 'qtci-linux-openSUSE-15.1-x86_64'
+    Compiler: 'GCC'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+-
+    Template: 'qtci-linux-openSUSE-15.1-x86_64'
+    Compiler: 'ICC'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -system-sqlite -R . -platform linux-icc-64 -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
+    Environment variables: ['LD_LIBRARY_PATH=$ICC64_19_LDLP:$LD_LIBRARY_PATH', 'PATH=$ICC64_19_PATH:$PATH' ]
 -
    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'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-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'
+    Template: 'qtci-linux-SLES-15-x86_64'
    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'
+    Features: ['Insignificant']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
 -
-    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
+    Template: 'qtci-linux-RHEL-7.6-x86_64'
    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'
+    Features: ['Packaging']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -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 -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
+-
+    Template: 'qtci-macos-10.13-x86_64-2'
+    Compiler: 'Clang'
+    Features: ['Packaging']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -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: ['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'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -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'
+    Features: ['DisableTests']
+    Configure arguments: '-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'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-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'
+    Template: 'qtci-linux-RHEL-7.6-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'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64'
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
    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'
+    Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -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'
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
    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'
+    Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner']
+    Configure arguments: '-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-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'
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
    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'
+    Features: ['DisableTests']
+    Configure arguments: '-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/mips64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib'
 -
-    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'
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
    Compiler: 'GCC'
-    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
+    Features: ['TestOnly', 'LicenseCheck']
+-
+    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Target os: 'INTEGRITY_11_04'
+    Target arch: 'armv7'
+    Compiler: 'GCC'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6'
+-
+    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Target os: 'QNX_700'
+    Target arch: 'armv7'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -no-sql-mysql -qpa qnx -xplatform qnx-armle-v7-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1'
--- a/coin/platform_configs/doc.yaml
+++ b/coin/platform_configs/doc.yaml
@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/flashing-wizard.yaml
+++ b/coin/platform_configs/flashing-wizard.yaml
@@ -4,20 +4,20 @@ 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'
+        Features: ['Packaging']
+        Configure arguments: '-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 -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'
+        Features: ['Packaging']
+        Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
    -
-        Template: 'qtci-linux-CentOS-8.1-x86_64-50'
+        Template: 'qtci-linux-RHEL-7.6-x86_64'
        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'
+        Features: ['Packaging']
+        Configure arguments: '-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 -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Template: 'qtci-linux-Ubuntu-18.04-x86_64'
        Compiler: 'GCC'
-        Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
+        Features: ['TestOnly', 'LicenseCheck']
--- a/coin/platform_configs/meta-boot2qt.yaml
+++ b/coin/platform_configs/meta-boot2qt.yaml
@@ -1,43 +1,40 @@
-Version: 2
-Module only: True
-Configurations:
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET1'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET2'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET3'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET4'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET5'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET6'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET7'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET8'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET9'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'Yocto'
-        Target arch: 'TARGET10'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'Yocto'
+    Target arch: 'TARGET1'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'Yocto'
+    Target arch: 'TARGET2'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'Yocto'
+    Target arch: 'TARGET3'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'Yocto'
+    Target arch: 'TARGET4'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'Yocto'
+    Target arch: 'TARGET5'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'Yocto'
+    Target arch: 'TARGET6'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'Yocto'
+    Target arch: 'TARGET7'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'Yocto'
+    Target arch: 'TARGET8'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'Yocto'
+    Target arch: 'TARGET9'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'Yocto'
+    Target arch: 'TARGET10'
--- a/coin/platform_configs/meta-qt6.yaml
+++ b/coin/platform_configs/meta-qt6.yaml
@@ -1,4 +0,0 @@
-Version: 2
-Module only: True
-Include: [meta-boot2qt.yaml]
-Configurations: []
--- a/coin/platform_configs/pyside-setup.yaml
+++ b/coin/platform_configs/pyside-setup.yaml
@@ -1,9 +0,0 @@
-Version: 2
-Module only: True
-Include: [cmake_platforms.yaml]
-Configurations:
-
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'LicenseCheck']
-
--- a/coin/platform_configs/qdb.yaml
+++ b/coin/platform_configs/qdb.yaml
@@ -5,24 +5,24 @@ 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%'
+        Features: ['Packaging']
+        Configure arguments: '-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%'
+        Features: ['Packaging']
+        Configure arguments: '-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'
+        Template: 'qtci-linux-RHEL-7.6-x86_64'
        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'
+        Features: ['Packaging']
+        Configure arguments: '-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 -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib 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'
+        Configure arguments: '-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'
+        Template: 'qtci-linux-Ubuntu-18.04-x86_64'
        Compiler: 'GCC'
-        Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
+        Features: ['TestOnly', 'LicenseCheck']
--- a/coin/platform_configs/qt3d.yaml
+++ b/coin/platform_configs/qt3d.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@@ -1,3 +1,115 @@
 Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
+Configurations:
+-
+    Template: 'qtci-windows-10-x86_64-51'
+    Target os: 'WinRT_10'
+    Compiler: 'MSVC2015'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
+-
+    Template: 'qtci-windows-10-x86_64-51'
+    Target os: 'WinRT_10'
+    Target arch: 'x86'
+    Compiler: 'MSVC2019'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x86-msvc2019'
+-
+    Template: 'qtci-windows-7-x86-3'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-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_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% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
+-
+    Template: 'qtci-windows-10-x86_64-51'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-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: 'WinRT_10'
+    Target arch: 'armv7'
+    Compiler: 'MSVC2019'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-arm-msvc2019'
+-
+    Template: 'qtci-windows-10-x86_64-51'
+    Target os: 'WinRT_10'
+    Compiler: 'MSVC2019'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x64-msvc2019'
+-
+    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: ['Packaging', 'DisableTests']
+    Configure arguments: '-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-r20'
+-
+    Template: 'qtci-macos-10.13-x86_64-2'
+    Target os: 'Android_ANY'
+    Target arch: 'multi'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -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-r20 -android-ndk-host darwin-x86_64'
+-
+    Template: 'qtci-macos-10.13-x86_64-2'
+    Target os: 'QNX_700'
+    Target arch: 'x86'
+    Compiler: 'GCC'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -extprefix /Users/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1'
+-
+    Template: 'qtci-windows-10-x86_64-51'
+    Target os: 'QNX_700'
+    Target arch: 'armv7'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""']
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1'
+-
+    Template: 'qtci-windows-10-x86_64-51'
+    Target os: 'QNX_700'
+    Target arch: 'armv8'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""']
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1'
+-
+    Template: 'qtci-windows-10-x86_64-51'
+    Target os: 'QNX_700'
+    Target arch: 'x86_64'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""']
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc -Ic:\qnx700\target\qnx7\usr\include\openssl1_1'
+-
+    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Target os: 'QNX_700'
+    Target arch: 'armv8'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-aarch64le-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1'
+-
+    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Target os: 'QNX_700'
+    Target arch: 'x86_64'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -extprefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc -I /opt/qnx700/target/qnx7/usr/include/openssl1_1'
+-
+    Template: 'qtci-windows-10-x86_64-51'
+    Target os: 'WebAssembly'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -platform win32-g++ -xplatform wasm-emscripten'
+-
+    Template: 'qtci-macos-10.13-x86_64-2'
+    Target os: 'WebAssembly'
+    Compiler: 'Clang'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake examples -nomake  tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -xplatform wasm-emscripten'
--- a/coin/platform_configs/qt5compat.yaml
+++ b/coin/platform_configs/qt5compat.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtandroidextras.yaml
+++ b/coin/platform_configs/qtandroidextras.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,23 +1,26 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations:
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Target os: 'QEMU'
+    Target arch: 'armv7'
+    Compiler: 'GCC'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -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'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Target os: 'QEMU'
+    Target arch: 'arm64'
+    Compiler: 'GCC'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -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'
+-
+    Template: 'qtci-windows-10-x86_64-51'
+    Target os: 'WinRT_10'
+    Target arch: 'x86_64'
+    Compiler: 'MSVC2015'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
 -
    Template: 'qtci-linux-openSUSE-15.1-x86_64'
    Target os: 'WebAssembly'
    Compiler: 'GCC'
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten'
-
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Features: ['UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
-
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Features: ['Sccache']
-    Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-    Environment variables: [
-        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-        ]
+    Features: ['DisableTests']
+    Configure arguments: '-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'
--- a/coin/platform_configs/qtcoap.yaml
+++ b/coin/platform_configs/qtcoap.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtconnectivity.yaml
+++ b/coin/platform_configs/qtconnectivity.yaml
@@ -1,3 +1,6 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
+-
+    Template: 'qtci-windows-10-x86_64-51'
+    Target os: 'WinRT_10'
+    Target arch: 'x86_64'
+    Compiler: 'MSVC2015'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
--- a/coin/platform_configs/qtdeclarative.yaml
+++ b/coin/platform_configs/qtdeclarative.yaml
@@ -1,17 +1,24 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations:
 -
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Features: ['UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Target os: 'QEMU'
+    Target arch: 'armv7'
+    Compiler: 'GCC'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -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'
 -
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Features: ['Sccache']
-    Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-    Environment variables: [
-        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-        ]
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Target os: 'QEMU'
+    Target arch: 'arm64'
+    Compiler: 'GCC'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -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'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Target os: 'QEMU'
+    Target arch: 'armv7'
+    Compiler: 'GCC'
+    Configure arguments: '-opensource -confirm-license -R . -developer-build -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" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -tslib -verbose'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Target os: 'QEMU'
+    Target arch: 'arm64'
+    Compiler: 'GCC'
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -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-xcb'
--- a/coin/platform_configs/qtdoc.yaml
+++ b/coin/platform_configs/qtdoc.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtgraphicaleffects.yaml
+++ b/coin/platform_configs/qtgraphicaleffects.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtimageformats.yaml
+++ b/coin/platform_configs/qtimageformats.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtmqtt.yaml
+++ b/coin/platform_configs/qtmqtt.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtnetworkauth.yaml
+++ b/coin/platform_configs/qtnetworkauth.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtopcua.yaml
+++ b/coin/platform_configs/qtopcua.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtquick3d.yaml
+++ b/coin/platform_configs/qtquick3d.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtquickcontrols2.yaml
+++ b/coin/platform_configs/qtquickcontrols2.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtquicktimeline.yaml
+++ b/coin/platform_configs/qtquicktimeline.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtremoteobjects.yaml
+++ b/coin/platform_configs/qtremoteobjects.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -3,17 +3,31 @@ Configurations:
 -
    Template: 'qtci-windows-10-x86_64-51'
    Compiler: 'Mingw'
+    Features: ['Packaging', 'DisableTests']
    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']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -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% -static -no-icu'
+-
+    Template: 'qtci-windows-7-x86-3'
+    Compiler: 'Mingw73'
+    Environment variables: ['PATH=C:\MINGW730\mingw32\bin;$PATH']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -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% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib'
 -
    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++'
+    Compiler: 'MSVC2015'
+    Features: ['Packaging']
+    Configure arguments: '-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_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-CentOS-8.1-x86_64-50'
+    Template: 'qtci-windows-10-x86_64-51'
+    Compiler: 'MSVC2019'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-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-linux-RHEL-7.6-x86_64'
    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'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-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 -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
+-
+    Template: 'qtci-macos-10.14-x86_64'
+    Compiler: 'Clang'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-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'
--- a/coin/platform_configs/qtsdk.yaml
+++ b/coin/platform_configs/qtsdk.yaml
@@ -1,15 +1,13 @@
 -
    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']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
 -
-    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
+    Template: 'qtci-linux-RHEL-6.6-x86_64'
    Compiler: 'GCC'
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests'
-    Features: ['UseLegacyInstructions']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -force-debug-info -nomake examples -nomake tests'
 -
    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'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
--- a/coin/platform_configs/qtshadertools.yaml
+++ b/coin/platform_configs/qtshadertools.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtsvg.yaml
+++ b/coin/platform_configs/qtsvg.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qttools.yaml
+++ b/coin/platform_configs/qttools.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qttranslations.yaml
+++ b/coin/platform_configs/qttranslations.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtvirtualkeyboard.yaml
+++ b/coin/platform_configs/qtvirtualkeyboard.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtwayland.yaml
+++ b/coin/platform_configs/qtwayland.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtwebengine.yaml
+++ b/coin/platform_configs/qtwebengine.yaml
@@ -1,65 +0,0 @@
-Version: 2
-Module only: True
-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', 'Insignificant']
-    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: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions', 'Insignificant']
-    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-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 -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
-
-    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'
-
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Features: ['UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -headersclean -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
-
-    Template: 'qtci-macos-10.14-x86_64'
-    Compiler: 'Clang'
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
-
-    Template: 'qtci-macos-10.14-x86_64'
-    Target os: 'IOS_ANY'
-    Target arch: 'multi'
-    Compiler: 'Clang'
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang'
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QEMU'
-    Target arch: 'armv7'
-    Compiler: 'GCC'
-    Features: ['UseLegacyInstructions', 'Insignificant']
-    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', 'Insignificant']
-    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'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
--- a/coin/platform_configs/qtwebkit.yaml
+++ b/coin/platform_configs/qtwebkit.yaml
@@ -1,8 +1,13 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-windows-10-x86_64-51'
+    Template: 'qtci-windows-7-x86-3'
    Compiler: 'Mingw'
    Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
-    Features: ['Packaging', UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -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'
+    Features: ['Packaging', 'DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -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% -platform win32-g++ QMAKE_LFLAGS_APP+=-s'
+-
+    Template: 'qtci-windows-10-x86_64-16'
+    Compiler: 'Mingw73'
+    Features: ['Packaging']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -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'
--- a/coin/platform_configs/qtwebsockets.yaml
+++ b/coin/platform_configs/qtwebsockets.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/tqtc-pyside-setup.yaml
+++ b/coin/platform_configs/tqtc-pyside-setup.yaml
@@ -1,9 +0,0 @@
-Version: 2
-Module only: True
-Include: [cmake_platforms.yaml]
-Configurations:
-
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'LicenseCheck']
-
--- a/coin/platform_configs/tqtc-qt-config-gui.yaml
+++ b/coin/platform_configs/tqtc-qt-config-gui.yaml
@@ -4,25 +4,25 @@ 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'
+        Features: ['Packaging']
+        Configure arguments: '-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'
+        Features: ['Packaging']
+        Configure arguments: '-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'
+        Template: 'qtci-linux-RHEL-7.6-x86_64'
        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'
+        Features: ['Packaging']
+        Configure arguments: '-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 -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib 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'
+        Features: ['Packaging']
+        Configure arguments: '-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'
+        Template: 'qtci-linux-Ubuntu-18.04-x86_64'
        Compiler: 'GCC'
-        Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
+        Features: ['TestOnly', 'LicenseCheck']
--- a/coin/platform_configs/tqtc-qt-rta.yaml
+++ b/coin/platform_configs/tqtc-qt-rta.yaml
@@ -1,11 +1,14 @@
-Version: 2
-Configurations:
-   Template: 'qtci-windows-8.1-x86_64'
+-
+    Template: 'qtci-windows-7-x86_64-4'
    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'
+    Features: ['DisableTests']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
+-
+    Template: 'qtci-windows-8.1-x86_64'
+    Compiler: 'MSVC2013'
+    Features: ['DisableTests']
+    Configure arguments: '-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']
+    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
--- 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,45 +0,0 @@
-### CENTOS 8.1 ###
-Hard Disk: 500G
-Network: CI
-Video Card: Total Video Memory: 64MB
-Boot options/Firmware: BIOS
-
-Language: English (United States)
-Time & Date: Europe/Helsinki
-Software Selection: Server with GUI
-Network & Host..: Connect
-
-Language: English (US)
-Typing:English (US)
-Privacy: Location Services: OFF
-Connect Your Online Accounts: Skip
-
-
-# Configure Settings
- Notifications:
-    * Notification Popups: OFF
-    * Lock Screen Notifications: OFF
- Privacy:
-    * Screen Lock: OFF
- Power:
-    * Blank screen: Never
- Devices:
-    * Displays: Resolution 1280 x 800
- Details:
-    * Time Zone: GMT
-    * Users: Automatic login on
-
-# Add user to sudoers
-Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
-
-# Fetch and run coin-setup
-Download http://coin/coin/binary/linux_386/coin-setup
-
-run 'sudo ./coin-setup'
-
-Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub
-grub2-mkconfig -o /etc/grub2.cfg
-grub2-mkconfig -o /boot/grub2/grub.cfg
-
-Reboot
-
--- a/coin/pre-provisioning/qtci-linux-SLES-15_SP2-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-SLES-15_SP2-x86_64/README_MANUAL_INSTALLATIONS
@@ -1,47 +0,0 @@
-### SUSE Linux Enterprise Desktop 15 SP2 ###
-
-Language: English (US)
-Keyboard Layout: English (US)
-
-Available Extensions and Modules:
-   Basesystem Module
-   Desktop Applications Module
-   Python 2 Module
-
-Gnome Desktop (X11)
-
-Resolution 1280x800
-
-# Settings
-Notification Popups - disabled
-LockScreen Notifications - disabled
-
-# Privacy
-Screen Lock - Off
-
-# Power
-Power Saving - Blank Screen - never
-
-# Add user to sudoers
-Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
-
-# Fetch and run coin-setup
-Download http://coin/coin/binary/linux_386/coin-setup
-sudo ./coin-setup
-
-# Add support for virtio driver
-sudo echo "add_drivers+=\"virtio-blk\"" >> /etc/dracut.conf.d/virtio.conf
-sudo dracut -f
-
-# Add these to '/etc/polkit-default-privs.local'
-org.freedesktop.udisks2.filesystem-mount                yes
-org.freedesktop.udisks2.filesystem-mount-other-seat     yes
-org.freedesktop.udisks2.filesystem-mount-system         yes
-org.freedesktop.login1.power-off                        yes
-org.freedesktop.login1.power-off-ignore-inhibit         yes
-org.freedesktop.login1.power-off-multiple-sessions      yes
-
-# Register product
-# Add 'Available Extensions and Modules'
-* Basesystem Module 15 SP2 x86_64
-* Server Applications Module 15 SP2 x86_64
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## 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.
@@ -51,15 +51,15 @@ sdkTargetFolder="$targetFolder/sdk"

 basePath="http://ci-files01-hki.intra.qt.io/input/android"

-toolsVersion="2.1"
-toolsFile="commandlinetools-linux-6609375_latest.zip"
-ndkVersion="r21d"
+toolsVersion="r26.1.1"
+toolsFile="sdk-tools-linux-4333796.zip"
+ndkVersion="r20"
 ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
 sdkBuildToolsVersion="28.0.3"
 sdkApiLevel="android-28"

-toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
-ndkSha1="bcf4023eb8cb6976a4c7cff0a8a8f145f162bf4d"
+toolsSha1="8c7c28554a32318461802c1291d76fccfafde054"
+ndkSha1="8665fc84a1b1f0d6ab3b5fdd1e30200cc7b9adff"

 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
@@ -88,20 +88,17 @@ sdkmanager_no_progress_bar_cmd="tr '\r' '\n'  |  grep -v '^\[[ =]*\]'"
 # But don't let the pipeline hide sdkmanager failures.
 set -o pipefail

-sudo mkdir "$sdkTargetFolder/cmdline-tools"
-sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools"
-
 echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion."
 # shellcheck disable=SC2031
 if [ "$http_proxy" != "" ]; then
    proxy_host=$(echo "$proxy" | cut -d'/' -f3 | cut -d':' -f1)
    proxy_port=$(echo "$proxy" | cut -d':' -f3)
-    echo "y" | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" --sdk_root=$sdkTargetFolder  \
+    echo "y" | "$sdkTargetFolder/tools/bin/sdkmanager"  \
                   --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port"  \
                   "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
        | eval $sdkmanager_no_progress_bar_cmd
 else
-    echo "y" | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" --sdk_root=$sdkTargetFolder  \
+    echo "y" | "$sdkTargetFolder/tools/bin/sdkmanager"  \
                   "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion"  \
        | eval $sdkmanager_no_progress_bar_cmd
 fi
@@ -121,16 +118,16 @@ echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
 echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
 echo "Android NDK = $ndkVersion" >> ~/versions.txt

-cd "$sdkTargetFolder/cmdline-tools/tools/bin"
-./sdkmanager --install "emulator" --sdk_root=$sdkTargetFolder \
+cd "$sdkTargetFolder/tools/bin"
+./sdkmanager --install "emulator"  \
    | eval $sdkmanager_no_progress_bar_cmd
-echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86"  \
+echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86"  \
    | eval $sdkmanager_no_progress_bar_cmd


 echo "Checking the contents of Android SDK again..."
 ls -l "$sdkTargetFolder"

-echo "no" | ./avdmanager create avd -n x86emulator -k "system-images;android-23;google_apis;x86" -c 2048M -f
+echo "no" | ./avdmanager create avd -n x86emulator -k "system-images;android-21;google_apis;x86" -c 2048M -f
 # Purely informative, show the list of avd devices
 ./avdmanager list avd
--- a/coin/provisioning/common/linux/cmake_linux.sh
+++ b/coin/provisioning/common/linux/cmake_linux.sh
@@ -33,7 +33,7 @@
 ##
 #############################################################################

-# This script installs CMake
+# This script installs CMake 3.7.2

 # CMake is needed for autotests that verify that Qt can be built with CMake

@@ -42,11 +42,10 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-majorminorversion="3.19"
-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="e2da8449626d9fd8ed1c0eb4babaab6d535f7e72"
+version="3.7.2"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.7.2-Linux-x86_64.tar.gz"
+AltUrl="https://cmake.org/files/v3.7/cmake-3.7.2-Linux-x86_64.tar.gz"
+SHA1="915bc981aab354821fb9fd28374a720fdb3aa180"
 targetFolder="/opt/cmake-$version"
 appPrefix="cmake-$version-Linux-x86_64"

--- a/coin/provisioning/common/linux/gcc.sh
+++ b/coin/provisioning/common/linux/gcc.sh
@@ -1,3 +1,4 @@
+
 #!/usr/bin/env bash

 #############################################################################
--- a/coin/provisioning/common/linux/install_dwz.sh
+++ b/coin/provisioning/common/linux/install_dwz.sh
@@ -43,7 +43,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

 version="0.13"
 sha1="21e6d5878bb84ac6c9ad07b00ed248d8c547bc7d"
-internalUrl="http://ci-files01-hki.intra.qt.io/input/centos/dwz-$version.tar.xz"
+internalUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/dwz-$version.tar.xz"
 externalUrl="https://www.sourceware.org/ftp/dwz/releases/dwz-$version.tar.xz"

 targetDir="$HOME/dwz"
@@ -52,10 +52,8 @@ DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile"
 tar -xJf "$targetFile" -C "$HOME"
 sudo rm "$targetFile"

-# devtoolset is needed when running configuration in RedHat
-if uname -a |grep -q "el7"; then
-    export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH"
-fi
+# devtoolset is needed when running configuration
+export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH"

 installPrefix="/opt/dwz-$version"

--- a/coin/provisioning/common/linux/sccache.sh
+++ b/coin/provisioning/common/linux/sccache.sh
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2018 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-set -ex
-
-source "${BASH_SOURCE%/*}/../unix/sccache.sh"
-
-targetArch=x86_64-unknown-linux-musl
-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
@@ -42,15 +42,13 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-majorminorversion="3.19"
-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"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/cmake-3.11.3-Darwin-x86_64.tar.gz"
+AltUrl="https://cmake.org/files/v3.11/cmake-3.11.3-Darwin-x86_64.tar.gz"
+SHA1="3d13de8020ce560159fa5cecb669498c48552d96"
+appPrefix="cmake-3.11.3-Darwin-x86_64"

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

 SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH"

-echo "CMake = $version" >> ~/versions.txt
+echo "CMake = 3.11.3" >> ~/versions.txt
--- a/coin/provisioning/common/macos/ninja.sh
+++ b/coin/provisioning/common/macos/ninja.sh
@@ -1,49 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2020 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script will install ninja binary
-
-# shellcheck source=./../unix/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
-
-version="1.10.1"
-internalUrl="http://ci-files01-hki.ci.local/input/mac/ninja-mac_v${version}.zip"
-externalUrl="https://github.com/ninja-build/ninja/releases/download/v${version}/ninja-mac.zip"
-SHA1="de7c594e3bf76f7c86b9d6874d49c8824b2a76e1"
-DestDir="/usr/local/bin/"
-
-InstallFromCompressedFileFromURL "$internalUrl" "$externalUrl" "$SHA1" "$DestDir" ""
-
-echo "Ninja = $version" >> ~/versions.txt
--- a/coin/provisioning/common/macos/python3.sh
+++ b/coin/provisioning/common/macos/python3.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2019 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Copyright (C) 2017 Pelagicore AG
 ## Contact: http://www.qt.io/licensing/
 ##
@@ -43,23 +43,23 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 # shellcheck source=./pip.sh
 source "${BASH_SOURCE%/*}/pip.sh"

-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.7.4-macosx10.9.pkg"
-AltUrl="https://www.python.org/ftp/python/3.7.4/python-3.7.4-macosx10.9.pkg"
-SHA1="ef8a6b1abba6a6e8553916a881af440705653fa8"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.6.1-macosx10.6.pkg"
+AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg"
+SHA1="ae0c749544c2d573c3cc29c4c2d7d9a595db28f9"
 DestDir="/"

 InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"

-InstallPip python3.7
+InstallPip python3.6

-/Library/Frameworks/Python.framework/Versions/3.7/bin/pip3 install virtualenv wheel
+/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv wheel

-SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.7/bin"
-SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.7/bin"
+SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"
+SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"

 # Install all needed packages in a special wheel cache directory
-/Library/Frameworks/Python.framework/Versions/3.7/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt
+/Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"

-echo "python3 = 3.7.4" >> ~/versions.txt
+echo "python3 = 3.6.1" >> ~/versions.txt

--- a/coin/provisioning/common/macos/set-locale.sh
+++ b/coin/provisioning/common/macos/set-locale.sh
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2019 The Qt Company Ltd.
-## Copyright (C) 2017 Pelagicore AG
-## 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 sets the macOS locale to UTF-8
-set -ex
-
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-SetEnvVar "LANG" "en_US.UTF-8"
--- a/coin/provisioning/common/unix/install_protobuff.sh
+++ b/coin/provisioning/common/unix/install_protobuff.sh
@@ -53,7 +53,7 @@ sudo rm "$targetFile"

 # devtoolset is needed when running configuration
 if uname -a |grep -qv "Darwin"; then
-    export PATH="/opt/rh/devtoolset-7/root/usr/bin:$PATH"
+    export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH"
 fi

 echo "Configuring and building protobuf"
--- a/coin/provisioning/common/unix/libclang.sh
+++ b/coin/provisioning/common/unix/libclang.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## 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.
@@ -47,29 +47,25 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"

-libclang_version=10.0
+libclang_version=6.0

 if uname -a |grep -q Darwin; then
    version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-mac.7z"
-    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-mac.7z"
-    sha1="6e019c428511e74c5d46d0ddca79d8e804b67f8a"
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-mac.7z"
+    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-mac.7z"
+    sha1="0af8ab8c1174faf4b721d079587190fc32ea8364"
 else
    version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
-    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
-    sha1="08f352d411e4b47c2a259c3b120d7cb2db01e41d"
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
+    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z"
+    sha1="ef59b699f4fcce2e45108b3ff04cc7471c1c4abe"
 fi

 zip="/tmp/libclang.7z"
 destination="/usr/local/libclang-$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 7z x $zip -o/usr/local/
 sudo mv /usr/local/libclang "$destination"
 rm -rf $zip

--- a/coin/provisioning/common/unix/mqtt_broker.sh
+++ b/coin/provisioning/common/unix/mqtt_broker.sh
@@ -39,10 +39,10 @@
 source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"

-CommitSHA="2873885d7e840b4e06483f36f170c609eb30527d"
+CommitSHA="20bad2475c27a6e1d24a56d90a9fceb40963261e"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
 AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
-SHA1="1fcc4e61b12f11a1421cc8c3f379276d732e62b7"
+SHA1="a0ac88715c2aebb9573a113dc13925a90da19233"
 targetFolder="/opt/paho_broker"
 appPrefix="paho.mqtt.testing-$CommitSHA"

--- a/coin/provisioning/common/unix/sccache.sh
+++ b/coin/provisioning/common/unix/sccache.sh
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2018 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-set -ex
-
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-## comment fo changin patchset..coin privision issue
-
-function installSccache {
-    targetArch=$1
-    targetVersion=$2
-    sha1=$3
-    targetFile=sccache-$targetVersion-$targetArch.tar.gz
-    primaryUrl=http://ci-files01-hki.intra.qt.io/input/sccache/$targetFile
-    cacheUrl=https://github.com/mozilla/sccache/releases/download/$targetVersion/$targetFile
-    DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile"
-
-    sudo mkdir -p /usr/local/sccache
-    sudo tar -C /usr/local/sccache -x -z --totals --strip-components=1 --file="$targetFile"
-
-    # add sccache __before__ the real compiler
-    SetEnvVar "PATH" "/usr/local/sccache:\$PATH"
-
-    # disable sccache server from shutting down after being idle
-    SetEnvVar "SCCACHE_IDLE_TIMEOUT" "0"
-}
--- a/coin/provisioning/common/windows/android-openssl.ps1
+++ b/coin/provisioning/common/windows/android-openssl.ps1
@@ -51,7 +51,7 @@ $sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997"
 $destination = "C:\Utils\openssl-android-master"

 # msys unix style paths
-$ndkPath = "/c/Utils/Android/android-ndk-r21d"
+$ndkPath = "/c/Utils/Android/android-ndk-r20"
 $openssl_path = "/c/Utils/openssl-android-master"
 $cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin"
 Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
--- a/coin/provisioning/common/windows/android.ps1
+++ b/coin/provisioning/common/windows/android.ps1
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -40,24 +40,23 @@
 # That's why we need to use Andoid-21 API version in Qt 5.9.

 # NDK
-$ndkVersion = "r21d"
+$ndkVersion = "r20"
 $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 = "99175ce1210258f2280568cd340e0666c69955c7"
+$ndkChecksum = "36e1dc77fad08ad2498fb94b13ad8caf26bbd9df"
 $ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion"
 $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"

 # SDK
-$toolsVersion = "2.1"
-$toolsFile = "commandlinetools-win-6609375_latest.zip"
+$toolsVersion = "26.1.1"
+$toolsFile = "sdk-tools-windows-4333796.zip"
 $sdkApi = "ANDROID_API_VERSION"
 $sdkApiLevel = "android-28"
 $sdkBuildToolsVersion = "28.0.3"
 $toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
 $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
-$toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
-$toolsFolder = "c:\Utils\Android\cmdline-tools"
-
+$toolsChecksum = "aa298b5346ee0d63940d13609fe6bec621384510"
+$toolsFolder = "c:\Utils\Android\tools"
 $sdkZip = "c:\Windows\Temp\$toolsFile"

 function Install($1, $2, $3, $4) {
@@ -77,9 +76,7 @@ Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolder
 Set-EnvironmentVariable "ANDROID_NDK_ROOT" $ndkFolder

 Install $toolsCachedUrl $sdkZip $toolsChecksum $sdkOfficialUrl
-New-Item -ItemType directory -Path $toolsFolder
-Move-Item -Path C:\Utils\Android\tools -Destination $toolsFolder\
-Set-EnvironmentVariable "ANDROID_SDK_HOME" "C:\Utils\Android"
+Set-EnvironmentVariable "ANDROID_SDK_HOME" C:\Utils\Android
 Set-EnvironmentVariable "ANDROID_API_VERSION" $sdkApiLevel

 if (IsProxyEnabled) {
@@ -101,8 +98,8 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8
 # Attempt to catch all errors of sdkmanager.bat, even when hidden behind a pipeline.
 $ErrorActionPreference = "Stop"

-cd $toolsFolder\tools\bin\
-$sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion", "--sdk_root=C:\Utils\Android"
+cd $toolsFolder\bin\
+$sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion"
 $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args | Out-Null'
 Invoke-Expression $command
 $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses'
--- a/coin/provisioning/common/windows/cmake.ps1
+++ b/coin/provisioning/common/windows/cmake.ps1
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2019 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,8 +33,8 @@

 . "$PSScriptRoot\helpers.ps1"

-$majorminorversion = "3.19"
-$version = "3.19.0"
+$majorminorversion = "3.7"
+$version = "3.7.2"

 $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip")
 $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip"
@@ -44,7 +44,7 @@ Write-Host "Removing old cmake"
 Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue

 Download $officialurl $cachedurl $zip
-Verify-Checksum $zip "fac77ed3eca52168b15c30979ee43310a3cb968e"
+Verify-Checksum $zip "c80c17e858ecfebfaf16fe8af18b174d2600c4e6"

 Extract-7Zip $zip C:
 $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"
--- a/coin/provisioning/common/windows/emsdk.ps1
+++ b/coin/provisioning/common/windows/emsdk.ps1
--- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-enable-repos.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/03-enable-repos.sh
@@ -1,8 +1,6 @@
-#!/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.
@@ -31,14 +29,19 @@
 ##
 ## $QT_END_LICENSE$
 ##
-#############################################################################
+############################################################################

-set -ex
+. "$PSScriptRoot\helpers.ps1"

-sudo yum -y install yum-utils
+# This script installs ICU.

-sudo yum-config-manager --enable AppStream
-sudo yum-config-manager --enable PowerTools
-sudo yum-config-manager --enable BaseOS
-sudo yum-config-manager --enable epel-playground
+$version = "53_1"

+if (Is64BitWinHost) {
+
+# FIXME: do we really want to use the 4.8.2 ICU build?
+Set-EnvironmentVariable "CI_ICU_PATH_Mingw49" "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1"
+
+}
+
+Write-Output "ICU = $version" >> ~\versions.txt
--- a/coin/provisioning/common/windows/install-mcuxpresso.ps1
+++ b/coin/provisioning/common/windows/install-mcuxpresso.ps1
--- a/coin/provisioning/common/windows/install-msys2.ps1
+++ b/coin/provisioning/common/windows/install-msys2.ps1
@@ -33,50 +33,46 @@

 . "$PSScriptRoot\helpers.ps1"

-# This script will installs msys2
+# This script installs 7-Zip

-$version = "20200903"
+$version = "20181211"
 $prog = "msys2"
-$arch = "x86_64"
-$sha1 = "5a1644585fac2d58855d48b4ba4a92579a14cf03"
-$sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8"
-$folder = "msys64"
-
-$package_prebuilt = $folder + "_" + $version + "_prebuilt.7z"
+if (Is64BitWinHost) {
+    $arch = "x86_64"
+    $sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2"
+    $folder = "msys64"
+} else {
+    $arch = "i686"
+    $sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e"
+    $folder = "msys32"
+}
 $package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz"

-$url_cache_prebuilt = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package_prebuilt"
+
 $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
 $url_official = "http://repo.msys2.org/distrib/$arch/$package"
+$PackagePath = "C:\Windows\Temp\$package"
 $TargetLocation = "C:\Utils"


-if ((Test-Path $url_cache_prebuilt)) {
-    $PackagePath = "C:\Windows\Temp\$package_prebuilt"
-    Download $url_cache_prebuilt $url_cache_prebuilt $PackagePath
-    Verify-Checksum $PackagePath $sha1_prebuilt
-    Extract-7Zip $PackagePath $TargetLocation
-} else {
-    $PackagePath = "C:\Windows\Temp\$package"
-    Download $url_official $url_cache $PackagePath
-    Verify-Checksum $PackagePath $sha1
-    Extract-tar_gz $PackagePath $TargetLocation
-    $msys = "$TargetLocation\$folder\msys2_shell.cmd"
+Download $url_official $url_cache $PackagePath
+Verify-Checksum $PackagePath $sha1
+Extract-tar_gz $PackagePath $TargetLocation
+$msys = "$TargetLocation\$folder\msys2_shell.cmd"

-    # install perl
-    # Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file.
-    cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
-    Start-Sleep -s 60
-    cmd /c "$msys `"-l`" `"-c`" `"echo y | cpan -i Text::Template Test::More`""
+# install perl
+# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file.
+cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
+Start-Sleep -s 30
+cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`""

-    # Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed.
-    # Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process.
-    Start-Sleep -s 360
-    if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent }
-    if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }
-}
+# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed.
+# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process.
+Start-Sleep -s 180
+if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent }
+if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }

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

-Write-Output "msys2 = $version" >> ~\versions.txt
+Write-Output "7-Zip = $version" >> ~\versions.txt
--- a/coin/provisioning/common/windows/install-strawberry-perl.ps1
+++ b/coin/provisioning/common/windows/install-strawberry-perl.ps1
@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## 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,13 +35,13 @@

 # This script installs Strawberry Perl

-$version = "5.32.0.1"
+$version = "5.26.0.1"
 if (Is64BitWinHost) {
    $arch = "-64bit"
-    $sha1 = "9ec5ebc865da82eacc2d95ff2976492ca69934ab"
+    $sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D"
 } else {
    $arch = "-32bit"
-    $sha1 = "6ad89c6358a174c048f113bfd274d2d0378d60aa"
+    $sha1 = "b50b688a879f33941433774b2813bfd4b917e4ee"
 }
 $installer_name = "strawberry-perl-" + $version + $arch + ".msi"
 $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $installer_name
--- a/coin/provisioning/common/windows/libclang.ps1
+++ b/coin/provisioning/common/windows/libclang.ps1
@@ -1,11 +1,11 @@
 param(
    [Int32]$archVer=32,
-    [string]$toolchain="vs2019",
+    [string]$toolchain="vs2015",
    [bool]$setDefault=$true
 )
 . "$PSScriptRoot\helpers.ps1"

-$libclang_version="10.0"
+$libclang_version="6.0"
 Write-Output "libClang = $libclang_version" >> ~/versions.txt

 # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
@@ -25,8 +25,8 @@ function install() {

    $zip = "c:\users\qt\downloads\libclang.7z"

-    $script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z"
-    $script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z"
+    $script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z"
+    $script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z"

    Download $OfficialUrl $CachedUrl $zip
    Verify-Checksum $zip $sha1
@@ -37,34 +37,44 @@ function install() {

 $toolchainSuffix = ""

-if ( $toolchain -eq "vs2019" ) {
+if ( $toolchain -eq "vs2015" ) {
    if ( $archVer -eq 64 ) {
-        $sha1 = "6e1b3e6d38803a3bf088e521f4f4feb1ca44bac3"
-    }
-    else {
-        $sha1 = "36fcdc3155eef3636d99ed591f12e73d7a9a2e0c"
+        $sha1 = "a399af949271e6d3bfc578ea2c17ff1d6c6318b9"
+        $destination = $baseDestination + "-64"
+
+        install $sha1 $destination
    }
+
+    $archVer=32
+    $sha1 = "aa3f68f1cfa87780a4631a98ce883d3d9cb94330"
+    $destination = $baseDestination + "-32"
+
+    install $sha1 $destination
    $toolchainSuffix = "msvc"
 }

 if ( $toolchain -eq "mingw" ) {
    if ( $archVer -eq 64 ) {
-        $sha1 = "34daf2324d190de49f8e4005afeb39a7d70c5842"
-    }
-    else {
-        $sha1 = "3d7c809ab12c9293df8ffd9343cee68f184c8612"
+        $sha1 = "b382502f82d1cfa7d3cc3016d909d37edc19c22c"
+        $destination = $baseDestination + "-64"
+
+        install $sha1 $destination
    }
+
+    $archVer=32
+    $sha1 = "cbc68e0f93f4cb0ed7084a045b7c07a1980a2a44"
+    $destination = $baseDestination + "-32"
+
+    install $sha1 $destination
    $toolchainSuffix = "mingw"
 }

-install $sha1 $baseDestination-$archVer
-
 if ( $setDefault ) {
-    Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-$archVer")
+    Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
 }
-Set-EnvironmentVariable ("LLVM_INSTALL_DIR_${toolchainSuffix}") ($baseDestination + "-$archVer")
+Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_")

-if ( $libclang_version -eq "100" ) {
+if ( $libclang_version -eq "60" ) {
    # 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/squishInstall.ps1
+++ b/coin/provisioning/common/windows/squishInstall.ps1
@@ -40,7 +40,7 @@ $version = "6.6.1"
 $qtBranch = "515x"
 $targetDir = "C:\Utils\squish"
 $squishPackage = "C:\Utils\rta_squish"
-$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable"
+$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build"
 $licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin"

 # Squish license
@@ -62,9 +62,7 @@ if ($OSVersion -eq "Windows 10 Enterprise") {
    if (Is64BitWinHost) {
        $sha1 = "17b5bec83f448877e42e5effdc7daf723d157800"
    } else {
-        $sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705"
-        #Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild
-        $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\6.6.1_rerun"
+        $sha1 = "1e6c1b3935e1c1bcdd28ec2511f24b8656d3ee6a"
    }
 } elseif ($OSVersion -eq "Windows 7 Enterprise") {
    $winVersion = "win7"
@@ -72,7 +70,7 @@ if ($OSVersion -eq "Windows 10 Enterprise") {
 }
 $squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip"

-Copy-Item "$squishUrl\$squishArchive" "C:\Utils"
+Copy-Item "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\$squishArchive" "C:\Utils"
 Verify-Checksum "C:\Utils\$squishArchive" $sha1
 Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils"
 Rename-Item "$squishPackage" "$targetDir"
--- a/coin/provisioning/common/windows/update-msvc2019.ps1
+++ b/coin/provisioning/common/windows/update-msvc2019.ps1
@@ -1,71 +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 update MSVC 2019.
-# NOTE! Visual Studio is pre-installed to tier 1 image so this script won't install the whole Visual Studio. See ../../../pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt
-# MSVC 2019 online installers can be found from here https://docs.microsoft.com/en-us/visualstudio/releases/2019/history#installing-an-earlier-release
-
-$version = "16_7_5"
-$urlCache_vsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_Professional_$version.exe"
-$urlOfficial_vsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/74b4e599138d5b5824d87ee657b78cbdeb3716f58a9645047e53bb5f68131516/vs_Professional.exe"
-$sha1_vsInstaller = "70062274c1ae79f5f0f7cb91192347abc1ebcb00"
-$urlCache_buildToolsInstaller = "\\ci-files01-hki.intra.qt.io\provisioning\windows\msvc\vs2019_BuildTools_$version.exe"
-$urlOfficial_buildToolsInstaller = "https://download.visualstudio.microsoft.com/download/pr/e8bc3741-cb70-42aa-9b4e-2bd497de85dd/f3713de3e01b7829d529f67d6240116b73cc0743974bb5373a052f9629cc24d2/vs_BuildTools.exe"
-$sha1_buildToolsInstaller = "efb4600bf9bd09adf55a36e2e5d0d47a3abd481e"
-$installerPath = "C:\Windows\Temp\installer.exe"
-
-function Install {
-
-    Param (
-        [string] $urlOfficial = $(BadParam("Official url path")),
-        [string] $urlCache = $(BadParam("Cached url path")),
-        [string] $sha1 = $(BadParam("SHA1 checksum of the file"))
-
-    )
-
-    Write-Host "Installing msvc 2019 $version"
-    Download $urlOfficial $urlCache $installerPath
-    Verify-Checksum $installerPath $sha1
-    Run-Executable "$installerPath" "update --passive --wait"
-    Remove-Item -Force -Path $installerPath
-}
-
-Install $urlOfficial_vsInstaller $urlCache_vsInstaller $sha1_vsInstaller
-Install $urlOfficial_buildToolsInstaller $urlCache_buildToolsInstaller $sha1_buildToolsInstaller
-
-$msvc2019Version = (cmd /c "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -latest -property catalog_productDisplayVersion 2`>`&1)
-
-Write-Output "Visual Studio 2019 = $msvc2019Version" >> ~\versions.txt
-Write-Output "Visual Studio 2019 Build Tools = $version" >> ~\versions.txt
--- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_network_manager_secret_key.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_network_manager_secret_key.sh
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-# Ipv6 link local becomes tentative and dadfailed if two systems has the same secret_key
-# New unique secret key will be created automatically during start up.
-# https://access.redhat.com/solutions/3553581
-echo "Removing secret_key"
-sudo rm -f "/var/lib/NetworkManager/secret_key"
-
-
--- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_stable-privacy.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_stable-privacy.sh
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2020 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-set -ex
-
-echo "Change default stable-secret to based on MAC"
-sudo sed -i '/^IPV6_ADDR_GEN_MODE/d' "/etc/sysconfig/network-scripts/ifcfg-ens192"
--- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/20-sccache.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/20-sccache.sh
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-source "${BASH_SOURCE%/*}/../common/linux/sccache.sh"
--- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-disable-mlocate.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-disable-mlocate.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+BASEDIR=$(dirname "$0")
+# shellcheck source=../common/linux/disable-mlocate.sh
+"$BASEDIR/../common/linux/disable-mlocate.sh"
--- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-install_telegraf.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-install_telegraf.sh
--- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-refresh-subscription-manager.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-refresh-subscription-manager.sh
@@ -33,9 +33,16 @@
 ##
 #############################################################################

-# This script installs QEMU Guest Agent
+set -e

-set -ex
+curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null
+sudo chmod 755 /tmp/redhat_ak.sh
+/tmp/redhat_ak.sh

-sudo yum -y install qemu-guest-agent
-sudo systemctl start qemu-guest-agent
+# refresh local certificates
+sudo subscription-manager refresh
+
+# Attach available subscriptions to system. This is needed when subscriptions are renewed.
+sudo subscription-manager attach --auto
+
+sudo rm -f /tmp/redhat_ak.sh
--- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-systemsetup.sh
--- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh
@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 #############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.
@@ -31,35 +33,45 @@
 ##
 #############################################################################

-# Install mozilla sccache
+set -ex

-param(
-    [string]$arch="x86_64-pc-windows-msvc",
-    [string]$version="0.2.13-alpha-0",
-    [string]$sha1="39ee0b0b98aa20c54a75ba1cb3116ea694e83c38"
-)
+echo "set WritePreparedUpdates=false" | sudo tee -a /etc/PackageKit/PackageKit.conf
+sudo systemctl stop packagekit
+sudo systemctl disable packagekit
+sudo yum -y remove PackageKit gnome-software

-. "$PSScriptRoot\helpers.ps1"
+sudo subscription-manager config --rhsm.manage_repos=0
+sudo subscription-manager refresh

-$basename = "sccache-" + $version + "-" + $arch
-$zipfile = $basename + ".tar.gz"
-$tempfile = "C:\Windows\Temp\" + $zipfile
-$urlCache = "http://ci-files01-hki.intra.qt.io/input/sccache/" + $zipfile
-$urlOfficial = "https://github.com/mozilla/sccache/releases/download/" + $version + "/" + $zipfile
-$targetFolder = "C:\Program Files\"
+sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC
+[rhel-7-workstation-rpms]
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/rhel-7-workstation-rpms
+ui_repoid_vars = releasever basearch
+name = Qt Red Hat Enterprise Linux 7 Workstation (RPMs)
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled = 1
+gpgcheck = 1

-Write-Host "Downloading sccache $version..."
-Download $urlOfficial $urlCache $tempfile
-Verify-Checksum $tempfile $sha1
-Write-Host "Extracting $tempfile to $targetFolder..."
-Extract-tar_gz $tempfile $targetFolder
-Remove-Item -Path $tempfile
+[rhel-7-workstation-optional-rpms]
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/rhel-7-workstation-optional-rpms
+ui_repoid_vars = releasever basearch
+name = Qt Red Hat Enterprise Linux 7 Workstation - Optional (RPMs)
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled = 1
+gpgcheck = 1

-# Turnoff idle timeout to avoid sccache shutting down
-Set-EnvironmentVariable "SCCACHE_IDLE_TIMEOUT" "0"
+[rhel-workstation-rhscl-7-rpms]
+metadata_expire = 86400
+baseurl = http://repo-clones.ci.qt.io/repos/rhel-workstation-rhscl-7-rpms
+ui_repoid_vars = releasever basearch
+name = Qt Red Hat Software Collections RPMs for Red Hat Enterprise Linux 7 Workstation
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+enabled = 1
+gpgcheck = 1
+EOC

-# add sccache to PATH
-Set-EnvironmentVariable "PATH" "C:\Program Files\$basename\;$([Environment]::GetEnvironmentVariable('PATH', 'Machine'))"
-
-# update versions
-Write-Output "sccache = $version" >> ~\versions.txt
+sudo yum clean all
+# As well as this fetching the repository data, we also get a printout of the used repos
+sudo yum repolist
--- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/70-install_QemuGA.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/70-install_QemuGA.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## 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.
@@ -33,8 +33,9 @@
 ##
 #############################################################################

-# This script installs QEMU Guest Agent
-
 set -ex

-sudo zypper -nq install qemu-guest-agent
+sudo yum -y install devtoolset-4
+
+echo "source /opt/rh/devtoolset-4/enable" >> ~/.bashrc
+
--- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/02-install-rhel-epel.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/02-install-rhel-epel.sh
@@ -2,7 +2,7 @@

 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -38,10 +38,10 @@ set -ex
 # shellcheck source=../common/unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"

-package="epel-release-latest-8.noarch.rpm"
-primaryUrl="https://dl.fedoraproject.org/pub/epel/$package"
-cacheUrl="http://ci-files01-hki.intra.qt.io/input/centos/$package"
-sha256="8949517e8a84556d06dba8b030fb5bc4553474b352d7ce25799469aa9af4cc62"
+package="epel-release-7-12.noarch.rpm"
+primaryUrl="https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/$package"
+cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/$package"
+sha256="d6bb83c00ab3af26ded56459e7d6fceabfef66efbe0780b4dedbe81d62c07cd5"
 targetFile="/tmp/$package"

 DownloadURL "$cacheUrl" "$primaryUrl" "$sha256" "$targetFile"
--- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/04-install-packages.sh
@@ -45,11 +45,6 @@ installPackages+=(glib2-devel)
 installPackages+=(openssl-devel)
 installPackages+=(freetype-devel)
 installPackages+=(fontconfig-devel)
-# cmake build
-installPackages+=(ninja-build)
-installPackages+=(pcre2-devel)
-installPackages+=(double-conversion-devel)
-installPackages+=(zstd)
 # EGL support
 installPackages+=(mesa-libEGL-devel)
 installPackages+=(mesa-libGL-devel)
@@ -63,8 +58,6 @@ installPackages+=(postgresql-devel)
 installPackages+=(cups-devel)
 installPackages+=(dbus-devel)
 # gstreamer 1 for QtMultimedia
-# Note! gstreamer1-plugins-bad-free needs to be upgraded or it will conflicts with gstreamer1-plugins-base-devel
-installPackages+=(gstreamer1-plugins-bad-free)
 installPackages+=(gstreamer1-devel)
 installPackages+=(gstreamer1-plugins-base-devel)
 # gtk3 style for QtGui/QStyle
@@ -74,9 +67,9 @@ installPackages+=(libusbx-devel)
 # speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux
 installPackages+=(speech-dispatcher-devel)
 # Python 2 devel and pip. python-pip requires the EPEL repository to be added
-installPackages+=(python2-devel python2-pip)
+installPackages+=(python-devel python-pip)
 # Python 3 with python-devel, pip and virtualenv
-installPackages+=(python36)
+installPackages+=(rh-python36)
 installPackages+=(python36-devel)
 # WebEngine
 installPackages+=(bison)
@@ -87,10 +80,14 @@ installPackages+=(pulseaudio-libs-devel)
 installPackages+=(libXtst-devel)
 installPackages+=(nspr-devel)
 installPackages+=(nss-devel)
+installPackages+=(rh-nodejs12-nodejs)
+installPackages+=(rh-nodejs12-nodejs-devel)
 # For Android builds
 installPackages+=(java-1.8.0-openjdk-devel)
 # For receiving shasum
 installPackages+=(perl-Digest-SHA)
+# For Clang 11 tests
+installPackages+=(perl-Digest-MD5)
 # INTEGRITY requirements
 installPackages+=(glibc.i686)
 # Enable Qt Bluetooth
@@ -122,7 +119,6 @@ installPackages+=(unixODBC-devel)
 installPackages+=(unixODBC)
 # Vulkan support
 installPackages+=(vulkan-devel)
-installPackages+=(vulkan-tools)
 # Conan: For Python build
 installPackages+=(xz-devel)
 installPackages+=(zlib-devel)
@@ -130,31 +126,23 @@ installPackages+=(libffi-devel)
 installPackages+=(libsqlite3x-devel)
 # Build.pl
 installPackages+=(perl-Data-Dumper)
-# In RedHat these come with Devtoolset
-installPackages+=(gcc)
-installPackages+=(gcc-c++)
-installPackages+=(libstdc++-static)
-installPackages+=(make)
-# Open source VMware Tools
-installPackages+=(open-vm-tools)

 sudo yum -y install "${installPackages[@]}"

-sudo ln -s /usr/bin/python2 /usr/bin/python
-
+sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3
+sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3
 # We shouldn't use yum to install virtualenv. The one found from package repo is not
 # working, but we can use installed pip
-sudo pip3 install --upgrade pip
-sudo pip3 install virtualenv wheel
+sudo pip install --upgrade pip
+sudo pip install virtualenv wheel

-sudo /usr/bin/pip3 install wheel
+# Needed by packaging scripts
+sudo /usr/local/bin/pip3 install colorlog --user
+
+sudo /usr/local/bin/pip3 install wheel
 # Install all needed packages in a special wheel cache directory
-/usr/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
+/usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"

 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
-
-OpenSSLVersion="$(openssl version |cut -b 9-14)"
-echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
-
--- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/04-p7zip.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/04-p7zip.sh
--- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/05-libclang.sh
--- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/40-install-cmake.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/40-install-cmake.sh
--- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/07-qnx_700.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/07-qnx_700.sh
--- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/08-integrity.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/08-integrity.sh
--- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/09-disable_selinux.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/09-disable_selinux.sh
--- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-install-openssl.sh
+++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-install-openssl.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -ex
+
+# shellcheck source=../common/unix/install-openssl.sh
+source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"
--- a/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/22-mqtt_broker.sh
+++ b/coin/provisioning/qtci-linux-CentOS-8.1-x86_64/22-mqtt_broker.sh
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Toni Saario	047db969c5	Add targets for qtsaferenderer Task-number: COIN-619 Change-Id: I928f297001d0cb0a9870cb81b78e927512fa19aa Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>	2020-11-18 11:23:45 +02:00
Qt Submodule Update Bot	9b43a43ee9	Update submodules on '5.15.2' in qt/qt5 Change-Id: I010fbaba7bd3e824ab7f5e57fb7bf08d3cb5a3dc Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2020-11-12 09:11:49 +00:00
Qt Submodule Update Bot	883da721db	Update submodules on '5.15.2' in qt/qt5 Change-Id: I9d04fa7f3e553e176607d36ba142763173d0c42c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2020-11-10 10:35:45 +00:00
Jani Heikkinen	3681c2e27f	Adjust submodule branches Change-Id: I35b0ba3e1f36c7475145bf2b8268b46f7e53ce25	2020-10-27 07:31:20 +02:00
Qt Submodule Update Bot	785c31d540	Update submodules on '5.15' in qt/qt5 Change-Id: I6760d2f4565b5dee849e01fed66ce7c7c48b4d88 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-10-24 23:45:48 +02:00
Qt Submodule Update Bot	6cccbc6f41	Update submodules on '5.15' in qt/qt5 Change-Id: Iacde75ce6765d73382c29135cce4cb064ee94ed0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-10-22 16:20:23 +02:00
Heikki Halmet	2f465dea43	Provisioning: Install colorlog Needed by packaging scripts Task-number: QTQAINFRA-3918 Change-Id: I30861ecb5f12f79683ad2fec58484b97dee31d7f Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `c053e70593`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2020-10-21 11:00:09 +00:00
Heikki Halmet	59a40d8a52	Provisioning: Enable access to SMB server Windows don't allow insecure guest login anymore by default. It need to be enabled through Group Policy restrictions Task-number: QTQAINFRA-3974 Change-Id: I5fd918882c51c01985cd4c1b9f9ed4dec62e07dd Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `90a6ab728f`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2020-10-20 14:39:09 +00:00
Qt Submodule Update Bot	bb5fb29f4e	Update submodules on '5.15' in qt/qt5 Change-Id: I1a8eb49540797c37ba8d4d4b059e17dd3bfea82e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-10-18 23:46:07 +02:00
Qt Submodule Update Bot	f218ac4598	Update submodules on '5.15' in qt/qt5 Change-Id: I6618a6e1d300ebbba74b76795b7838b6f7df30f8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-10-16 06:39:15 +02:00
Cristian Adam	5af2672a24	Qdoc_libclang: Install perl-Digest-MD5 While building Clang 11 for Qt the tests failed due to missing Perl Digest-MD5 package. Change-Id: Iba4156db65ec53bf465ca5b132e6983f1176bc41 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> (cherry picked from commit `9251571a53`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2020-10-16 03:59:59 +00:00
Qt Submodule Update Bot	b3326dc04e	Update submodules on '5.15' in qt/qt5 Change-Id: I05899504c6f14e733afaf66c6bc30c77ab609ce2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-10-14 07:27:47 +02:00
Qt Submodule Update Bot	91c229fc17	Update submodules on '5.15' in qt/qt5 Change-Id: I9503a6d07dca0610cba9714e9495101d5e9ecaed Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-10-11 23:45:45 +02:00
Qt Submodule Update Bot	5ea800dd4c	Update submodules on '5.15' in qt/qt5 Change-Id: I0342453e63cf0fd1d2462d8a2ea4ebf622699521 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2020-10-06 12:20:42 +00:00
Qt Submodule Update Bot	c4b34771c1	Update submodules on '5.15' in qt/qt5 Change-Id: Ica4575f85b5ca75a033bc5c4641f719f328ea756 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-10-05 06:38:03 +02:00
Heikki Halmet	7ccb74551d	Provisioning: Retry python installation if failure occurs Python installation is flaky and we haven't be able to determine the root cause for it. Re-running the installation might help. (Might) because we can't reproduce this manually. Task-number: QTQAINFRA-3875 Change-Id: Id46d250a02e01007f03dfbb886d75b23c23a6216 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit `6e3cb240df`) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2020-10-02 07:17:14 +03:00
Heikki Halmet	4c0af96f21	Provisioning: Install STM32CubeProgrammer This will install STM32CubeProgrammer to Windows 10 needed by MCU RTA Task-number: UL-3091 Change-Id: I97f7df33af9bf4c56849c1cf3c93b3a413ba6f44 Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> (cherry picked from commit `2076163c5e`) Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>	2020-10-02 07:17:13 +03:00
Heikki Halmet	1ba3cf2fc7	Provisioning: Install MCUXpresso MCUXpresso IDE provides the tools for flashing and onboard debugging Task-number: UL-3091 Change-Id: I05224af4ae7528f219f1b682ecd14bd0e331e3bf Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io> Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> (cherry picked from commit `08c253a625`)	2020-10-02 07:17:11 +03:00
Kai Koehne	b960dfbc7b	Change license of top-level configure, configure.bat The license should be GPLv3-EXCEPT, like for the same file in qtbase. Change-Id: I59c63c0a693394dc9f8de4706c2e113fe2ea4130 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit `0f7c2c3739`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2020-09-28 17:04:12 +00:00
Qt Submodule Update Bot	b19292f1bd	Update submodules on '5.15' in qt/qt5 Change-Id: I320620d033abe32e18a62af700cefa72c0b1bd81 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-09-27 23:45:47 +02:00
Qt Submodule Update Bot	6d73ff5b71	Update submodules on '5.15' in qt/qt5 Change-Id: I17eb658c678892ebd884781e6994bc7552ec469c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-09-22 23:46:10 +02:00
Heikki Halmet	9e99d5738c	Provisioning: Disable daily cron jobs from SLES 15 Task-number: QTQAINFRA-3919 Change-Id: Iabf03aeadb3f0fa7091428ef3ea6075b199d9c77 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `dd2111cf9f`) Reviewed-by: Toni Saario <toni.saario@qt.io>	2020-09-22 14:27:25 +03:00
Heikki Halmet	2498be2a3b	Provisioning: Disable btrfs balance jobs Btrfs use lot's of CPU while running Task-number: QTQAINFRA-3919 Change-Id: I08b89b57c92d90f752dde76375711e61ed173c2c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `51fc48896c`) Reviewed-by: Toni Saario <toni.saario@qt.io>	2020-09-22 14:27:23 +03:00
Heikki Halmet	11cd0f1d75	Provisioning: Disable fstrim.timer fstrim scans the filesystem and sends 'UNMAP' commands for each unused block it finds. Let's disable it so it won't cause unexpected situations. Task-number: QTQAINFRA-3919 Change-Id: I20c97441fd47728a3063ae50f87fe6347186bdbd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `031bc19ae6`) Reviewed-by: Toni Saario <toni.saario@qt.io>	2020-09-22 14:27:22 +03:00
Heikki Halmet	fdc7292c5b	Provisioning: Install Java for SLES 15 Java is needed by RTA jenkins Change-Id: Ibe6c7fa211eb83b431dc3ee79ed93300796154b0 Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `99a15a2cd4`)	2020-09-22 14:27:21 +03:00
Konstantin Tokarev	4c82f61c31	Provisioning: Update Conan to 1.29.0 Task-bumber: QTQAINFRA-3916 Change-Id: I52d8a0255efcc7b4b139ec5050cf3d59003f12a9 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit `f73fa57088`) Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>	2020-09-21 09:29:41 +03:00
Konstantin Tokarev	27d187eb32	Provisioning: Update Conan packages * Update libjpeg-turbo to 2.0.5 * Replace MinGW 7 packages with MinGW 8 * Remove zlib packages as Qt is consistently built with -qt-zlib now Task-bumber: QTQAINFRA-3916 Change-Id: Ie15bbb0f0f5b3a4c1a5d08f2341e9eb16a80cce7 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit `c79904c463`) Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>	2020-09-21 09:29:39 +03:00
Qt Submodule Update Bot	97af11bfa5	Update submodules on '5.15' in qt/qt5 Change-Id: Ia3a992b81c73fc9287576c253e2a92e615e67e90 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-09-20 23:45:48 +02:00
Qt Submodule Update Bot	cd7d035f8a	Update submodules on '5.15' in qt/qt5 Change-Id: Ie56e3f8aac83dd6f056eaeb9b0cc0709d8dcd98d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-09-15 23:46:36 +02:00
Qt Submodule Update Bot	2700d2aca5	Update submodules on '5.15' in qt/qt5 Change-Id: Ia53f99f6b57bb491047c95ebbbccf22ae4e4078e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-09-11 23:46:44 +02:00
Johanna Äijälä	784af12d4c	Provisioning: update Squish to 6.6.1 based on Qt5.15.0 Add Squish for Web installation, update Squish license. Pick-to:5.15 Change-Id: Id418830e82718afc20ac7390400342a6b0401a64 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit `91c267a677`) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2020-09-08 15:27:59 +00:00
Joerg Bornemann	ff8d920caf	Remove deprecated configure argument from CI configs The -no-qpa-platform-guard configure argument is deprecated and has no effect. Change-Id: I132ccdf036c52baf54cf0c789fa063cc0455ce09 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit `a42797851e`) Reviewed-by: Cristian Adam <cristian.adam@qt.io>	2020-09-07 15:20:31 +02:00
Qt Submodule Update Bot	090fbc691f	Update submodules on '5.15' in qt/qt5 Change-Id: Ia094dff2bce9392a6b6cd8e1786927f3fdede694 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-09-05 23:46:31 +02:00
Heikki Halmet	a1358676d3	Provisioning: Update Windows 10 x86_64 to version 2004 MSVC 2019 version 16.6.2 MSVC 2019 Build Tools version 16.6.2 Virtio driver Virtio Balloon driver NetKVM driver Task-number: QTQAINFRA-3818 Task-number: QTQAINFRA-3817 Change-Id: Id0edee66d4eb42730a70495dbb063a0d379f026c Reviewed-by: Toni Saario <toni.saario@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit `ba4eb4929e`) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2020-09-04 07:39:23 +03:00
Qt Submodule Update Bot	6f86671359	Update submodules on '5.15' in qt/qt5 Change-Id: I19c41cb4ace59485790a183b484d34cc955d1c94 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-08-30 23:46:35 +02:00
Heikki Halmet	33dd90348a	Provisioning: Upgrade GCC version from 9.2 to 9.3 Task-number: QTQAINFRA-3858 Change-Id: I5266162d1c144b117e3a61988f3348f2cd3d3c0a Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit `163c23f97c`) Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2020-08-27 15:47:23 +03:00
Heikki Halmet	8160e277be	Provisioning: Renew iPhone signing tools Task-number: QTQAINFRA-3434 Change-Id: I53665bf4e0799da7a23ba60aff37e26052d0374a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> (cherry picked from commit `c1b06ec3e5`) Reviewed-by: Simo Fält <simo.falt@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2020-08-27 15:41:54 +03:00
Qt Submodule Update Bot	f5e4c76634	Update submodules on '5.15' in qt/qt5 Change-Id: I45d11ab904a8cfe2ec2f18b477879f3f398da9fd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-08-26 23:46:55 +02:00
Qt Submodule Update Bot	f524b6a79d	Update submodules on '5.15' in qt/qt5 Change-Id: Ic44cdbb7948ddaa74d1ee561676f8298cacff400 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-08-20 13:50:24 +02:00
Tony Sarajärvi	e5488354ca	Enable autotests on SLES 15 and mark it insignificant Task-number: QTQAINFRA-2852 Task-number: QTQAINFRA-3872 Change-Id: I19fbd4907b3c3846c6eac245b48ff887015e5520 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io>	2020-08-19 07:30:49 +00:00
Qt Submodule Update Bot	27ffd5c6b2	Update submodules on '5.15' in qt/qt5 Change-Id: I4c68c3e5623145f217fa2d3572beeaaaa62c0efb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-08-06 06:02:28 +02:00
Qt Submodule Update Bot	b2ca6cf26b	Update submodules on '5.15' in qt/qt5 Change-Id: I5c9816e36ce8af564e3cedd42315b3a84341e486 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-08-05 06:50:12 +02:00
Simo Fält	49825be2dc	Provisioning: Fix PYTHON3_WHEEL_CACHE pointing to wrong dir Earlier we set the env variable point to latest Python install. It did work by accident, while the default python was installed as last. Now each python install has its own matching ENV variable that can be used buildtime. The PYTHON3_WHEEL_CACHE will now point to 64 bit default Python3, while the variable is already used in Qt codebase. Change-Id: I6a67936c06ed0209ef9e903120f2416aaa8eb3ff Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit `969acbce6e`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2020-07-30 20:40:42 +00:00
Qt Submodule Update Bot	8066f8ef9f	Update submodules on '5.15' in qt/qt5 Change-Id: Ia0b40c1573d9357fe7b927c92f425b5ddb6b7be4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-07-30 06:17:41 +02:00
Qt Submodule Update Bot	a8f008d5a5	Update submodules on '5.15' in qt/qt5 Change-Id: I77111de046ac4b5bef24a0eb09cb0eb4c3ecf39e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-07-28 23:46:18 +02:00
Qt Submodule Update Bot	8c7592b5c4	Update submodules on '5.15' in qt/qt5 Change-Id: I9ea6466cfc310be49b31a9bda80e4fb0434335c0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-07-27 23:46:28 +02:00
Qt Submodule Update Bot	c129f9983d	Update submodules on '5.15' in qt/qt5 Change-Id: Icfe485415e0e4309e65389e79fba92c725bebc3a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-07-26 23:45:56 +02:00
Toni Saario	44fe19f004	Provisioning: Add delay after network setting change In many cases without waiting, next script would be missing network and fails. Change-Id: Iab50945716860618b495029ce179183d844dc98a Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `3271bb2fe2`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2020-07-22 09:28:45 +00:00
Simo Fält	b6363e91e9	Provisioning: Fix Python3 install in 32 bit win10 There is no 32 bit win10 configurations in CI, so we do not verify any of the provisioning changes on it. Change-Id: I1c1e183908ffb09be4e2992ccbd1da7af2640181 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit `bdea3c8164`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2020-07-21 07:49:43 +00:00
Qt Submodule Update Bot	ac1bc46838	Update submodules on '5.15' in qt/qt5 Change-Id: Iab2c72e5478cca49622c4c32803a4c252cb051fc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-07-20 23:46:00 +02:00
Qt Submodule Update Bot	9972ae9fb6	Update submodules on '5.15' in qt/qt5 Change-Id: Ic0b50278e902cc323f154d4d57be6e5de16f7742 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-07-18 23:47:04 +02:00
Qt Submodule Update Bot	93a2636e0f	Update submodules on '5.15' in qt/qt5 Change-Id: I68ecb37a35622c14aea12aac3a32e5ed9f15f764 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-07-17 23:46:34 +02:00
Simo Fält	5442f9a23a	Provisioning: Fix Python3 install PS script usage Change-Id: I843c861804cf70b91553fac680797550a4f4af64 Reviewed-by: Toni Saario <toni.saario@qt.io>	2020-07-17 10:36:04 +03:00
Simo Fält	7339218edd	Provisioning: Install Python 3.8 for testing Qt for Python This installs Python 3.8.1 to be used with Qt for Python. It keeps the old 3.6 as a default python3. Change-Id: I8ea121514f6a4092f700688363c282cbea37a75b Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit `607b33aab2`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2020-07-17 10:35:58 +03:00
Qt Submodule Update Bot	73765a6885	Update submodules on '5.15' in qt/qt5 Change-Id: Ifd9cc2d935c93978ae6e2d115dfc184bb02af4b2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-07-16 23:46:32 +02:00
Qt Submodule Update Bot	093f748d82	Update submodules on '5.15' in qt/qt5 Change-Id: I7279bdd01f6cb8017ce6e07d7f5dd687ea26d7b6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-07-16 23:07:45 +02:00
Qt Submodule Update Bot	f399972a0d	Update submodules on '5.15' in qt/qt5 Change-Id: I00030b79499d047c86c451b1151e13745a76102a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-07-10 18:47:06 +02:00
Qt Submodule Update Bot	192bd350fb	Update submodules on '5.15' in qt/qt5 Change-Id: Ifb0cc0c2a50d82661972861d80b447fb80c92706 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2020-07-07 12:50:24 +02:00
Liang Qi	7585da561e	Update submodules on '5.15' in qt/qt5 Change-Id: I19249b4e49018d054a05a247abc44ecd3232821e Reviewed-by: Liang Qi <liang.qi@qt.io>	2020-07-06 08:51:12 +02:00