Update submodules on '6.3 in qt/qt5'

Change-Id: Ia4019f891a5da5d2f97d917f7845c32eff6b3184 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
CMake: Fix linux static tests config to actually run
2026-01-02 05:07:26 +08:00 · 2022-01-31 22:35:12 +00:00 · 2022-01-31 17:57:27 +00:00 · 2022-01-30 05:13:14 +00:00 · 2022-01-30 05:13:05 +00:00 · 2022-01-30 05:12:58 +00:00
606 changed files with 2528 additions and 8997 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,53 +1,53 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.4
+	branch = 6.3
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.4
+	branch = 6.3
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
-	recommends = qtdeclarative qtquick3d
+	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.4
+	branch = 6.3
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = dev
+	branch = 6.3
 	status = ignore
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.4
+	branch = 6.3
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.4
+	branch = 6.3
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -76,21 +76,21 @@
 	recommends = qtdeclarative
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = dev
+	branch = 6.3
 	status = ignore
 [submodule "qtpositioning"]
 	depends = qtbase
 	recommends = qtdeclarative qtserialport
 	path = qtpositioning
 	url = ../qtpositioning.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,203 +117,189 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = dev
+	branch = 6.3
 	status = ignore
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = dev
+	branch = 6.3
 	status = ignore
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.4
-	status = addon
+	branch = 6.3
+	status = ignore
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = dev
+	branch = 6.3
 	status = ignore
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.4
+	branch = 6.3
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.4
+	branch = 6.3
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.4
+	branch = 6.3
 	status = preview
-[submodule "qthttpserver"]
-	depends = qtbase
-	recommends = qtwebsockets
-	path = qthttpserver
-	url = ../qthttpserver.git
-	branch = 6.4
-	status = preview
-[submodule "qtquick3dphysics"]
-	depends = qtbase qtdeclarative qtquick3d qtshadertools
-	path = qtquick3dphysics
-	url = ../qtquick3dphysics.git
-	branch = 6.4
-	status = preview
-
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,10 +2,6 @@
 # 3.16 is the absolute minimum though.
 cmake_minimum_required(VERSION 3.16...3.20)

-
-# set QT_SUPERBUILD early, so that qtbase/.cmake.conf can check it
-set(QT_SUPERBUILD TRUE)
-
 # Include qtbase's .cmake.conf for access to QT_REPO_MODULE_VERSION
 set(__qt6_qtbase_src_path "${CMAKE_CURRENT_SOURCE_DIR}/qtbase")
 include("${__qt6_qtbase_src_path}/.cmake.conf")
@@ -41,6 +37,7 @@ include(ECMOptionalAddSubdirectory)
 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 QT_BUILD_SUBMODULES)
@@ -52,15 +49,16 @@ if(NOT QT_BUILD_SUBMODULES)
 endif()
 set(QT_BUILD_SUBMODULES "${QT_BUILD_SUBMODULES}" CACHE STRING "Submodules to build")

-qt_internal_sort_module_dependencies("${QT_BUILD_SUBMODULES}" QT_BUILD_SUBMODULES)
+set(qt_module_dependency_map_prefix "__qt_module_dependencies_")
+qt_internal_sort_module_dependencies("${QT_BUILD_SUBMODULES}" QT_BUILD_SUBMODULES
+                                     "${qt_module_dependency_map_prefix}")

 foreach(module IN LISTS QT_BUILD_SUBMODULES)
    # Check for unmet dependencies
    if(NOT DEFINED BUILD_${module} OR BUILD_${module})
-        message(NOTICE "Checking dependencies of submodule '${module}'")
+        message(NOTICE "Checking dependencies of '${module}'")
        get_property(required_deps GLOBAL PROPERTY QT_REQUIRED_DEPS_FOR_${module})
-        get_property(dependencies GLOBAL PROPERTY QT_DEPS_FOR_${module})
-        foreach(dep IN LISTS dependencies)
+        foreach(dep IN LISTS "${qt_module_dependency_map_prefix}${module}")
            if (dep STREQUAL "qtbase")
                # Always available skip
                continue()
@@ -93,12 +91,12 @@ foreach(module IN LISTS QT_BUILD_SUBMODULES)
 endforeach()

 foreach(module IN LISTS QT_BUILD_SUBMODULES)
-    message(NOTICE "Configuring submodule '${module}'")
+    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}/${INSTALL_LIBDIR}/cmake")
+            list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/lib/cmake")
            list(APPEND CMAKE_FIND_ROOT_PATH "${QtBase_BINARY_DIR}")
        endif()
    endif()
--- a/LICENSE.QT-LICENSE-AGREEMENT
+++ b/LICENSE.QT-LICENSE-AGREEMENT
--- a/12
+++ b/12
@@ -20,10 +20,9 @@ ColumnLimit: 100
 # How much weight do extra characters after the line length limit have.
 # PenaltyExcessCharacter: 4

-# Disable reflow of some specific comments
-# qdoc comments: indentation rules are different.
-# Translation comments and SPDX license identifiers are also excluded.
-CommentPragmas: "^!|^:|^ SPDX-License-Identifier:"
+# Disable reflow of qdoc comments: indentation rules are different.
+# Translation comments are also excluded.
+CommentPragmas: "^!|^:"

 # We want a space between the type and the star for pointer types.
 PointerBindsToType: false
@@ -84,8 +83,3 @@ ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCH

 # Break constructor initializers before the colon and after the commas.
 BreakConstructorInitializers: BeforeColon
-
-# Avoids the addition of a space between an identifier and the
-# initializer list in list-initialization.
-SpaceBeforeCpp11BracedList: false
-
--- a/cmake/QtSynchronizeRepo.cmake
+++ b/cmake/QtSynchronizeRepo.cmake
@@ -1,7 +1,3 @@
-# This script is to be called (ideally from a git-sync-to alias script):
-#     cmake -DSYNC_TO_MODULE="$1" -DSYNC_TO_BRANCH="$2" -P cmake/QtSynchronizeRepo.cmake
-
-cmake_policy(VERSION 3.16)
 include(cmake/QtTopLevelHelpers.cmake)

 qt_internal_sync_to(${SYNC_TO_MODULE} ${SYNC_TO_BRANCH})
--- a/cmake/QtTopLevelHelpers.cmake
+++ b/cmake/QtTopLevelHelpers.cmake
@@ -14,7 +14,7 @@ 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/required
+# Each entry will be in the format dependency/sha1
 function(qt_internal_parse_dependencies depends_file out_dependencies)
    file(STRINGS "${depends_file}" lines)
    set(eof_marker "---EOF---")
@@ -47,179 +47,91 @@ function(qt_internal_parse_dependencies depends_file out_dependencies)
            string(TOUPPER "${CMAKE_MATCH_1}" required)
        endif()
    endforeach()
-    message(DEBUG
-        "qt_internal_parse_dependencies for ${depends_file}\n    dependencies: ${dependencies}")
+    message(DEBUG "qt_internal_parse_dependencies for ${depends_file}: ${dependencies} ${revisions}")
    set(${out_dependencies} "${dependencies}" PARENT_SCOPE)
 endfunction()

-# Helper macro for qt_internal_resolve_module_dependencies.
-macro(qt_internal_resolve_module_dependencies_set_skipped value)
-    if(DEFINED arg_SKIPPED_VAR)
-        set(${arg_SKIPPED_VAR} ${value} PARENT_SCOPE)
-    endif()
-endmacro()
-
-# Strips tqtc- prefix from a repo name.
-function(qt_internal_normalize_repo_name repo_name out_var)
-    string(REGEX REPLACE "^tqtc-" "" normalized "${repo_name}")
-    set(${out_var} "${normalized}" PARENT_SCOPE)
-endfunction()
-
-# Checks if a directory with the given repo name exists in the current
-# source / working directory. If it doesn't, it strips the tqtc- prefix.
-function(qt_internal_use_normalized_repo_name_if_needed repo_name out_var)
-    set(base_dir "${CMAKE_CURRENT_SOURCE_DIR}")
-    set(repo_dir "${base_dir}/${repo_name}")
-    if(NOT IS_DIRECTORY "${repo_dir}")
-        qt_internal_normalize_repo_name("${repo_name}" repo_name)
-    endif()
-    set(${out_var} "${repo_name}" PARENT_SCOPE)
-endfunction()
-
-
-# Resolve the dependencies of the given module.
-# "Module" in the sense of Qt repository.
-#
-# Side effects: Sets the global properties QT_DEPS_FOR_${module} and QT_REQUIRED_DEPS_FOR_${module}
-# with the direct (required) dependencies of module.
-#
-#
-# Positional arguments:
-#
-# module is the Qt repository.
-#
-# out_ordered is where the result is stored. This is a list of all dependencies, including
-# transitive ones, in topologically sorted order. Note that ${module} itself is also part of
-# out_ordered.
-#
-# out_revisions is a list of git commit IDs for each of the dependencies in ${out_ordered}. This
-# list has the same length as ${out_ordered}.
-#
-#
-# Keyword arguments:
-#
-# PARSED_DEPENDENCIES is a list of dependencies of module in the format that
-# qt_internal_parse_dependencies returns. If this argument is not provided, dependencies.yaml of the
-# module is parsed.
-#
-# IN_RECURSION is an internal option that is set when the function is in recursion.
-#
-# REVISION is an internal value with the git commit ID that belongs to ${module}.
-#
-# SKIPPED_VAR is an output variable name that is set to TRUE if the module was skipped, to FALSE
-# otherwise.
-#
-# NORMALIZE_REPO_NAME_IF_NEEDED Will remove 'tqtc-' from the beginning of submodule dependencies
-# if a tqtc- named directory does not exist.
-function(qt_internal_resolve_module_dependencies module out_ordered out_revisions)
-    set(options IN_RECURSION NORMALIZE_REPO_NAME_IF_NEEDED)
-    set(oneValueArgs REVISION SKIPPED_VAR)
-    set(multiValueArgs PARSED_DEPENDENCIES)
-    cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    # Clear the property that stores the repositories we've already seen.
-    if(NOT arg_IN_RECURSION)
-        set_property(GLOBAL PROPERTY _qt_internal_seen_repos)
-    endif()
-
-    # Bail out if we've seen the module already.
-    qt_internal_resolve_module_dependencies_set_skipped(FALSE)
-    get_property(seen GLOBAL PROPERTY _qt_internal_seen_repos)
-    if(module IN_LIST seen)
-        qt_internal_resolve_module_dependencies_set_skipped(TRUE)
+# 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_property(GLOBAL APPEND PROPERTY _qt_internal_seen_repos ${module})
-
-    # Set a default REVISION.
-    if("${arg_REVISION}" STREQUAL "")
-        set(arg_REVISION HEAD)
+    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()
-
-    # Retrieve the dependencies.
-    if(DEFINED arg_PARSED_DEPENDENCIES)
-        set(dependencies "${arg_PARSED_DEPENDENCIES}")
-    else()
-        set(depends_file "${CMAKE_CURRENT_SOURCE_DIR}/${module}/dependencies.yaml")
-        set(dependencies "")
-        if(EXISTS "${depends_file}")
-            qt_internal_parse_dependencies("${depends_file}" dependencies)
-        endif()
-    endif()
-
-    # Traverse the dependencies.
-    set(ordered)
-    set(revisions)
+    set(modules_dependencies "")
    foreach(dependency IN LISTS dependencies)
        if(dependency MATCHES "(.*)/([^/]+)/([^/]+)")
            set(dependency "${CMAKE_MATCH_1}")
            set(revision "${CMAKE_MATCH_2}")
            set(required "${CMAKE_MATCH_3}")
+            if(required)
+                set_property(GLOBAL APPEND PROPERTY QT_REQUIRED_DEPS_FOR_${module} ${dependency})
+            endif()
        else()
            message(FATAL_ERROR "Internal Error: wrong dependency format ${dependency}")
        endif()
-
-        set(normalize_arg "")
-        if(arg_NORMALIZE_REPO_NAME_IF_NEEDED)
-            qt_internal_use_normalized_repo_name_if_needed("${dependency}" dependency)
-            set(normalize_arg "NORMALIZE_REPO_NAME_IF_NEEDED")
-        endif()
-
-        set_property(GLOBAL APPEND PROPERTY QT_DEPS_FOR_${module} ${dependency})
-        if(required)
-            set_property(GLOBAL APPEND PROPERTY QT_REQUIRED_DEPS_FOR_${module} ${dependency})
-        endif()
-
-        qt_internal_resolve_module_dependencies(${dependency} dep_ordered dep_revisions
-            REVISION "${revision}"
-            SKIPPED_VAR skipped
-            IN_RECURSION
-            ${normalize_arg}
-        )
-        if(NOT skipped)
-            list(APPEND ordered ${dep_ordered})
-            list(APPEND revisions ${dep_revisions})
+        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()
-
-    list(APPEND ordered ${module})
-    list(APPEND revisions ${arg_REVISION})
    set(${out_ordered} "${ordered}" PARENT_SCOPE)
+    set(${out_module_dependencies} ${${out_module_dependencies}} ${modules_dependencies} PARENT_SCOPE)
    set(${out_revisions} "${revisions}" PARENT_SCOPE)
 endfunction()

-# Resolves the dependencies of the given modules.
-# "Module" is here used in the sense of Qt repository.
-#
-# Returns all dependencies, including transitive ones, in topologically sorted order.
-#
-# Arguments:
-# modules is the initial list of repos.
-# out_all_ordered is the variable name where the result is stored.
-#
-# See qt_internal_resolve_module_dependencies for side effects.
-function(qt_internal_sort_module_dependencies modules out_all_ordered)
-
-    # Create a fake repository "all_selected_repos" that has all repositories from the input as
-    # required dependency. The format must match what qt_internal_parse_dependencies produces.
-    set(all_selected_repos_as_parsed_dependencies)
+# 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)
-        list(APPEND all_selected_repos_as_parsed_dependencies "${module}/HEAD/FALSE")
+        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}")
+        else()
+            set(ordered "${out_ordered}")
+        endif()
    endforeach()
-
-    qt_internal_resolve_module_dependencies(all_selected_repos ordered unused_revisions
-        PARSED_DEPENDENCIES ${all_selected_repos_as_parsed_dependencies}
-        NORMALIZE_REPO_NAME_IF_NEEDED
-    )
-
-    # Drop "all_selected_repos" from the output. It depends on all selected repos, thus it must be
-    # the last element in the topologically sorted list.
-    list(REMOVE_AT ordered -1)
-
-    message(DEBUG
-        "qt_internal_sort_module_dependencies
-    input modules: ${modules}\n    topo-sorted:   ${ordered}")
+    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()

@@ -356,17 +268,6 @@ function(qt_internal_sync_to module)
    endif()
    qt_internal_checkout("${module}" "${revision}")

-    qt_internal_resolve_module_dependencies(${module} initial_dependencies initial_revisions)
-    if(initial_dependencies)
-        foreach(dependency ${initial_dependencies})
-            if(dependency MATCHES "^tqtc-")
-                message(WARNING
-                    "Handling of tqtc- repos will likely fail. Fixing this is non-trivial.")
-                break()
-            endif()
-        endforeach()
-    endif()
-
    set(revision "")
    set(checkedout "1")
    # Load all dependencies for $module, then iterate over the dependencies in reverse order,
@@ -374,16 +275,19 @@ function(qt_internal_sync_to module)
    # Repeat everything (we need to reload dependencies after each checkout) until no more checkouts
    # are done.
    while(${checkedout})
-        qt_internal_resolve_module_dependencies(${module} dependencies revisions)
+        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}")

-        list(LENGTH dependencies count)
-        if (count EQUAL "0")
+        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 )
--- a/coin/conan/profiles/baseprofiles/android-arm64-clang
+++ b/coin/conan/profiles/baseprofiles/android-arm64-clang
@@ -1,10 +0,0 @@
-[settings]
-    os=Android
-    os.api_level=8
-    arch=armv8
-    compiler=clang
-    compiler.version=11
-    compiler.libcxx=c++_shared
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/android-armv7-clang
+++ b/coin/conan/profiles/baseprofiles/android-armv7-clang
@@ -1,10 +0,0 @@
-[settings]
-    os=Android
-    os.api_level=8
-    arch=armv7
-    compiler=clang
-    compiler.version=11
-    compiler.libcxx=c++_shared
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/android-x86-clang
+++ b/coin/conan/profiles/baseprofiles/android-x86-clang
@@ -1,10 +0,0 @@
-[settings]
-    os=Android
-    os.api_level=8
-    arch=x86
-    compiler=clang
-    compiler.version=11
-    compiler.libcxx=c++_shared
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/android-x86_64-clang
+++ b/coin/conan/profiles/baseprofiles/android-x86_64-clang
@@ -1,10 +0,0 @@
-[settings]
-    os=Android
-    os.api_level=8
-    arch=x86_64
-    compiler=clang
-    compiler.version=11
-    compiler.libcxx=c++_shared
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/linux-webassembly-x86_64-clang
+++ b/coin/conan/profiles/baseprofiles/linux-webassembly-x86_64-clang
@@ -1,9 +0,0 @@
-[settings]
-    os=Emscripten
-    arch=wasm
-    compiler=clang
-    compiler.version=10
-    compiler.libcxx=libstdc++
-    build_type=Release
-[options]
-*:shared=False
--- a/coin/conan/profiles/baseprofiles/linux-x86_64-gcc
+++ b/coin/conan/profiles/baseprofiles/linux-x86_64-gcc
@@ -1,9 +0,0 @@
-[settings]
-    os=Linux
-    arch=x86_64
-    compiler=gcc
-    compiler.version=9.3
-    compiler.libcxx=libstdc++11
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/linux-x86_64-gcc-debug-developer
+++ b/coin/conan/profiles/baseprofiles/linux-x86_64-gcc-debug-developer
@@ -1,9 +0,0 @@
-[settings]
-    os=Linux
-    arch=x86_64
-    compiler=gcc
-    compiler.version=9.3
-    compiler.libcxx=libstdc++11
-    build_type=Debug
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/macos-ios-arm64-clang
+++ b/coin/conan/profiles/baseprofiles/macos-ios-arm64-clang
@@ -1,10 +0,0 @@
-[settings]
-    os=iOS
-    os.version=13.0
-    arch=armv8
-    compiler=apple-clang
-    compiler.version=11.0
-    compiler.libcxx=libc++
-    build_type=Release
-[options]
-*:shared=False
--- a/coin/conan/profiles/baseprofiles/macos-universal-clang
+++ b/coin/conan/profiles/baseprofiles/macos-universal-clang
@@ -1,10 +0,0 @@
-[settings]
-    os=Macos
-    os.version=11.0
-    arch=x86_64
-    compiler=apple-clang
-    compiler.version=12.0
-    compiler.libcxx=libc++
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/macos-webassembly-x86_64-clang
+++ b/coin/conan/profiles/baseprofiles/macos-webassembly-x86_64-clang
@@ -1,9 +0,0 @@
-[settings]
-    os=Emscripten
-    arch=wasm
-    compiler=clang
-    compiler.version=10
-    compiler.libcxx=libstdc++
-    build_type=Release
-[options]
-*:shared=False
--- a/coin/conan/profiles/baseprofiles/windows-arm64-msvc2019_64
+++ b/coin/conan/profiles/baseprofiles/windows-arm64-msvc2019_64
@@ -1,11 +0,0 @@
-[settings]
-    os=Windows
-    arch=armv8
-    compiler=msvc
-    compiler.version=19.28
-    compiler.cppstd=17
-    compiler.runtime=dynamic
-    compiler.runtime_type=Release
-    build_type=Release
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/windows-webassembly-x86_64-clang
+++ b/coin/conan/profiles/baseprofiles/windows-webassembly-x86_64-clang
@@ -1,9 +0,0 @@
-[settings]
-    os=Emscripten
-    arch=wasm
-    compiler=clang
-    compiler.version=10
-    compiler.libcxx=libstdc++
-    build_type=RelWithDebInfo
-[options]
-*:shared=False
--- a/coin/conan/profiles/baseprofiles/windows-x86_64-mingw
+++ b/coin/conan/profiles/baseprofiles/windows-x86_64-mingw
@@ -1,9 +0,0 @@
-[settings]
-    os=Windows
-    arch=x86_64
-    compiler=gcc
-    compiler.version=11
-    compiler.libcxx=libstdc++
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/windows-x86_64-msvc2019_64
+++ b/coin/conan/profiles/baseprofiles/windows-x86_64-msvc2019_64
@@ -1,11 +0,0 @@
-[settings]
-    os=Windows
-    arch=x86_64
-    compiler=msvc
-    compiler.version=19.28
-    compiler.cppstd=17
-    compiler.runtime=dynamic
-    compiler.runtime_type=Release
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/baseprofiles/windows-x86_64-msvc2019_64-developer
+++ b/coin/conan/profiles/baseprofiles/windows-x86_64-msvc2019_64-developer
@@ -1,11 +0,0 @@
-[settings]
-    os=Windows
-    arch=x86_64
-    compiler=msvc
-    compiler.version=19.28
-    compiler.cppstd=17
-    compiler.runtime=dynamic
-    compiler.runtime_type=Release
-    build_type=RelWithDebInfo
-[options]
-*:shared=True
--- a/coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer
+++ b/coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer
@@ -1,4 +1,4 @@
-include(./linux-x86_64-gcc-debug-developer)
+include(linux-developer-x86_64-gcc)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-linux-webassembly-x86_64-clang
+++ b/coin/conan/profiles/ci-linux-webassembly-x86_64-clang
@@ -1,4 +1,4 @@
-include(./linux-webassembly-x86_64-clang)
+include(linux-webassembly-x86_64-gcc)

 [options]
 qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-linux-x86_64-gcc
+++ b/coin/conan/profiles/ci-linux-x86_64-gcc
@@ -1,6 +1,6 @@
-include(./linux-x86_64-gcc)
+include(linux-x86_64-gcc)

 [options]
-qtbase:headersclean=True
+qtbase:headersclean=yes
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOpenGL_GL_PREFERENCE=LEGACY -DFEATURE_system_harfbuzz=OFF -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
 *:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-macos-ios-arm64-clang
+++ b/coin/conan/profiles/ci-macos-ios-arm64-clang
@@ -1 +1 @@
-include(./macos-ios-arm64-clang)
+include(macos-ios-arm64-clang)
--- a/coin/conan/profiles/ci-macos-universal-clang
+++ b/coin/conan/profiles/ci-macos-universal-clang
@@ -1,6 +1,6 @@
-include(./macos-universal-clang)
+include(macos-universal-clang)

 [options]
-qtbase:headersclean=True
+qtbase:headersclean=yes
 qtbase:cmake_args_qtbase='-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT=$POSTGRESQLBINPATH/..'
 *:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-macos-webassembly-x86_64-clang
+++ b/coin/conan/profiles/ci-macos-webassembly-x86_64-clang
@@ -1,5 +0,0 @@
-include(./macos-webassembly-x86_64-clang)
-
-[options]
-qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
-*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-unix-android-arm64-clang
+++ b/coin/conan/profiles/ci-unix-android-arm64-clang
@@ -1,4 +1,4 @@
-include(./android-arm64-clang)
+include(unix-android-arm64-clang)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-unix-android-armv7-clang
+++ b/coin/conan/profiles/ci-unix-android-armv7-clang
@@ -1,4 +1,4 @@
-include(./android-armv7-clang)
+include(unix-android-armv7-clang)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-unix-android-x86-clang
+++ b/coin/conan/profiles/ci-unix-android-x86-clang
@@ -1,4 +1,4 @@
-include(./android-x86-clang)
+include(unix-android-x86-clang)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-unix-android-x86_64-clang
+++ b/coin/conan/profiles/ci-unix-android-x86_64-clang
@@ -1,4 +1,4 @@
-include(./android-x86_64-clang)
+include(unix-android-x86_64-clang)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-windows-android-arm64-clang
+++ b/coin/conan/profiles/ci-windows-android-arm64-clang
@@ -1,4 +1,4 @@
-include(./android-arm64-clang)
+include(windows-android-arm64-clang)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-windows-android-armv7-clang
+++ b/coin/conan/profiles/ci-windows-android-armv7-clang
@@ -1,4 +1,4 @@
-include(./android-armv7-clang)
+include(windows-android-armv7-clang)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-windows-android-x86-clang
+++ b/coin/conan/profiles/ci-windows-android-x86-clang
@@ -1,4 +1,4 @@
-include(./android-x86-clang)
+include(windows-android-x86-clang)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-windows-android-x86_64-clang
+++ b/coin/conan/profiles/ci-windows-android-x86_64-clang
@@ -1,4 +1,4 @@
-include(./android-x86_64-clang)
+include(windows-android-x86_64-clang)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-windows-arm64-msvc2019_64
+++ b/coin/conan/profiles/ci-windows-arm64-msvc2019_64
@@ -1,4 +1,4 @@
-include(./windows-arm64-msvc2019_64)
+include(windows-arm64-msvc2019_64)

 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_msvc_obj_debug_info=ON"
 *:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-windows-webassembly-x86_64-clang
+++ b/coin/conan/profiles/ci-windows-webassembly-x86_64-clang
@@ -1,5 +0,0 @@
-include(./windows-webassembly-x86_64-clang)
-
-[options]
-qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
-*:cmake_args_leaf_module="-DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
--- a/coin/conan/profiles/ci-windows-x86_64-mingw
+++ b/coin/conan/profiles/ci-windows-x86_64-mingw
@@ -1,4 +1,4 @@
-include(./windows-x86_64-mingw)
+include(windows-x86_64-mingw)

 [options]
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_INCLUDE_x64%\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT=%POSTGRESQL_LIB_x64%\.."
--- a/coin/conan/profiles/ci-windows-x86_64-msvc2019_64
+++ b/coin/conan/profiles/ci-windows-x86_64-msvc2019_64
@@ -1,7 +1,7 @@
-include(./windows-x86_64-msvc2019_64)
+include(windows-x86_64-msvc2019_64)

 [options]
-qtbase:headersclean=True
+qtbase:headersclean=yes
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR=%OPENSSL_INCLUDE_x64%\.. -DPostgreSQL_ROOT=%POSTGRESQL_LIB_x64%\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
 *:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

--- a/coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer
+++ b/coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer
@@ -1,7 +0,0 @@
-include(./windows-x86_64-msvc2019_64-developer)
-
-[options]
-qtbase:headersclean=True
-qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR=%OPENSSL_INCLUDE_x64%\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
-*:cmake_args_leaf_module="-DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
-
--- a/coin/conan/profiles/linux-developer-x86_64-gcc
+++ b/coin/conan/profiles/linux-developer-x86_64-gcc
@@ -0,0 +1,17 @@
+[settings]
+    os=Linux
+    arch=x86_64
+    compiler=gcc
+    compiler.version=9.3
+    compiler.libcxx=libstdc++11
+    build_type=Release
+[options]
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:nomake=tests;examples
+qtbase:developer_build=yes
+qtbase:cmake_args_qtbase=""
+*:cmake_args_leaf_module=""
+[build_requires]
+[env]
+CONAN_CMAKE_GENERATOR=Ninja
--- a/coin/conan/profiles/linux-webassembly-x86_64-clang
+++ b/coin/conan/profiles/linux-webassembly-x86_64-clang
@@ -1,11 +0,0 @@
-include(baseprofiles/linux-webassembly-x86_64-clang)
-
-[options]
-qtbase:release=True
-qtbase:qt_host_path=$QT_HOST_PATH
-qtbase:nomake=examples;tests
-qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten"
-*:cmake_args_leaf_module=""
-[build_requires]
-[env]
-CONAN_CMAKE_GENERATOR=Ninja
--- a/coin/conan/profiles/macos-webassembly-x86_64-clang
+++ b/coin/conan/profiles/macos-webassembly-x86_64-clang
@@ -1,9 +1,16 @@
-include(baseprofiles/macos-webassembly-x86_64-clang)
-
+[settings]
+    os=Emscripten
+    arch=wasm
+    compiler=clang
+    compiler.version=10
+    compiler.libcxx=libstdc++
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
+qtbase:release=yes
+qtbase:shared=no
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:nomake=examples;tests
+qtbase:force_debug_info=yes
 qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten"
 *:cmake_args_leaf_module=""
 [build_requires]
--- a/coin/conan/profiles/linux-x86_64-gcc
+++ b/coin/conan/profiles/linux-x86_64-gcc
@@ -1,17 +1,22 @@
-include(baseprofiles/linux-x86_64-gcc)
-
+[settings]
+    os=Linux
+    arch=x86_64
+    compiler=gcc
+    compiler.version=9.3
+    compiler.libcxx=libstdc++11
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
+qtbase:release=yes
+qtbase:shared=yes
 qtbase:nomake=tests;examples
-qtbase:separate_debug_info=True
-qtbase:force_debug_info=True
-qtbase:bundled_xcb_xinput=True
-qtbase:libudev=False
+qtbase:separate_debug_info=yes
+qtbase:force_debug_info=yes
+qtbase:bundled_xcb_xinput=yes
+qtbase:libudev=no
 qtbase:doubleconversion=qt
 qtbase:pcre=qt
 qtbase:libjpeg=qt
 qtbase:libpng=qt
-qtbase:icu=True
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOpenGL_GL_PREFERENCE=LEGACY -DFEATURE_system_harfbuzz=OFF"
 *:cmake_args_leaf_module=""
 [build_requires]
--- a/coin/conan/profiles/linux-x86_64-gcc-debug-developer
+++ b/coin/conan/profiles/linux-x86_64-gcc-debug-developer
@@ -1,11 +0,0 @@
-include(baseprofiles/linux-x86_64-gcc-debug-developer)
-
-[options]
-qtbase:debug=True
-qtbase:nomake=tests;examples
-qtbase:developer_build=True
-qtbase:cmake_args_qtbase=""
-*:cmake_args_leaf_module=""
-[build_requires]
-[env]
-CONAN_CMAKE_GENERATOR=Ninja
--- a/coin/conan/profiles/macos-ios-arm64-clang
+++ b/coin/conan/profiles/macos-ios-arm64-clang
@@ -1,11 +1,17 @@
-include(baseprofiles/macos-ios-arm64-clang)
-
+[settings]
+    os=iOS
+    os.version=13.0
+    arch=armv8
+    compiler=apple-clang
+    compiler.version=11.0
+    compiler.libcxx=libc++
+    build_type=Release
 [options]
-qtbase:debug_and_release=True
+qtbase:shared=no
+qtbase:debug_and_release=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_SYSTEM_NAME=iOS"
-*:cmake_args_leaf_module=""
 [build_requires]
 [env]
 CONAN_CMAKE_GENERATOR=Ninja
--- a/coin/conan/profiles/macos-universal-clang
+++ b/coin/conan/profiles/macos-universal-clang
@@ -1,11 +1,18 @@
-include(baseprofiles/macos-universal-clang)
-
+[settings]
+    os=Macos
+    os.version=11.0
+    arch=x86_64
+    compiler=apple-clang
+    compiler.version=12.0
+    compiler.libcxx=libc++
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
+qtbase:release=yes
+qtbase:shared=yes
 qtbase:nomake=examples;tests
-qtbase:force_debug_info=True
-qtbase:separate_debug_info=True
-qtbase:framework=True
+qtbase:force_debug_info=yes
+qtbase:separate_debug_info=yes
+qtbase:framework=yes
 qtbase:cmake_args_qtbase='-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DODBC_ROOT=/usr/local/opt/libiodbc'
 *:cmake_args_leaf_module=""
 [build_requires]
--- a/coin/conan/profiles/unix-android-arm64-clang
+++ b/coin/conan/profiles/unix-android-arm64-clang
@@ -1,8 +1,15 @@
-include(baseprofiles/unix-android-arm64-clang)
-
+[settings]
+    os=Android
+    os.api_level=8
+    arch=armv8
+    compiler=clang
+    compiler.version=11
+    compiler.libcxx=c++_shared
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:force_debug_info=True
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:platform=android-clang
--- a/coin/conan/profiles/unix-android-armv7-clang
+++ b/coin/conan/profiles/unix-android-armv7-clang
@@ -1,8 +1,15 @@
-include(baseprofiles/unix-android-armv7-clang)
-
+[settings]
+    os=Android
+    os.api_level=8
+    arch=armv7
+    compiler=clang
+    compiler.version=11
+    compiler.libcxx=c++_shared
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:force_debug_info=True
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:platform=android-clang
--- a/coin/conan/profiles/unix-android-x86-clang
+++ b/coin/conan/profiles/unix-android-x86-clang
@@ -1,8 +1,15 @@
-include(baseprofiles/unix-android-x86-clang)
-
+[settings]
+    os=Android
+    os.api_level=8
+    arch=x86
+    compiler=clang
+    compiler.version=11
+    compiler.libcxx=c++_shared
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:force_debug_info=True
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:platform=android-clang
--- a/coin/conan/profiles/unix-android-x86_64-clang
+++ b/coin/conan/profiles/unix-android-x86_64-clang
@@ -1,8 +1,15 @@
-include(baseprofiles/unix-android-x86_64-clang)
-
+[settings]
+    os=Android
+    os.api_level=8
+    arch=x86_64
+    compiler=clang
+    compiler.version=11
+    compiler.libcxx=c++_shared
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:force_debug_info=True
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:platform=android-clang
--- a/coin/conan/profiles/windows-android-arm64-clang
+++ b/coin/conan/profiles/windows-android-arm64-clang
@@ -1,9 +1,16 @@
-include(baseprofiles/windows-android-arm64-clang)
-
+[settings]
+    os=Android
+    os.api_level=8
+    arch=armv8
+    compiler=clang
+    compiler.version=11
+    compiler.libcxx=c++_shared
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:pkg_config=False
-qtbase:force_debug_info=True
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:pkg_config=no
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=%QT_HOST_PATH%
 qtbase:platform=android-clang
--- a/coin/conan/profiles/windows-android-armv7-clang
+++ b/coin/conan/profiles/windows-android-armv7-clang
@@ -1,9 +1,16 @@
-include(baseprofiles/windows-android-armv7-clang)
-
+[settings]
+    os=Android
+    os.api_level=8
+    arch=armv7
+    compiler=clang
+    compiler.version=11
+    compiler.libcxx=c++_shared
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:pkg_config=False
-qtbase:force_debug_info=True
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:pkg_config=no
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=%QT_HOST_PATH%
 qtbase:platform=android-clang
--- a/coin/conan/profiles/windows-android-x86-clang
+++ b/coin/conan/profiles/windows-android-x86-clang
@@ -1,9 +1,16 @@
-include(baseprofiles/windows-android-x86-clang)
-
+[settings]
+    os=Android
+    os.api_level=8
+    arch=x86
+    compiler=clang
+    compiler.version=11
+    compiler.libcxx=c++_shared
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:pkg_config=False
-qtbase:force_debug_info=True
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:pkg_config=no
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=%QT_HOST_PATH%
 qtbase:platform=android-clang
--- a/coin/conan/profiles/windows-android-x86_64-clang
+++ b/coin/conan/profiles/windows-android-x86_64-clang
@@ -1,9 +1,16 @@
-include(baseprofiles/windows-android-x86_64-clang)
-
+[settings]
+    os=Android
+    os.api_level=8
+    arch=x86_64
+    compiler=clang
+    compiler.version=11
+    compiler.libcxx=c++_shared
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:pkg_config=False
-qtbase:force_debug_info=True
+qtbase:release=yes
+qtbase:shared=yes
+qtbase:pkg_config=no
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=%QT_HOST_PATH%
 qtbase:platform=android-clang
--- a/coin/conan/profiles/windows-arm64-msvc2019_64
+++ b/coin/conan/profiles/windows-arm64-msvc2019_64
@@ -1,7 +1,15 @@
-include(baseprofiles/windows-arm64-msvc2019_64)
-
+[settings]
+    os=Windows
+    arch=armv8
+    compiler=msvc
+    compiler.version=19.28
+    compiler.cppstd=17
+    compiler.runtime=dynamic
+    compiler.runtime_type=Release
+    build_type=Release
 [options]
-qtbase:release=True
+qtbase:release=yes
+qtbase:shared=yes
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:nomake=tests
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -DFEATURE_msvc_obj_debug_info=ON"
--- a/coin/conan/profiles/windows-webassembly-x86_64-clang
+++ b/coin/conan/profiles/windows-webassembly-x86_64-clang
@@ -1,12 +0,0 @@
-include(baseprofiles/windows-webassembly-x86_64-clang)
-
-[options]
-qtbase:release=True
-qtbase:qt_host_path=%QT_HOST_PATH%
-qtbase:nomake=examples;tests
-qtbase:force_debug_info=True
-qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten"
-*:cmake_args_leaf_module="-DFEATURE_pkg_config=OFF"
-[build_requires]
-[env]
-CONAN_CMAKE_GENERATOR=Ninja
--- a/coin/conan/profiles/windows-x86_64-mingw
+++ b/coin/conan/profiles/windows-x86_64-mingw
@@ -1,9 +1,15 @@
-include(baseprofiles/windows-x86_64-mingw)
-
+[settings]
+    os=Windows
+    arch=x86_64
+    compiler=gcc
+    compiler.version=8.1
+    compiler.libcxx=libstdc++
+    build_type=RelWithDebInfo
 [options]
-qtbase:release=True
-qtbase:force_debug_info=True
-qtbase:separate_debug_info=True
+qtbase:shared=yes
+qtbase:debug_and_release=yes
+qtbase:force_debug_info=yes
+qtbase:separate_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:zlib=qt
 qtbase:libjpeg=qt
--- a/coin/conan/profiles/windows-x86_64-msvc2019_64
+++ b/coin/conan/profiles/windows-x86_64-msvc2019_64
@@ -1,9 +1,17 @@
-include(baseprofiles/windows-x86_64-msvc2019_64)
-
+[settings]
+    os=Windows
+    arch=x86_64
+    compiler=msvc
+    compiler.version=19.28
+    compiler.cppstd=17
+    compiler.runtime=dynamic
+    compiler.runtime_type=Release
+    build_type=RelWithDebInfo
 [options]
+qtbase:shared=yes
 qtbase:nomake=tests
-qtbase:debug_and_release=True
-qtbase:force_debug_info=True
+qtbase:debug_and_release=yes
+qtbase:force_debug_info=yes
 qtbase:zlib=None
 qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON"
 *:cmake_args_leaf_module=""
--- a/coin/conan/profiles/windows-x86_64-msvc2019_64-developer
+++ b/coin/conan/profiles/windows-x86_64-msvc2019_64-developer
@@ -1,14 +0,0 @@
-include(baseprofiles/windows-x86_64-msvc2019_64-developer)
-
-[options]
-qtbase:nomake=tests
-qtbase:debug_and_release=True
-qtbase:force_debug_info=True
-qtbase:developer_build=True
-qtbase:headersclean=True
-qtbase:make=examples
-qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_system_zlib=OFF"
-*:cmake_args_leaf_module="-DFEATURE_system_zlib=OFF"
-[build_requires]
-[env]
-CONAN_CMAKE_GENERATOR=Ninja
--- a/coin/instructions/coin_bic_tests.yaml
+++ b/coin/instructions/coin_bic_tests.yaml
@@ -1,32 +0,0 @@
-type: Group
-instructions:
-  - type: EnvironmentVariable
-    variableName: QT_MODULE_TO_TEST
-    variableValue: "qt=QtConcurrent,QtCore,QtDBus,QtDesigner,QtGui,QtHelp,QtNetwork,QtOpenGL,QtPrintSupport,QtQml,QtQuick,QtQuickTest,QtSql,QtSvg,QtTest,QtWidgets,QtXml;{{.SourceDir}}/qtbase"
-  - type: EnvironmentVariable
-    variableName: QTDIR
-    variableValue: "{{.InstallDir}}"
-  - type: PrependToEnvironmentVariable
-    variableName: PATH
-    variableValue: "{{.InstallDir}}/bin:"
-  - type: ChangeDirectory
-    directory: "{{.SourceDir}}/qtqa/tests/postbuild/bic"
-  - type: ExecuteCommand
-    command: ["{{.InstallDir}}/bin/qmake"]
-    maxTimeInSeconds: 3600
-    maxTimeBetweenOutput: 300
-    userMessageOnFailure: "Failed to execute qmake for bic tests"
-  - type: ExecuteCommand
-    command: ["make", "check", "-j1"]
-    maxTimeInSeconds: 7200
-    maxTimeBetweenOutput: 300
-    userMessageOnFailure: "Failed to execute bic tests"
-enable_if:
-  condition: and
-  conditions:
-    - condition: property
-      property: features
-      contains_value: Packaging
-    - condition: property
-      property: target.os
-      equals_value: Linux
--- a/coin/instructions/coin_qt_build_docs.yaml
+++ b/coin/instructions/coin_qt_build_docs.yaml
@@ -1,33 +0,0 @@
-type: Group
-instructions:
-  - type: ExecuteCommand
-    command: "{{.Env.ENV_PREFIX}} cmake --build . --target qtbase/src/plugins/platforms/all qtbase/src/plugins/sqldrivers/all qttools/all --parallel -v"
-    maxTimeInSeconds: 12000
-    maxTimeBetweenOutput: 1200
-    userMessageOnFailure: >
-      Failed to build sources.
-  - type: ExecuteCommand
-    command: "{{.Env.ENV_PREFIX}} cmake --build . --target docs -v"
-    maxTimeInSeconds: 12000
-    maxTimeBetweenOutput: 1200
-    userMessageOnFailure: >
-      Failed to generate docs.
-  - type: ExecuteCommand
-    command: "cp -r {{.BuildDir}}/qtbase/doc/config {{.BuildDir}}/doc"
-    maxTimeInSeconds: 12000
-    maxTimeBetweenOutput: 1200
-    userMessageOnFailure: "Failed to copy qtbase/doc/config to documentation directory."
-  - type: ExecuteCommand
-    command: "cp -r {{.BuildDir}}/qtbase/doc/global {{.BuildDir}}/doc"
-    maxTimeInSeconds: 12000
-    maxTimeBetweenOutput: 1200
-    userMessageOnFailure: "Failed to copy qtbase/doc/global to documentation directory."
-  - type: UploadArtifact
-    archiveDirectory: '{{.BuildDir}}/doc'
-    transferType: UploadModuleDocumentation
-    maxTimeInSeconds: 1800
-    maxTimeBetweenOutput: 1800
-enable_if:
-  condition: property
-  property: features
-  contains_value: "Documentation"
--- a/coin/instructions/coin_qt_build_template.yaml
+++ b/coin/instructions/coin_qt_build_template.yaml
@@ -1,4 +0,0 @@
-type: Group
-instructions:
-  - !include "{{qt/qt5}}/coin_qt_configure.yaml"
-  - !include "{{qt/qt5}}/coin_qt_build_docs.yaml"
--- a/coin/instructions/coin_qt_configure.yaml
+++ b/coin/instructions/coin_qt_configure.yaml
@@ -1,49 +0,0 @@
-type: Group
-instructions:
-  - !include "{{qt/qtbase}}/prepare_building_env.yaml"
-  - type: MakeDirectory
-    directory: .git
-  - type: SetBuildDirectory
-    directory: "{{.SourceDir}}"
-  - type: ChangeDirectory
-    directory: "{{.BuildDir}}"
-
-  - !include "{{qt/qt5}}/prepare_configure_executable.yaml"
-
-  - type: EnvironmentVariable
-    variableName: COIN_CONFIGURE_ARGS
-    variableValue: "{{.Env.CONFIGURE_ARGS}}"
-  - type: EnvironmentVariable
-    variableName: COIN_CMAKE_ARGS
-    # Use unix separators even on Windows, to avoid escaping issues in the configure script.
-    variableValue: "{{.Env.CMAKE_ARGS}} {{.Env.COMMON_CMAKE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{unixPathSeparators .InstallDir}}"
-  - type: EnvironmentVariable
-    variableName: CONFIGURE_ENV_PREFIX
-    variableValue: "{{.Env.ENV_PREFIX}}"
-
-  - type: ExecuteCommand
-    # There is no SourceDir on purpose, because configure is called directly from qtbase,
-    # so the script knows it's own source dir.
-    # TODO: Consider removing these instructions, and using the ones in qtbase/call_configure_qtbase.yaml
-    # once all dependencies are propagated.
-    command: "{{.Env.CONFIGURE_ENV_PREFIX}} {{.Env.CONFIGURE_EXECUTABLE}} {{.Env.COIN_CONFIGURE_ARGS}} -- {{.Env.COIN_CMAKE_ARGS}}"
-    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
-    maxTimeInSeconds: 6000
-    maxTimeBetweenOutput: 1200
-    userMessageOnFailure: >
-      Failed to call cmake.
-    enable_if:
-      condition: property
-      property: features
-      contains_value: UseConfigure
-  - type: ExecuteCommand
-    command: "{{.Env.CONFIGURE_ENV_PREFIX}} {{.Env.CONFIGURE_EXECUTABLE}} {{.SourceDir}} {{.Env.COIN_CONFIGURE_ARGS}} {{.Env.COIN_CMAKE_ARGS}}"
-    executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
-    maxTimeInSeconds: 6000
-    maxTimeBetweenOutput: 1200
-    userMessageOnFailure: >
-      Failed to call cmake.
-    disable_if:
-      condition: property
-      property: features
-      contains_value: UseConfigure
--- a/coin/instructions/prepare_configure_executable.yaml
+++ b/coin/instructions/prepare_configure_executable.yaml
@@ -1,37 +0,0 @@
-# Call either cmake or configure depending on whether the
-# UseConfigure platform configuration feature is set.
-# We should remove the cmake branch, once all platform configurations
-# are ported to use configure.
-# TODO: Remove this file, and reference the one in qtbase, once all
-# all dependencies are propagated.
-type: Group
-instructions:
-  - type: Group
-    enable_if:
-      condition: property
-      property: features
-      contains_value: UseConfigure
-    instructions:
-      - type: EnvironmentVariable
-        variableName: CONFIGURE_EXECUTABLE
-        variableValue: "{{.SourceDir}}/configure"
-        disable_if:
-          condition: property
-          property: host.os
-          equals_value: Windows
-      - type: EnvironmentVariable
-        variableName: CONFIGURE_EXECUTABLE
-        variableValue: "{{.SourceDir}}\\configure.bat"
-        enable_if:
-          condition: property
-          property: host.os
-          equals_value: Windows
-  - type: Group
-    disable_if:
-      condition: property
-      property: features
-      contains_value: UseConfigure
-    instructions:
-      - type: EnvironmentVariable
-        variableName: CONFIGURE_EXECUTABLE
-        variableValue: "cmake"
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -6,7 +6,56 @@ accept_configuration:

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

  Test:
-    - !include "{{qt/qt5}}/coin_bic_tests.yaml"
+    - type: EnvironmentVariable
+      variableName: Dummy
+      variableValue: dummy
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -2,223 +2,228 @@ Version: 2
 Include: [
    cmake_platforms_qemu.yaml,
    cmake_platforms_qemu_qnx710.yaml,
-    cmake_platforms_target_android.yaml,
+    cmake_platforms_target_android_host_linux.yaml,
+    cmake_platforms_target_android_host_macos.yaml,
+    cmake_platforms_target_android_host_windows.yaml,
    cmake_platforms_wasm.yaml,
    macos.yaml
    ]
 Configurations:
 -
-    Id: 'ubuntu-20.04-documentation'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
-    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
-    Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
+    Features: ['Sccache']
+    Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_widgets=OFF'
 -
-    Id: 'ubuntu-20.04'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure']
-    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
-    ]
+    Features: ['Sccache', 'DisableTests']
+    Configure arguments: '-DFEATURE_developer_build=ON -DFEATURE_gui=OFF'
 -
-    Id: 'opensuse-15.4-developer-build'
-    Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-nomake examples -developer-build'
-    Environment variables: [
-        'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
-        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer'
-    ]
+    Features: ['Sccache', 'DisableTests']
+    Configure arguments: '-DFEATURE_developer_build=ON -DINPUT_opengl=no'
 -
-    Id: 'sles-15_sp4-static'
-    Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests', 'UseConfigure']
-    Configure arguments: '-nomake examples -static -no-sql-mysql'
-    Environment variables: [
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-    ]
+    Features: ['Sccache', 'Documentation', 'TestDocs']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace'
 -
-    Id: 'windows-10_22h2-msvc2019'
-    Template: 'qtci-windows-10_22H2-x86_64-50'
+    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'
+-
+    Id: 'OpenSUSE-15.3-host'
+    Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON'
+    Environment variables: [
+        'CONAN_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc']
+-
+    Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY'
+-
+    Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'DisableTests']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
+-
+    Template: 'qtci-windows-10-x86_64-52'
    Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
+    Features: ['Packaging', 'Sccache', "DebugAndRelease"]
+    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64']
+        'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64']
 -
-    Id: 'windows-11_22h2-msvc2019'
-    Template: 'qtci-windows-11_22H2-x86_64-50'
+    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
+    Features: ['Packaging', 'Sccache', "DebugAndRelease", "Insignificant"]
+    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}']
 -
-    Id: 'windows-10_22h2-msvc2022'
-    Template: 'qtci-windows-10_22H2-x86_64-50'
-    Compiler: 'MSVC2022'
-    Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
-    ]
-
-    Id: 'windows-11_22h2-msvc2022'
-    Template: 'qtci-windows-11_22H2-x86_64-50'
-    Compiler: 'MSVC2022'
-    Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
-    ]
-
-    Id: 'windows-10_22h2-msvc2019-developer-build'
-    Template: 'qtci-windows-10_22H2-x86_64-50'
+    Template: 'qtci-windows-11_21H2-x86_64-51'
    Compiler: 'MSVC2019'
-    Features: ['Sccache', 'Conan', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
+    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'Insignificant']
+    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}'
+        '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_21H2-x86_64-51'
+    Compiler: 'MSVC2022'
+    Features: ['Sccache', "DebugAndRelease", 'Insignificant']
+    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
+    Environment variables: [
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
    ]
 -
-    Id: 'windows-10_22h2-msvc2019-arm64'
-    Template: 'qtci-windows-10_22H2-x86_64-50'
+    Template: 'qtci-windows-11_21H2-x86_64-51'
+    Compiler: 'MSVC2022'
+    Features: ['Sccache', "DebugAndRelease", 'Insignificant']
+    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Environment variables: [
+        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
+    ]
+-
+    Id: 'Windows10-MSVC2019-x64-host'
+    Template: 'qtci-windows-10-x86_64-52'
+    Compiler: 'MSVC2019'
+    Features: ['Sccache', "DebugAndRelease"]
+    Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
+-
+    Template: 'qtci-windows-10-x86_64-52'
    Compiler: 'MSVC2019'
    Target arch: 'arm64'
-    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
-    Platform dependency: 'windows-10_22h2-msvc2019-developer-build'
+    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging']
+    Platform dependency: 'Windows10-MSVC2019-x64-host'
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
-        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64',
+        'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64',
+        'CONAN_PROFILE=coin/conan/profiles/windows-arm64-msvc2019_64',
        'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
        'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
-        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}'
-    ]
+        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}']
 -
-    Id: 'windows-11_22h2-msvc2019-developer-build'
-    Template: 'qtci-windows-11_22H2-x86_64-50'
+    Id: 'Windows10_21H2-MSVC2019-x64-host'
+    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'MSVC2019'
-    Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
-    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}'
-    ]
+    Features: ['Sccache', "DebugAndRelease", "Insignificant"]
+    Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
 -
-    Id: 'windows-11_22h2-msvc2019-arm64'
-    Template: 'qtci-windows-11_22H2-x86_64-50'
+    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'MSVC2019'
    Target arch: 'arm64'
-    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
-    Platform dependency: 'windows-11_22h2-msvc2019-developer-build'
+    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'Insignificant']
+    Platform dependency: 'Windows10_21H2-MSVC2019-x64-host'
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
-        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64'
-    ]
+        'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON',
+        ]
 -
-    Id: 'rhel-8.4'
+    Id: 'Windows11_21H2-MSVC2019-x64-host'
+    Template: 'qtci-windows-11_21H2-x86_64-51'
+    Compiler: 'MSVC2019'
+    Features: ['Sccache', "DebugAndRelease", "Insignificant"]
+    Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Environment variables: [
+        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Template: 'qtci-windows-11_21H2-x86_64-51'
+    Compiler: 'MSVC2019'
+    Target arch: 'arm64'
+    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'Insignificant']
+    Platform dependency: 'Windows11_21H2-MSVC2019-x64-host'
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Id: 'RHEL-8.4-host'
    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies']
-    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
+    Features: ['Packaging', 'Sccache']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY'
    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
-    ]
+        'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc']
 -
-    Id: 'ios-universal'
-    Template: 'qtci-macos-12-x86_64-105'
+    Template: 'qtci-macos-11.0-x86_64-102'
    Target os: 'IOS_ANY'
    Target arch: 'arm64'
    Compiler: 'Clang'
    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-x86_64'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
-        'CONAN_PROFILE=coin/conan/profiles/ci-macos-ios-arm64-clang'
-    ]
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
+    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/macos-ios-arm64-clang']
 -
-    Id: 'windows-10_22h2-mingw11'
-    Template: 'qtci-windows-10_22H2-x86_64-50'
+    Id: 'Windows10-Mingw11-x64-host'
+    Template: 'qtci-windows-10-x86_64-52'
    Compiler: 'Mingw'
-    Features: ['Packaging', 'Sccache', 'UseConfigure']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
+    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 -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
    Environment variables: [
        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
+        'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw'
-    ]
+        'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw']
 -
-    Id: 'windows-10_22h2-llvm'
-    Template: 'qtci-windows-10_22H2-x86_64-50'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'UseConfigure']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
-    Environment variables: [
-        'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}',
-        'LLVM_INSTALL_DIR=C:\llvm-mingw'
-    ]
-
-    Id: 'windows-11_22h2-llvm'
-    Template: 'qtci-windows-11_22H2-x86_64-50'
-    Compiler: 'Clang'
-    Features: ['Sccache', 'UseConfigure']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
-    Environment variables: [
-        'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}}',
-        'LLVM_INSTALL_DIR=C:\llvm-mingw'
-    ]
-
-    Id: 'windows-10_22h2-mingw11-developer-build'
-    Template: 'qtci-windows-10_22H2-x86_64-50'
+    Id: 'Windows10_21H2-Mingw11-x64-host'
+    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'Mingw'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
+    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 -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
    Environment variables: [
        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
-    ]
+        'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
 -
-    Id: 'windows-11_22h2-mingw11-developer-build'
-    Template: 'qtci-windows-11_22H2-x86_64-50'
+    Id: 'Windows10-LLVM-x64-host'
+    Template: 'qtci-windows-10-x86_64-52'
+    Compiler: 'Clang'
+    Features: ['Sccache']
+    Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
+    Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
+        'LLVM_INSTALL_DIR=C:\llvm-mingw']
+-
+    Id: 'Windows10_21H2-LLVM-x64-host'
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Compiler: 'Clang'
+    Features: ['Sccache']
+    Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
+    Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
+        'LLVM_INSTALL_DIR=C:\llvm-mingw']
+-
+    Id: 'Windows11_21H2-LLVM-x64-host'
+    Template: 'qtci-windows-11_21H2-x86_64-51'
+    Compiler: 'Clang'
+    Features: ['Sccache', 'InsignificantTests']
+    Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
+    Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'LLVM_INSTALL_DIR=C:\llvm-mingw']
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'Mingw'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
-    Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}}',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
-    ]
+    Features: ['Sccache']
+    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF'
+    Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
+-
+    Template: 'qtci-windows-11_21H2-x86_64-51'
+    Compiler: 'Mingw'
+    Features: ['Sccache', 'InsignificantTests']
+    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF'
+    Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
+        '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,52 +1,46 @@
 Version: 2
 Configurations:
 -
-    Id: 'qemu-armv7-developer-build'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Target os: 'QEMU'
    Target arch: 'armv7'
    Compiler: 'GCC'
-    Platform dependency: 'ubuntu-20.04'
-    Features: ['Sccache', 'UseConfigure']
+    Platform dependency: 'Ubuntu-20.04-host'
+    Features: ['Sccache']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
    ]
 -
-    Id: 'qemu-arm64-developer-build'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Target os: 'QEMU'
    Target arch: 'arm64'
    Compiler: 'GCC'
-    Platform dependency: 'ubuntu-20.04'
-    Features: ['Sccache', 'UseConfigure']
+    Platform dependency: 'Ubuntu-20.04-host'
+    Features: ['Sccache']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
    ]
 -
-    Id: 'qemu-mips64-developer-build'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Target os: 'QEMU'
    Target arch: 'mips64'
    Compiler: 'GCC'
-    Platform dependency: 'ubuntu-20.04'
-    Features: ['Sccache', 'DisableTests', 'UseConfigure']
+    Platform dependency: 'Ubuntu-20.04-host'
+    Features: ['Sccache', 'DisableTests']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
        'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.24.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
--- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
+++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml
@@ -1,43 +1,39 @@
 Version: 2
 Configurations:
 -
-    Id: 'qnx-710-x86_64-developer-build-on-linux'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Target os: 'QNX_710'
    Target arch: 'x86_64'
    Compiler: 'GCC'
    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-20.04'
-    Features: ['Packaging', 'VMSize8', 'UseConfigure']
+    Platform dependency: 'Ubuntu-20.04-host'
+    Features: ['Packaging', 'InsignificantTests', 'VMSize8']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'QT_CMAKE_DIR=/opt/cmake-3.24.2/bin',
-        'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
-    ]
+        'TARGET_CONFIGURE_ARGS=-DFEATURE_developer_build=ON -DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
+        'QT_CMAKE_DIR=/opt/cmake-3.21.1/bin',
+        "TESTARGS='{{.Env.QNX_QEMU_SSH}} LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen'",
+        "TESTRUNNER='python3 {{.SourceDir}}/coin_qnx_qemu_runner.py'",
+        "COIN_CTEST_RESULTSDIR=/home/qt/work",
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
 -
-    Id: 'qnx-710-arm64-on-linux'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Target os: 'QNX_710'
    Target arch: 'arm64'
    Compiler: 'GCC'
    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-20.04'
-    Features: ['Packaging', 'DisableTests', 'UseConfigure']
+    Platform dependency: 'Ubuntu-20.04-host'
+    Features: ['Packaging', 'DisableTests']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-    ]
+        'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
 -
-    Id: 'qnx-710-armv7-on-linux'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Target os: 'QNX_710'
    Target arch: 'armv7'
    Compiler: 'GCC'
    Target compiler: 'QCC'
-    Platform dependency: 'ubuntu-20.04'
-    Features: ['Packaging', 'DisableTests', 'UseConfigure']
+    Platform dependency: 'Ubuntu-20.04-host'
+    Features: ['Packaging', 'DisableTests']
    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-    ]
+        'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
--- a/coin/platform_configs/cmake_platforms_static_tests.yaml
+++ b/coin/platform_configs/cmake_platforms_static_tests.yaml
@@ -1,27 +1,20 @@
 Version: 2
 Configurations:
 -
-    Id: 'sles-15_sp4-minimal-static'
-    Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
+    Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
    Compiler: 'GCC'
-    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
-    Configure arguments: '-nomake examples -static -no-sql-mysql'
-    Environment variables: [
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-    ]
+    Features: ['Sccache', 'MinimalStaticTests']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
 -
-    Id: 'windows-10_22h2-minimal-static'
-    Template: 'qtci-windows-10_22H2-x86_64-50'
+    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'MSVC2019'
-    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
-    Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib'
+    Features: ['Sccache', 'MinimalStaticTests']
+    Configure arguments: '-G"Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_SHARED_LIBS=OFF -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
    Environment variables: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
    ]
 -
-    Id: 'macos-11-minimal-static'
-    Template: 'qtci-macos-11-x86_64-105'
+    Template: 'qtci-macos-11.0-x86_64-102'
    Compiler: 'Clang'
-    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
-    Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework'
+    Features: ['Sccache', 'MinimalStaticTests']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DFEATURE_framework=OFF'
--- a/coin/platform_configs/cmake_platforms_target_android.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android.yaml
@@ -1,70 +0,0 @@
-Version: 2
-Configurations:
-
-    Id: 'android-arm64-on-macos'
-    Template: 'qtci-macos-12-x86_64-105'
-    Target os: 'Android_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-x86_64'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
-    ]
-
-    Id: 'android-armv7-on-windows'
-    Template: 'qtci-windows-10_22H2-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'armv7'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'windows-10_22h2-mingw11'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-armv7-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
-    ]
-
-    Id: 'android-x86-on-linux'
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.4'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang',
-        'ANDROID_EMULATOR=@emulator_x86_api_23',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
-    ]
-
-    Id: 'android-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.4'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
-    ]
--- a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
@@ -0,0 +1,54 @@
+Version: 2
+Configurations:
+-
+    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'arm64'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'RHEL-8.4-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_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-arm64-clang'
+    ]
+-
+    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'armv7'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'RHEL-8.4-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_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-armv7-clang'
+    ]
+-
+    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'RHEL-8.4-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_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang'
+    ]
+-
+    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'RHEL-8.4-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_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang'
+    ]
--- a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml
@@ -0,0 +1,54 @@
+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-latest-xcode-universal-packaging-build'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-arm64-clang'
+    ]
+-
+    Template: 'qtci-macos-10.14-x86_64'
+    Target os: 'Android_ANY'
+    Target arch: 'armv7'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-armv7-clang'
+    ]
+-
+    Template: 'qtci-macos-10.14-x86_64'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang'
+    ]
+-
+    Template: 'qtci-macos-10.14-x86_64'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang'
+    ]
--- a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml
@@ -0,0 +1,108 @@
+Version: 2
+Configurations:
+-
+    Template: 'qtci-windows-10-x86_64-52'
+    Target os: 'Android_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\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_ROOT}} -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',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/windows-android-arm64-clang'
+    ]
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\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_ROOT}} -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',
+    ]
+-
+    Template: 'qtci-windows-10-x86_64-52'
+    Target os: 'Android_ANY'
+    Target arch: 'armv7'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\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_ROOT}} -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',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/windows-android-armv7-clang'
+    ]
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'armv7'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\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_ROOT}} -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',
+    ]
+-
+    Template: 'qtci-windows-10-x86_64-52'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\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_ROOT}} -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',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/windows-android-x86-clang'
+    ]
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\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_ROOT}} -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',
+    ]
+-
+    Template: 'qtci-windows-10-x86_64-52'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\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_ROOT}} -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',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/windows-android-x86_64-clang'
+    ]
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Target os: 'Android_ANY'
+    Target arch: 'x86_64'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'Path={{.Env.MINGW1120}}\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_ROOT}} -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',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw',
+        'CONAN_PROFILE=coin/conan/profiles/windows-android-x86_64-clang']
+
--- a/coin/platform_configs/cmake_platforms_wasm.yaml
+++ b/coin/platform_configs/cmake_platforms_wasm.yaml
@@ -1,26 +1,49 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
+    Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
    Target os: 'WebAssembly'
    Compiler: 'GCC'
-    Platform dependency: 'opensuse-15.4-developer-build'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Platform dependency: 'OpenSUSE-15.3-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
    Environment variables: [
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
-        'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
-        'CONAN_PROFILE=coin/conan/profiles/ci-linux-webassembly-x86_64-clang'
+        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
    ]
 -
-    Id: 'webassembly-thread-asyncify'
-    Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
+    Template: 'qtci-windows-10-x86_64-52'
    Target os: 'WebAssembly'
-    Compiler: 'GCC'
-    Platform dependency: 'opensuse-15.4-developer-build'
-    Features: ['Sccache', 'DisableTests']
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
+        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
+        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_pkg_config=OFF']
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Target os: 'WebAssembly'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
+        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
+        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_pkg_config=OFF']
+-
+    Template: 'qtci-macos-10.14-x86_64'
+    Target os: 'WebAssembly'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
    Environment variables: [
        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_thread=ON -DQT_QMAKE_DEVICE_OPTIONS="QT_EMSCRIPTEN_ASYNCIFY=1"',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc',
+        'CONAN_PROFILE=coin/conan/profiles/linux-webassembly-x86_64-gcc'
+    ]
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -1,7 +1,6 @@
 Version: 2
 Configurations:
 -
-    Id: 'ubuntu-20.04-license-check'
    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
--- a/coin/platform_configs/flashing-wizard.yaml
+++ b/coin/platform_configs/flashing-wizard.yaml
@@ -7,7 +7,7 @@ Configurations:
        Features: ['Packaging', 'UseLegacyInstructions']
        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -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_22H2-x86_64-50'
+        Template: 'qtci-windows-10_21H2-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'
@@ -18,7 +18,7 @@ Configurations:
        Features: ['Packaging', 'UseLegacyInstructions']
        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
    -
-        Template: 'qtci-windows-10_22H2-x86_64-50'
+        Template: 'qtci-windows-10_21H2-x86_64-51'
        Compiler: 'MSVC2019'
        Target arch: 'x86'
        Features: ['Packaging', 'UseLegacyInstructions']
--- a/coin/platform_configs/integrity.yaml
+++ b/coin/platform_configs/integrity.yaml
@@ -1,20 +1,17 @@
 Version: 2
 Configurations:
    -
-      Id: "integrity-arm64"
      Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
      Compiler: 'GCC'
      Target os: 'INTEGRITY'
-      Platform dependency: 'ubuntu-20.04'
-      Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
+      Platform dependency: 'Ubuntu-20.04-host'
+      Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16']
      Environment variables: [
-          'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql',
-          'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile',
-          'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF',
+          'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_HOST_PATH=/home/qt/work/install -DQT_BUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DQT_QMAKE_TARGET_MKSPEC=devices/integrity-armv8-SA8155P -DFEATURE_library=OFF -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DFEATURE_printdialog=OFF --debug-trycompile -DFEATURE_dbus=OFF -GNinja -DUNIX=ON -DFEATURE_gtk3=OFF -DFEATURE_glib=OFF -DFEATURE_libudev=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_sql_mysql=OFF -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64',
          'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
          'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel',
          'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',
          'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public',
          'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/',
          'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH',
-      ]
+          'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_system_webp=OFF']
--- a/coin/platform_configs/ios-tests.yaml
+++ b/coin/platform_configs/ios-tests.yaml
@@ -1,14 +1,12 @@
 Version: 2
 Configurations:
 -
-    Id: "ios-tests-on-macos"
-    Template: 'qtci-macos-12-x86_64-105'
+    Id: "ios-tests-target"
+    Template: 'qtci-macos-10.14-x86_64'
    Target os: 'IOS_ANY'
    Target arch: 'arm64'
    Compiler: 'Clang'
    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-x86_64'
-    Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'
-    ]
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests']
+    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
--- a/coin/platform_configs/linux_android_tests_developer.yaml
+++ b/coin/platform_configs/linux_android_tests_developer.yaml
@@ -1,19 +0,0 @@
-Version: 2
-Configurations:
-
-    Id: 'android-x86-developer-build-testrun-on-linux'
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.4'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
-        'CONAN_INSTALL_DIR={{.InstallDir}}/target',
-        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
-        'ANDROID_EMULATOR=@emulator_x86_api_23']
--- a/coin/platform_configs/macos-developer-build-tests.yaml
+++ b/coin/platform_configs/macos-developer-build-tests.yaml
@@ -0,0 +1,30 @@
+Version: 2
+Configurations:
+
+    # These developer-build tests are only run for qtbase and qtdeclarative
+    # See macos.yaml for arm64 developer-build tests, run for all modules.
+
+    -
+        Id: 'macos-10.14-x86_64-developer-build-tests'
+        Template: 'qtci-macos-10.14-x86_64'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
+    -
+        Id: 'macos-10.15-x86_64-developer-build-tests'
+        Template: 'qtci-macos-10.15-x86_64-102'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
+    -
+        Id: 'macos-11-x86_64-developer-build-tests'
+        Template: 'qtci-macos-11.0-x86_64-102'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
+    -
+        Id: 'macos-12-x86_64-developer-build-tests'
+        Template: 'qtci-macos-12-x86_64-102'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -8,27 +8,15 @@ Configurations:
    # Build on recent macOS version with latest Xcode

    -
-        Id: 'macos-universal-on-x86_64'
-        Template: 'qtci-macos-12-x86_64-105'
+        Id: 'macos-latest-xcode-universal-packaging-build'
+        Template: 'qtci-macos-12-x86_64-102'
        Compiler: 'Clang'
        Target arch: 'x86_64-arm64'
-        Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-        Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
+        Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors']
+        Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}'
        Environment variables: [
-            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-            'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
-            'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang'
-        ]
-
-    -
-        Id: 'macos-universal-on-arm64'
-        Template: 'qtci-macos-12-arm64'
-        Compiler: 'Clang'
-        Target arch: 'x86_64-arm64'
-        Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-        Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
-        Environment variables: [
-            'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'
+            'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_gds=OFF',
+            'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
        ]

    # Test on all supported macOS versions (deployment targets)
@@ -38,55 +26,37 @@ Configurations:
        Template: 'qtci-macos-10.14-x86_64'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
+        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
    -
        Id: 'macos-10.15-x86_64-tests'
        Template: 'qtci-macos-10.15-x86_64-102'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
+        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
    -
        Id: 'macos-11-x86_64-tests'
-        Template: 'qtci-macos-11-x86_64-105'
+        Template: 'qtci-macos-11.0-x86_64-102'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
+        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
    -
        Id: 'macos-11-arm64-tests'
        Template: 'qtci-macos-11.0-arm64'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
+        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
    -
        Id: 'macos-12-arm64-tests'
        Template: 'qtci-macos-12-arm64'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
-    -
-        Id: 'macos-13-arm64-tests'
-        Template: 'qtci-macos-13-arm64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
+        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
    -
        Id: 'macos-12-x86_64-tests'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-102'
        Compiler: 'Clang'
        Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-universal-on-x86_64'
-    -
-        Id: 'macos-12-arm-on-arm64-tests'
-        Template: 'qtci-macos-12-arm64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-universal-on-arm64'
-    -
-        Id: 'macos-12-arm-on-x86_64-tests'
-        Template: 'qtci-macos-12-x86_64-105'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-universal-on-arm64'
+        Platform dependency: 'macos-latest-xcode-universal-packaging-build'

    # =========================================================================
    # Developer build. Single architecture builds.
@@ -95,65 +65,34 @@ Configurations:
    # Build on recent macOS version with latest Xcode

    -
-        Id: 'macos-12-x86_64-developer-build'
-        Template: 'qtci-macos-12-x86_64-105'
+        Id: 'macos-latest-xcode-x86_64-developer-build'
+        Template: 'qtci-macos-12-x86_64-102'
        Compiler: 'Clang'
-        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-        Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
-        Environment variables: [
-            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
-        ]
+        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors']
+        Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}'
    -
-        Id: 'macos-12-arm64-developer-build'
+        Id: 'macos-latest-xcode-arm64-developer-build'
        Template: 'qtci-macos-12-arm64'
        Compiler: 'Clang'
-        Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-        Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework'
+        Features: ['DoNotRunTests', 'WarningsAreErrors']
+        Configure arguments: '-DFEATURE_developer_build=ON -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON'
        # Note: We do not include OpenSSL or PostgreSQL in this build,
        # as the M1 CI machines are not provisioned for that yet.

    # Test on all supported macOS versions (deployment targets)

-    -
-        Id: 'macos-10.14-x86_64-developer-build-tests'
-        Template: 'qtci-macos-10.14-x86_64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-12-x86_64-developer-build'
-    -
-        Id: 'macos-10.15-x86_64-developer-build-tests'
-        Template: 'qtci-macos-10.15-x86_64-102'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-12-x86_64-developer-build'
-    -
-        Id: 'macos-11-x86_64-developer-build-tests'
-        Template: 'qtci-macos-11-x86_64-105'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-12-x86_64-developer-build'
    -
        Id: 'macos-11-arm64-developer-build-tests'
        Template: 'qtci-macos-11.0-arm64'
        Compiler: 'Clang'
        Features: ['TestOnly']
-        Platform dependency: 'macos-12-arm64-developer-build'
-    -
-        Id: 'macos-12-x86_64-developer-build-tests'
-        Template: 'qtci-macos-12-x86_64-105'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-12-x86_64-developer-build'
+        Platform dependency: 'macos-latest-xcode-arm64-developer-build'
    -
        Id: 'macos-12-arm64-developer-build-tests'
        Template: 'qtci-macos-12-arm64'
        Compiler: 'Clang'
        Features: ['TestOnly']
-        Platform dependency: 'macos-12-arm64-developer-build'
-    -
-        Id: 'macos-13-arm64-developer-build-tests'
-        Template: 'qtci-macos-13-arm64'
-        Compiler: 'Clang'
-        Features: ['TestOnly']
-        Platform dependency: 'macos-12-arm64-developer-build'
+        Platform dependency: 'macos-latest-xcode-arm64-developer-build'
+
+    # See macos-developer-build-tests.yaml for x86_64 tests,
+    # as we limit those to qtbase and declarative.
--- a/coin/platform_configs/nightly_cmake_platforms_target_android_latest.yaml
+++ b/coin/platform_configs/nightly_cmake_platforms_target_android_latest.yaml
@@ -1,71 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        Windows10_22H2-Mingw11-x64-host,
-        rhel-8.4
-    ]
-]
-Configurations:
-
-    Id: 'android-arm64-on-macos'
-    Template: 'qtci-macos-12-x86_64-105'
-    Target os: 'Android_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Clang'
-    Target compiler: 'Clang'
-    Platform dependency: 'macos-universal-on-x86_64'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
-    ]
-
-    Template: 'qtci-windows-10_22H2-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'armv7'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'Windows10_22H2-Mingw11-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-armv7-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
-    ]
-
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.4'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang',
-        'ANDROID_EMULATOR=@emulator_x86_api_23',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
-    ]
-
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.4'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}'
-    ]
--- a/coin/platform_configs/nightly_qnx710_host_windows.yaml
+++ b/coin/platform_configs/nightly_qnx710_host_windows.yaml
@@ -1,21 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        windows-10_22h2-msvc2019-developer-build
-    ]
-]
-Configurations:
-
-    Id: 'qnx-710-arm64-on-windows'
-    Template: 'qtci-windows-10_22H2-x86_64-50'
-    Target os: 'QNX_710'
-    Target arch: 'arm64'
-    Compiler: 'MSVC2019'
-    Target compiler: 'QCC'
-    Platform dependency: 'windows-10_22h2-msvc2019-developer-build'
-    Features: ['DisableTests', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_LIBRARY_PATH={{.Env.QNX_710}}\target\qnx7\aarch64le\lib;{{.Env.QNX_710}}\target\qnx7\aarch64le\usr\lib -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -G "Ninja"',
-        'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON'
-    ]
--- a/coin/platform_configs/precheck.yaml
+++ b/coin/platform_configs/precheck.yaml
@@ -1,22 +0,0 @@
-Version: 2
-Module only: True
-Include: [
-  cmake_platforms.yaml: [
-    "ubuntu-20.04",
-    "windows-10_22h2-msvc2019-developer-build",
-    "ios-universal"
-  ],
-  macos.yaml: [
-    "macos-12-x86_64-tests",
-  ],
-  cmake_platforms_target_android.yaml: [
-    "android-arm64-on-macos"
-  ],
-  cmake_platforms_qemu.yaml: [
-    "qemu-armv7-developer-build"
-  ],
-  cmake_platforms_qemu_qnx710.yaml: [
-    "qnx-710-x86_64-developer-build-on-linux"
-  ]
-]
-Configurations: []
--- a/coin/platform_configs/qmake2cmake.yaml
+++ b/coin/platform_configs/qmake2cmake.yaml
@@ -1,15 +0,0 @@
-Version: 2
-Module only: True
-Configurations:
-
-    Template: 'qtci-macos-12-x86_64-105'
-    Compiler: 'Clang'
-    Features: ['DisableTests']
-
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['DisableTests']
-
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
--- a/coin/platform_configs/qt-creator.yaml
+++ b/coin/platform_configs/qt-creator.yaml
@@ -2,9 +2,16 @@ Version: 2
 Module only: True
 Configurations:
 -
-    Template: 'qtci-windows-10_22H2-x86_64-50'
+    Template: 'qtci-windows-10-x86_64-52'
    Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
+    Configure arguments: ''
+    Environment variables: []
+    Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Compiler: 'MSVC2019'
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
    Configure arguments: ''
    Environment variables: []
    Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
@@ -18,19 +25,13 @@ Configurations:
 -
    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
-    Configure arguments: ''
-    Environment variables: []
-
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Qt5', 'Sccache', 'DebugAndRelease']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
    Configure arguments: ''
    Environment variables: []
 -
    Template: 'qtci-macos-10.14-x86_64'
    Compiler: 'Clang'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
+    Features: ['Packaging', 'DisableTests', 'Sccache', 'DebugAndRelease']
    Configure arguments: ''
    Environment variables: []
 -
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -2,7 +2,22 @@ Version: 2
 Include: [
    cmake_platforms.yaml,
    cmake_platforms_static_tests.yaml,
+    macos-developer-build-tests.yaml,
    integrity.yaml,
    ios-tests.yaml
 ]
-Configurations: []
+Configurations:
+-
+    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
+    Compiler: 'GCC'
+    Target compiler: 'Clang'
+    Platform dependency: 'RHEL-8.4-host'
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
+        'CONAN_INSTALL_DIR={{.InstallDir}}/target',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang']
+
--- a/coin/platform_configs/qtdeclarative.yaml
+++ b/coin/platform_configs/qtdeclarative.yaml
@@ -1,6 +1,7 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
+    macos-developer-build-tests.yaml,
    integrity.yaml,
    cmake_platforms_static_tests.yaml
 ]
--- a/coin/platform_configs/qthttpserver.yaml
+++ b/coin/platform_configs/qthttpserver.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtquick3dphysics.yaml
+++ b/coin/platform_configs/qtquick3dphysics.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@@ -1,24 +1,30 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-windows-10_22H2-x86_64-50'
+    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'Mingw'
    Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
-    Configure arguments: '-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++'
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
    Features: ['UseLegacyInstructions']
 -
-    Template: 'qtci-windows-10_22H2-x86_64-50'
+    Template: 'qtci-windows-10-x86_64-52'
    Compiler: 'Mingw'
    Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-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++'
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
+    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
 -
    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
    Compiler: 'GCC'
    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-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'
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
    Compiler: 'GCC'
    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-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'
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
--- a/coin/platform_configs/qtwebengine.yaml
+++ b/coin/platform_configs/qtwebengine.yaml
@@ -1,5 +1,6 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml
+    cmake_platforms.yaml,
+    macos-developer-build-tests.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtwebkit.yaml
+++ b/coin/platform_configs/qtwebkit.yaml
@@ -1,7 +1,13 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-windows-10_22H2-x86_64-50'
+    Template: 'qtci-windows-10-x86_64-52'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW1120_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'
+-
+    Template: 'qtci-windows-10_21H2-x86_64-51'
    Compiler: 'Mingw'
    Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH']
    Features: ['Packaging', UseLegacyInstructions']
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -1,60 +1,3 @@
 Version: 2
-Include: [ cmake_platforms_target_android.yaml ]
-Configurations:
-
-    Id: 'automotive-ubuntu-20.04-documentation'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
-    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
-
-    Id: 'windows-10_22h2-mingw11'
-    Template: 'qtci-windows-10_22H2-x86_64-50'
-    Compiler: 'Mingw'
-    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
-    Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
-    ]
-
-    Id: 'macos-universal-on-x86_64'
-    Template: 'qtci-macos-12-x86_64-105'
-    Compiler: 'Clang'
-    Target arch: 'x86_64-arm64'
-    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
-    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
-    Environment variables: [
-        'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF',
-        'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
-    ]
-
-    Id: 'rhel-8.4'
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure']
-    Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'
-    ]
-
-    Id: "automotive-android-x86-on-linux"
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.4'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
-        'ANDROID_EMULATOR=@automotive_emulator_x86_api_30'
-    ]
+Include: [cmake_platforms.yaml]
+Configurations: []
--- a/coin/platform_configs/tqtc-qtinsighttracker.yaml
+++ b/coin/platform_configs/tqtc-qtinsighttracker.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/tqtc-qtvncserver.yaml
+++ b/coin/platform_configs/tqtc-qtvncserver.yaml
@@ -1,3 +0,0 @@
-Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
--- a/coin/platform_configs/webos.yaml
+++ b/coin/platform_configs/webos.yaml
@@ -1,54 +0,0 @@
-Version: 2
-Module only: true
-Configurations:
-  - Id: 'webos-emulator-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['DoNotRunTests']
-    Environment variables: ['BUILD_EMULATOR=enabled']
-  - Id: 'webos-emulator-qtbase-tests'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['TestOnly']
-    Environment variables: ['MODULE=qtbase']
-    Platform dependency: 'webos-emulator-build'
-  - Id: 'webos-emulator-qtdeclarative-tests'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['TestOnly']
-    Environment variables: ['MODULE=qtdeclarative']
-    Platform dependency: 'webos-emulator-build'
-  - Id: 'webos-emulator-qtwayland-tests'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['TestOnly']
-    Environment variables: ['MODULE=qtwayland']
-    Platform dependency: 'webos-emulator-build'
-  - Id: 'webos-emulator-qtshadertools-tests'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['TestOnly']
-    Environment variables: ['MODULE=qtshadertools']
-    Platform dependency: 'webos-emulator-build'
-  - Id: 'webos-emulator-qtgraphicaleffects-tests'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['TestOnly']
-    Environment variables: ['MODULE=qtgraphicaleffects']
-    Platform dependency: 'webos-emulator-build'
-  - Id: 'webos-raspberry-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['DoNotRunTests']
-    Environment variables: ['BUILD_RASPBERRY=enabled']
-  - Id: 'webos-ndk-installer-build'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['DoNotRunTests']
-    Environment variables: ['BUILD_NDK_INSTALLER=enabled']
-  - Id: 'webos-ndk-install'
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-51'
-    Compiler: 'GCC'
-    Features: ['TestOnly']
-    Platform dependency: ['webos-raspberry-build', 'webos-ndk-installer-build']
-    Environment variables: ['TEST_INSTALL_NDK=enabled']
--- a/coin/pre-provisioning/qtci-linux-SLES-15_SP4-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-SLES-15_SP4-x86_64/README_MANUAL_INSTALLATIONS
@@ -1,64 +0,0 @@
-### SUSE Linux Enterprise Server 15 SP4 ###
-
-# Installation #
-Language: English (US)
-Keyboard Layout: English (US)
-
-Available Extensions and Modules:
-   Basesystem Module
-   Desktop Applications Module
-   Python 3 Module
-   Server Applications Module
-
-SLES with GNOME
-
-Region: Etc
-Time Zone: UTC
-
-Create user with automatic login
-
-disable firewall
-
-Displays: Resolution 1280x800
-Power: Screen Blank: Never
-Privacy: Screen lock: Automatic screen lock: disable
-Privacy: Screen lock: Show notifications on lock screen: disable
-
-# Add user to sudoers
-Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
-
-sudo su -
-echo "add_drivers+=\"virtio-blk\"" >/etc/dracut.conf.d/virtio.conf
-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
-
-# Set how DHClient creates CID for compatibility with older DHCP servers
-sudo sed -i 's/DHCLIENT_CREATE_CID=""/DHCLIENT_CREATE_CID="rfc2132"/' /etc/sysconfig/network/dhcp
-systemctl restart wicked
-
-# Create etc/sysconfig/network/ifcfg-eth1 with values:
-* BOOTPROTO='dhcp'
-* STARTMODE='auto'
-sudo ifup eth1
-
-# Register product
-# Add 'Available Extensions and Modules'
-* Basesystem Module 15 SP4 x86_64
-* Server Applications Module 15 SP4 x86_64
-
-zypper yum update
-
-* Download and run coin-setup
-
-# Fetch and run coin-setup
-Download http://coin/coin/binary/linux_386/coin-setup
-sudo ./coin-setup
-
-sudo reboot now
--- a/coin/pre-provisioning/qtci-linux-openSUSE-15.4-x86_64/README_MANUAL_INSTALLATIONS
+++ b/coin/pre-provisioning/qtci-linux-openSUSE-15.4-x86_64/README_MANUAL_INSTALLATIONS
@@ -1,42 +0,0 @@
-### OpenSUSE Leap 15.4 ###
-## KDE ##
-## In qtci-linux-openSUSE-15.4-x86_64-50 > Graphics Platform: X11 (System default) ##
-## In qtci-linux-openSUSE-15.4-x86_64-51 > Graphics Platform: Wayland (Plasma (Wayland))##
-
-# Installation #
-Language: English (US)
-Keyboard Layout: English (US)
-
-Activate online repositories during installation (yes)
-Use default selections
-
-Desktop with KDE Plasma
-
-Suggested Partitioning - default values
-
-Time Zone: UTC
-
-## Configurations ##
-Download and run coin-setup binary
-YaST - System - Services Manager - Firewalld - Stop
-# enable ssh access
-sudo rcsshd start
-Workspace Behavior - Screen locking - Lock screen automatically - unselect options
-Startup and Shutdown - Behavior - Login Screen - Select Automatically log in with session (System default)
-Add below to '$HOME/.config/autostart/coin-bootstrap-agent.desktop'
-    [Desktop Entry]
-    Type=Application
-    Exec=/usr/bin/gnome-terminal -e "/home/qt/bootstrap-agent /dev/ttyS0"
-    Hidden=false
-    X-GNOME-Autostart-enabled=true
-    Name=Coin
-Notifications
-    Critical notifications - unselect
-    Log priority notifications - unselect
-    Application progress: Show in task manager - unselect
-                          Show in notifications - unselect
-    Notification badges:  Show in task manager - unselect
-Display and Monitor - Display Configuration - 1280x800
-Power Management: Screen Energy Saving - unselect
-
-add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Qt Submodule Update Bot	19c8518536	Update submodules on '6.3 in qt/qt5' Change-Id: Ia4019f891a5da5d2f97d917f7845c32eff6b3184 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2022-01-31 22:35:12 +00:00
Alexandru Croitor	295eb3ea8b	CMake: Fix linux static tests config to actually run In `3c38cc22ce` the dash was accidentally removed and Coin was happy with it. Reintroduce the dash. Change-Id: Idc5d3833191b0390e2d0aa480681a5350d289037 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit `93afb606b4`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-01-31 17:57:27 +00:00
Pasi Petäjäjärvi	40dfcecd4a	CI: Add font support for QNX qemu Task-number: QTBUG-99168 Change-Id: I4f216a06f04f544214a016b61365ec216b2d77a5 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit `848a7d5fa3`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-01-30 05:13:14 +00:00
Pasi Petäjäjärvi	6b8dc3a273	CI: Enable developer build for QNX x86_64 Task-number: QTBUG-99168 Change-Id: I119f47ba0ee36a19a6daca05383c90304b34e97a Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit `7486226c7a`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-01-30 05:13:05 +00:00
Pasi Petäjäjärvi	8a8f1b7654	CI: Update libraries because of new QNX toolchain QNX toolchain provides newer libfreetype which depends on new libbz2 library (qnx710-20211207-linux.tar.xz). Task-number: QTBUG-99168 Change-Id: I4bcb0b536ace594dd95faeed8e5a8d99e53afadd Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit `2592bbe8c4`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-01-30 05:12:58 +00:00
Pasi Petäjäjärvi	c69258f175	CI: Increase size of QNX qemu image for data partition Some of the autotest require more free space to pass Task-number: QTBUG-99168 Change-Id: Iff4a4493e75d2770d691b936547143518a80e315 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit `4a5550cc03`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-01-30 05:12:47 +00:00
Qt Submodule Update Bot	4b6d11a77f	Update submodules on '6.3 in qt/qt5' Change-Id: If7823e3610645a58b7bbd40bd3fac081962a48d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2022-01-27 11:34:39 +00:00
Jani Heikkinen	2d329b06e1	Add qtlanguageserver as a optional dependency for qtdeclarative Fixes: QTBUG-99737 Pick-to: dev Change-Id: I9dd71496b6ea974003158ffdd3e651beed60c31d Reviewed-by: Toni Saario <toni.saario@qt.io>	2022-01-27 11:34:34 +00:00
Jukka Jokiniva	fb43a90fd1	Add yaml file for Android Automotive Change-Id: I1007453ba47e7a7be4fe60ef065695189eb44f98 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit `06b5cd95e6`)	2022-01-19 08:23:36 +00:00
Heikki Halmet	56a251d9a6	Provisioning: Install up-to-date google Chrome for Wasm auto tests Task-number: QTBUG-99062 Change-Id: Ib9ebcad5d9700c09d01d1ba23fed716d3a3cae4b Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>	2022-01-12 09:07:46 +02:00
Heikki Halmet	9c5af22a53	Provisioning: Change installation order between libicu and gtk3 Gtk3-devel includes dependency which conflicts with libicu-devel. Changing installation order should solve it Change-Id: Iaba3e1710c2a82ec2bab076c88a7afb33896d4bc Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `1e8939b4b2`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-01-11 22:00:07 +00:00
Qt Submodule Update Bot	5fe2c8489a	Update submodules on '6.3 in qt/qt5' Change-Id: Id6c006f1504e450276be4ba26b4f04f8f481d3ee Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2022-01-08 22:22:55 +00:00
Toni Saario	d25830872e	Provision conan on arm macOS Change-Id: Ibf074c39b7bf3ac0f0f16a5a65d11022f9ec7e04 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> (cherry picked from commit `81dcae4f93`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-01-07 16:34:52 +00:00
Heikki Halmet	928414e328	Remove Insignificant flags from Creator, flashing-wizard and saferenderer Change-Id: If4941f00f51281df4f2f233bd89bfaf0d0ed5a0d Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `854e478223`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-01-04 15:38:31 +00:00
Heikki Halmet	c7bd8fc94a	Add OPENSSL_ROOT_DIR for macOS Android targets Enabling OpenSSL requires OPENSSL_ROOT_DIR environment variable. Task-number: QTBUG-97243 Change-Id: I055c236d0f346ddc2e2aff873f2bd98cacfb5ec3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> (cherry picked from commit `ebb9836451`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-01-04 07:40:42 +00:00
Heikki Halmet	a4850c0a7c	Make macOS 12 on ARM developer build tests significant Task-number: QTQAINFRA-4649 Change-Id: Ia12310a3439058f706d55242ece5ee185073f7ce Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `000691d833`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2022-01-03 13:08:39 +00:00
Tor Arne Vestbø	2ec7e5a365	coin: Move all builds over to macOS 12 Change-Id: Ief01ca81cda49d518e910e01f70f78a5c8430ed7 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit `b19b02173c`) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>	2021-12-23 11:13:10 +00:00
Heikki Halmet	2ef984eac1	Replace .ci.local suffix with .ci.qt.io Plan is to terminate .ci.local soon Change-Id: I8198ea744eeb91974569d47b2147f08b18f97f73 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit `d4cb44ad71`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-12-23 08:56:10 +00:00
Tor Arne Vestbø	75f2419e5c	coin: Make macOS 12 on ARM packaging tests significant Change-Id: I6e89626e52f21d19e8665769b4d8f6ee9a54e537 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit `ccf24d5f2a`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-12-21 13:44:35 +00:00
Tor Arne Vestbø	72d28c6e0f	Bump qtconnectivity Change-Id: I8b9ea944ed95d70a41fb7abcef199b77cb15d353 Reviewed-by: Daniel Smith <Daniel.Smith@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit `649592deea`) Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>	2021-12-21 12:00:38 +00:00
Toni Saario	dce7c48f58	Add qt-conan-common platforms Change-Id: I99c9b148d4a3b23acc8c4bbd36cd1ea9ad32eac9 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> (cherry picked from commit `099f184880`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-12-20 08:28:19 +00:00
Kai Köhne	efc8d985c6	Replace LGPL2.1 only header with LGPL3 one This is in line with e.g. qtbase. Also remove outdated/unreferenced license files. Change-Id: I5d3370ab453610f9c8165ff9e57db7ad4a785370 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit `becb423e80`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-12-20 04:26:48 +00:00
Ville-Pekka Karhu	dceadf3e76	macOS: Upgrade Xcode to 13.2 Task-number: QTQAINFRA-4607 Change-Id: Ice52c8f4199e124d92b994cab38151dd712986bf Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit `fe35c4dbb0`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-12-19 19:47:21 +00:00
Ville-Pekka Karhu	eb018be96e	macOS provisioning: Disable bluetooth Change-Id: Ia981b4ab37a6ca15a566feb2fdc176253b419193 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit `20c580e5db`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-12-19 19:47:21 +00:00
Heikki Halmet	8f409a0c71	Remove InsignificantTests flag from Windows 10 targets Change-Id: Ib6ec59762f1188d1dc2a133fdf44628d47fd1b57 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit `ccf269f5da`)	2021-12-18 20:40:54 +02:00
Heikki Halmet	83d1af1b22	Upgrade MSVC 2019 and build tools versions to 16.11.8 Task-number: QTQAINFRA-4704 Change-Id: I77e83f392869e81b20cdc11e970f24448bb66420 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit `9d09f9cee9`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-12-17 15:47:53 +00:00
Jani Heikkinen	9103f23a09	Update latest qt license agreement Change-Id: Iee3b30b298bac748133daf3f0e58f8dab195a2fe Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io> (cherry picked from commit `b9a59fe113`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-12-17 15:47:53 +00:00
Heikki Halmet	808c16c866	Remove Rhel 8.2 targets Rhel 8.4 is already in use Task-number: QTQAINFRA-4515 Change-Id: I32bba97143adb5243e5ba500eceaad9723a7209e Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `b730181404`) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2021-12-16 09:59:07 +02:00
Jani Heikkinen	bc9a03f7f6	Update qttools submodule Change-Id: Ic538882d50ff40a94a7b05d8fbc10b52da61fdbf Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit `f55b82ee1d`)	2021-12-15 06:13:14 +00:00
Pasi Petäjäjärvi	8f783c41aa	CI: Add image support for QNX qemu Task-number: QTBUG-99168 Change-Id: If040af8d074e7e197449eb4be68507e83214d393 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit `1cb9c1caef`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-12-15 03:23:40 +00:00
Pasi Petäjäjärvi	5d3ac77196	CI: Add timezone support for QNX qemu Task-number: QTBUG-99168 Change-Id: Ie27f53fbf68c656dfdd7ddba72ef1c991416faeb Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit `10a443c181`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-12-15 03:23:32 +00:00
Alexandru Croitor	fecfd6f771	Coin:Android: set ANDROID_SDK_ROOT explicitly in macOS 12 config ... and remove ANDROID_{SDK,NDK}_HOME as they are deprecated and might not work even. Amends `7e2882d0a7` Augments `d59825d250` Task-number: QTBUG-97002 Change-Id: I96fb543521d70784d75e524d8b48ac72c42e6815 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit `6e7de2b76c`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-12-14 10:48:59 +00:00
Heikki Halmet	1f2aef79bf	Remove duplicate MinGW environment variables Change-Id: I2018b0c46b9708f699e5da6155e95151a49394fb Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit `5ce8c724d2`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-12-14 10:48:59 +00:00
Toni Saario	4e7f922835	Add tqtc-qtdigitaladvertising platforms Change-Id: I839e0c2509dfac800a06d9c791b693dbc8681a52 (cherry picked from commit `1a1028ea20`) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>	2021-12-14 10:48:59 +00:00
Pasi Petäjäjärvi	65a96ae8cf	CI: Add inotify support for QNX Adds Filesystem event manager server to image and also add HOME env varbiable for root user. Task-number: QTBUG-99168 Change-Id: I4df10f17f4e274dc0d21fea1a767c351ba3c8362 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> (cherry picked from commit `06edc60e1d`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-12-14 07:04:03 +00:00
Jani Heikkinen	6f82a2fad6	Adjust submodule branches Change-Id: Ibbcb381be98a3c20b12402266c4361f3f7531cfd	2021-12-13 07:46:50 +02:00