Update submodules on '6.3 in qt/qt5'

Change-Id: Iff67ff909e5df94f212788fb842e7c33babe4169
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

.gitmodules

@@ -1,53 +1,53 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 6.4.2
+	branch = 6.3
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.4.2
+	branch = 6.3
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase qtshadertools
-	recommends = qtdeclarative qtquick3d
+	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.4.2
+	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.2
+	branch = 6.3
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.4.2
+	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.2
+	branch = 6.3
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -117,203 +117,189 @@
 	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtwebchannel qttools qtpositioning
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.4.2
+	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.2
+	branch = 6.3
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.4.2
+	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.2
+	branch = 6.3
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.4.2
+	branch = 6.3
-	status = addon
+	status = ignore
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.4.2
+	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.2
+	branch = 6.3
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.4.2
+	branch = 6.3
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.4.2
+	branch = 6.3
 	status = addon
 [submodule "qtlanguageserver"]
 	depends = qtbase
 	path = qtlanguageserver
 	url = ../qtlanguageserver.git
-	branch = 6.4.2
+	branch = 6.3
 	status = preview
-[submodule "qthttpserver"]
-	depends = qtbase
-	recommends = qtwebsockets
-	path = qthttpserver
-	url = ../qthttpserver.git
-	branch = 6.4.2
-	status = preview
-[submodule "qtquick3dphysics"]
-	depends = qtbase qtdeclarative qtquick3d qtshadertools
-	path = qtquick3dphysics
-	url = ../qtquick3dphysics.git
-	branch = 6.4.2
-	status = preview
-

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 "${qt_module_dependency_map_prefix}${module}")
-        foreach(dep IN LISTS dependencies)
             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()

_clang-format

@@ -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
+# Disable reflow of qdoc comments: indentation rules are different.
-# qdoc comments: indentation rules are different.
+# Translation comments are also excluded.
-# Translation comments and SPDX license identifiers are also excluded.
+CommentPragmas: "^!|^:"
-CommentPragmas: "^!|^:|^ SPDX-License-Identifier:"
 
 # 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
-

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})

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
+    message(DEBUG "qt_internal_parse_dependencies for ${depends_file}: ${dependencies} ${revisions}")
-        "qt_internal_parse_dependencies for ${depends_file}\n    dependencies: ${dependencies}")
     set(${out_dependencies} "${dependencies}" PARENT_SCOPE)
 endfunction()
 
-# Helper macro for qt_internal_resolve_module_dependencies.
+# Load $module and populate $out_ordered with the submodules based on their dependencies
-macro(qt_internal_resolve_module_dependencies_set_skipped value)
+# $ordered carries already sorted dependencies; $out_has_dependencies is left empty
-    if(DEFINED arg_SKIPPED_VAR)
+# if there are no dependencies, otherwise set to 1; Save list of dependencies for $module into
-        set(${arg_SKIPPED_VAR} ${value} PARENT_SCOPE)
+# $out_module_dependencies. List may contain duplicates, since function checks max depth
-    endif()
+# dependencies.
-endmacro()
+# 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
-# Strips tqtc- prefix from a repo name.
+                                             out_module_dependencies out_revisions)
-function(qt_internal_normalize_repo_name repo_name out_var)
+    set(depends_file "${CMAKE_CURRENT_SOURCE_DIR}/${module}/dependencies.yaml")
-    string(REGEX REPLACE "^tqtc-" "" normalized "${repo_name}")
+    if(NOT EXISTS "${depends_file}")
-    set(${out_var} "${normalized}" PARENT_SCOPE)
+        set(${out_has_dependencies} "" 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)
         return()
     endif()
-
+    set(${out_has_dependencies} "1" PARENT_SCOPE)
-    set_property(GLOBAL APPEND PROPERTY _qt_internal_seen_repos ${module})
+    set(dependencies "")
-
+    qt_internal_parse_dependencies("${depends_file}" dependencies)
-    # Set a default REVISION.
+    # module hasn't been seen yet, append it
-    if("${arg_REVISION}" STREQUAL "")
+    list(FIND ordered "${module}" pindex)
-        set(arg_REVISION HEAD)
+    if (pindex EQUAL -1)
+        list(LENGTH ordered pindex)
+        list(APPEND ordered "${module}")
+        list(APPEND revisions "HEAD")
     endif()
-
+    set(modules_dependencies "")
-    # 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)
     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()
-
+        list(APPEND modules_dependencies "${dependency}")
-        set(normalize_arg "")
+        list(FIND ordered "${dependency}" dindex)
-        if(arg_NORMALIZE_REPO_NAME_IF_NEEDED)
+        if (dindex EQUAL -1)
-            qt_internal_use_normalized_repo_name_if_needed("${dependency}" dependency)
+            # dependency hasnt' been seen yet - load it
-            set(normalize_arg "NORMALIZE_REPO_NAME_IF_NEEDED")
+            list(INSERT ordered ${pindex} "${dependency}")
-        endif()
+            list(INSERT revisions ${pindex} "${revision}")
-
+            qt_internal_add_module_dependencies(${dependency} "${ordered}" ordered has_dependency
-        set_property(GLOBAL APPEND PROPERTY QT_DEPS_FOR_${module} ${dependency})
+                                                "${out_module_dependencies}" revisions)
-        if(required)
+        elseif(dindex GREATER pindex)
-            set_property(GLOBAL APPEND PROPERTY QT_REQUIRED_DEPS_FOR_${module} ${dependency})
+            # otherwise, make sure it is before module
-        endif()
+            list(REMOVE_AT ordered ${dindex})
-
+            list(REMOVE_AT revisions ${dindex})
-        qt_internal_resolve_module_dependencies(${dependency} dep_ordered dep_revisions
+            list(INSERT ordered ${pindex} "${dependency}")
-            REVISION "${revision}"
+            list(INSERT revisions ${pindex} "${revision}")
-            SKIPPED_VAR skipped
-            IN_RECURSION
-            ${normalize_arg}
-        )
-        if(NOT skipped)
-            list(APPEND ordered ${dep_ordered})
-            list(APPEND revisions ${dep_revisions})
         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.
+# populates $out_all_ordered with the sequence of the modules that need
-# "Module" is here used in the sense of Qt repository.
+# to be built in order to build $modules; dependencies for each module are populated
-#
+# in variables with specified in $dependencies_map_prefix prefix
-# Returns all dependencies, including transitive ones, in topologically sorted order.
+function(qt_internal_sort_module_dependencies modules out_all_ordered dependencies_map_prefix)
-#
+    set(ordered "")
-# 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)
     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()
-
+    if (no_dependencies)
-    qt_internal_resolve_module_dependencies(all_selected_repos ordered unused_revisions
+        list(APPEND ordered "${no_dependencies}")
-        PARSED_DEPENDENCIES ${all_selected_repos_as_parsed_dependencies}
+    endif()
-        NORMALIZE_REPO_NAME_IF_NEEDED
+    message(DEBUG "qt_internal_parse_dependencies sorted ${modules}: ${ordered}")
-    )
-
-    # 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}")
     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 (NOT has_dependencies)
-        if (count EQUAL "0")
             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 )

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

coin/conan/profiles/ci-linux-developer-x86_64-gcc

@@ -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"

coin/conan/profiles/ci-linux-webassembly-x86_64-gcc

@@ -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"

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"

coin/conan/profiles/ci-macos-ios-arm64-clang

@@ -1 +1 @@
-include(./macos-ios-arm64-clang)
+include(macos-ios-arm64-clang)

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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%\.."

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"
 

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"
-

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

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

coin/conan/profiles/linux-webassembly-x86_64-gcc

@@ -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]

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:separate_debug_info=yes
-qtbase:force_debug_info=True
+qtbase:force_debug_info=yes
-qtbase:bundled_xcb_xinput=True
+qtbase:bundled_xcb_xinput=yes
-qtbase:libudev=False
+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]

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

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

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:force_debug_info=yes
-qtbase:separate_debug_info=True
+qtbase:separate_debug_info=yes
-qtbase:framework=True
+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]

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:release=yes
-qtbase:force_debug_info=True
+qtbase:shared=yes
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:platform=android-clang

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:release=yes
-qtbase:force_debug_info=True
+qtbase:shared=yes
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:platform=android-clang

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:release=yes
-qtbase:force_debug_info=True
+qtbase:shared=yes
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:platform=android-clang

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:release=yes
-qtbase:force_debug_info=True
+qtbase:shared=yes
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=$QT_HOST_PATH
 qtbase:platform=android-clang

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:release=yes
-qtbase:pkg_config=False
+qtbase:shared=yes
-qtbase:force_debug_info=True
+qtbase:pkg_config=no
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=%QT_HOST_PATH%
 qtbase:platform=android-clang

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:release=yes
-qtbase:pkg_config=False
+qtbase:shared=yes
-qtbase:force_debug_info=True
+qtbase:pkg_config=no
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=%QT_HOST_PATH%
 qtbase:platform=android-clang

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:release=yes
-qtbase:pkg_config=False
+qtbase:shared=yes
-qtbase:force_debug_info=True
+qtbase:pkg_config=no
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=%QT_HOST_PATH%
 qtbase:platform=android-clang

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:release=yes
-qtbase:pkg_config=False
+qtbase:shared=yes
-qtbase:force_debug_info=True
+qtbase:pkg_config=no
+qtbase:force_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:qt_host_path=%QT_HOST_PATH%
 qtbase:platform=android-clang

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"

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

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:shared=yes
-qtbase:force_debug_info=True
+qtbase:debug_and_release=yes
-qtbase:separate_debug_info=True
+qtbase:force_debug_info=yes
+qtbase:separate_debug_info=yes
 qtbase:nomake=examples;tests
 qtbase:zlib=qt
 qtbase:libjpeg=qt

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:debug_and_release=yes
-qtbase:force_debug_info=True
+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=""

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

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

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"

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"

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

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"

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

coin/platform_configs/cmake_platforms.yaml

@@ -2,7 +2,9 @@ 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
     ]
@@ -10,202 +12,178 @@ Configurations:
 -
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
+    Features: ['Sccache']
-    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
+    Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_widgets=OFF'
-    Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'DisableTests']
+    Configure arguments: '-DFEATURE_developer_build=ON -DFEATURE_gui=OFF'
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'DisableTests']
+    Configure arguments: '-DFEATURE_developer_build=ON -DINPUT_opengl=no'
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Compiler: 'GCC'
+    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: 'Ubuntu-20.04-host'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'UseConfigure']
+    Features: ['Sccache']
-    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'
+    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'
-    Environment variables: [
-        'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
-    ]
 -
-    Id: 'OpenSUSE-15.4-host'
+    Id: 'OpenSUSE-15.3-host'
-    Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
+    Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
+    Features: ['Sccache']
-    Configure arguments: '-nomake examples -developer-build'
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON'
     Environment variables: [
-        'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
+        'CONAN_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc']
-        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer'
-    ]
 -
-    Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
+    Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Sccache']
-    Configure arguments: '-nomake examples -static -no-sql-mysql'
+    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=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
+    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_21H2-x86_64-51'
     Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
+    Features: ['Packaging', 'Sccache', "DebugAndRelease"]
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
+    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}}',
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64']
+        'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64']
 -
-    Template: 'qtci-windows-11_21H2-x86_64-52'
+    Template: 'qtci-windows-11_21H2-x86_64-51'
     Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
+    Features: ['Packaging', 'Sccache', "DebugAndRelease", 'InsignificantTests']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
+    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}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
+        '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", 'UseConfigure']
+    Features: ['Sccache', "DebugAndRelease"]
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
+    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}}'
     ]
 -
-    Template: 'qtci-windows-11_21H2-x86_64-52'
+    Template: 'qtci-windows-11_21H2-x86_64-51'
     Compiler: 'MSVC2022'
-    Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
+    Features: ['Sccache', "DebugAndRelease", 'InsignificantTests']
-    Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
+    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}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
+        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
     ]
 -
     Id: 'Windows10_21H2-MSVC2019-x64-host'
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'MSVC2019'
-    Features: ['Sccache', 'Conan', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
+    Features: ['Sccache', "DebugAndRelease"]
-    Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
+    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'
-    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}}'
-    ]
 -
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'MSVC2019'
     Target arch: 'arm64'
-    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
+    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging']
     Platform dependency: 'Windows10_21H2-MSVC2019-x64-host'
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
+        '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}}',
-        'TARGET_CMAKE_ARGS=-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_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer',
+        'CONAN_PROFILE=coin/conan/profiles/windows-arm64-msvc2019_64',
-        'CONAN_PROFILE=coin/conan/profiles/ci-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: 'Windows11_21H2-MSVC2019-x64-host'
-    Template: 'qtci-windows-11_21H2-x86_64-52'
+    Template: 'qtci-windows-11_21H2-x86_64-51'
     Compiler: 'MSVC2019'
-    Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
+    Features: ['Sccache', "DebugAndRelease", "InsignificantTests"]
-    Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
+    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: [
-        'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
+        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}'
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-    ]
 -
-    Template: 'qtci-windows-11_21H2-x86_64-52'
+    Template: 'qtci-windows-11_21H2-x86_64-51'
     Compiler: 'MSVC2019'
     Target arch: 'arm64'
-    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
+    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'InsignificantTests']
     Platform dependency: 'Windows11_21H2-MSVC2019-x64-host'
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
+        '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',
-        'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64',
+        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-        'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64'
-    ]
 -
     Id: 'RHEL-8.4-host'
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies']
+    Features: ['Packaging', 'Sccache']
-    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'
+    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/linux-x86_64-gcc']
-        'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc'
-    ]
 -
-    Id: 'ios-universal'
+    Template: 'qtci-macos-11-x86_64-104'
-    Template: 'qtci-macos-12-x86_64-105'
     Target os: 'IOS_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
     Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
-    Environment variables: [
+    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS',
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=',
-        'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang',
+        'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
-        'CONAN_PROFILE=coin/conan/profiles/ci-macos-ios-arm64-clang'
+        'CONAN_PROFILE=coin/conan/profiles/macos-ios-arm64-clang']
-    ]
 -
     Id: 'Windows10_21H2-Mingw11-x64-host'
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'Mingw'
-    Features: ['Packaging', 'Sccache', 'UseConfigure']
+    Features: ['Packaging', 'Sccache']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
+    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_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
-        'NON_QTBASE_CMAKE_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: 'Windows10_21H2-LLVM-x64-host'
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'Clang'
-    Features: ['Sccache', 'UseConfigure']
+    Features: ['Sccache']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
+    Configure arguments: '-GNinja -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: [
+    Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
-        'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
+        'LLVM_INSTALL_DIR=C:\llvm-mingw']
-        '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: 'Windows11_21H2-LLVM-x64-host'
-    Template: 'qtci-windows-11_21H2-x86_64-52'
+    Template: 'qtci-windows-11_21H2-x86_64-51'
     Compiler: 'Clang'
-    Features: ['Sccache', 'UseConfigure']
+    Features: ['Sccache', 'InsignificantTests']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
+    Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
-    Environment variables: [
+    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',
-        'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'LLVM_INSTALL_DIR=C:\llvm-mingw']
-        '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'
-    ]
 -
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'Mingw'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
+    Features: ['Sccache']
-    Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
+    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_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: [
+    Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
-        '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}}'
-    ]
 -
-    Template: 'qtci-windows-11_21H2-x86_64-52'
+    Template: 'qtci-windows-11_21H2-x86_64-51'
     Compiler: 'Mingw'
-    Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
+    Features: ['Sccache', 'InsignificantTests']
-    Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg'
+    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_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: [
+    Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
-        '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}}'
-    ]

coin/platform_configs/cmake_platforms_qemu.yaml

@@ -1,18 +1,16 @@
 Version: 2
 Configurations:
 -
-    Id: 'qemu-armv7-on-ubuntu20.04'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QEMU'
     Target arch: 'armv7'
     Compiler: 'GCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'UseConfigure']
+    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_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',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON',
         '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',
@@ -23,12 +21,11 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'GCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'UseConfigure']
+    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_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',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON',
         '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',
@@ -39,12 +36,11 @@ Configurations:
     Target arch: 'mips64'
     Compiler: 'GCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'DisableTests', 'UseConfigure']
+    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_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',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON',
         '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',

coin/platform_configs/cmake_platforms_qemu_qnx710.yaml

@@ -1,20 +1,20 @@
 Version: 2
 Configurations:
 -
-    Id: 'qnx-x86_64-on-ubuntu20.04'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QNX_710'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'QCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Packaging', 'VMSize8', 'UseConfigure']
+    Features: ['Packaging', 'InsignificantTests', 'VMSize8']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
+        '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',
-        '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.21.1/bin',
-        'QT_CMAKE_DIR=/opt/cmake-3.24.2/bin',
+        "TESTARGS='{{.Env.QNX_QEMU_SSH}} LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen'",
-        'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci',
+        "TESTRUNNER='python3 {{.SourceDir}}/coin_qnx_qemu_runner.py'",
-    ]
+        "COIN_CTEST_RESULTSDIR=/home/qt/work",
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
 -
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QNX_710'
@@ -22,11 +22,10 @@ Configurations:
     Compiler: 'GCC'
     Target compiler: 'QCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Packaging', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
+        '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',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
-    ]
 -
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Target os: 'QNX_710'
@@ -34,8 +33,7 @@ Configurations:
     Compiler: 'GCC'
     Target compiler: 'QCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Packaging', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
+        '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',
-        'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
-    ]

coin/platform_configs/cmake_platforms_static_tests.yaml

@@ -1,25 +1,20 @@
 Version: 2
 Configurations:
 -
-    Id: 'sles-15-static'
+    Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
-    Template: 'qtci-linux-SLES-15_SP4-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
+    Features: ['Sccache', 'MinimalStaticTests']
-    Configure arguments: '-nomake examples -static -no-sql-mysql'
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-    Environment variables: [
-        'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-    ]
 -
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'MSVC2019'
-    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
+    Features: ['Sccache', 'MinimalStaticTests']
-    Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib'
+    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}}'
     ]
 -
-    Template: 'qtci-macos-11-x86_64-105'
+    Template: 'qtci-macos-11-x86_64-104'
     Compiler: 'Clang'
-    Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
+    Features: ['Sccache', 'MinimalStaticTests']
-    Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework'
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DFEATURE_framework=OFF'

coin/platform_configs/cmake_platforms_target_android.yaml

@@ -1,65 +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-latest-xcode-universal-packaging-build'
-    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}}'
-    ]
--
-    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', '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}}'
-    ]
--
-    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', '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',
-        '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}}'
-    ]
--
-    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', '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',
-        '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}}'
-    ]

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'
+    ]

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'
+    ]

coin/platform_configs/cmake_platforms_target_android_host_windows.yaml

@@ -0,0 +1,58 @@
+Version: 2
+Configurations:
+-
+    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',
+        '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: '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',
+        '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: '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',
+        '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_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']
+

coin/platform_configs/cmake_platforms_wasm.yaml

@@ -1,26 +1,37 @@
 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-host'
+    Platform dependency: 'OpenSUSE-15.3-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
         'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples',
+        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
-        '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'
     ]
 -
-    Id: 'webassembly-thread-asyncify'
+    Template: 'qtci-windows-10_21H2-x86_64-51'
-    Template: 'qtci-linux-openSUSE-15.4-x86_64-50'
     Target os: 'WebAssembly'
-    Compiler: 'GCC'
+    Compiler: 'Mingw'
-    Platform dependency: 'OpenSUSE-15.4-host'
+    Target compiler: 'Clang'
-    Features: ['Sccache', 'DisableTests']
+    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=Release',
+        '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"',
+        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+        'CONAN_HOST_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc',
+        'CONAN_PROFILE=coin/conan/profiles/linux-webassembly-x86_64-gcc'
+    ]

coin/platform_configs/integrity.yaml

@@ -1,20 +1,17 @@
 Version: 2
 Configurations:
     -
-      Id: "integrity-arm64-on-ubuntu20.04"
       Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
       Compiler: 'GCC'
       Target os: 'INTEGRITY'
       Platform dependency: 'Ubuntu-20.04-host'
-      Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
+      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_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',
-          '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',
           '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']

coin/platform_configs/ios-tests.yaml

@@ -2,13 +2,11 @@ Version: 2
 Configurations:
 -
     Id: "ios-tests-target"
-    Template: 'qtci-macos-12-x86_64-105'
+    Template: 'qtci-macos-10.14-x86_64'
     Target os: 'IOS_ANY'
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
     Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-    Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
+    Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests']
-    Environment variables: [
+    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=']
-        'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'
-    ]

coin/platform_configs/linux_android_tests_developer.yaml

@@ -1,17 +0,0 @@
-Version: 2
-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', '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}}',
-        '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']

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-x86_64-104'
+        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'

coin/platform_configs/macos.yaml

@@ -9,26 +9,14 @@ Configurations:
 
     -
         Id: 'macos-latest-xcode-universal-packaging-build'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-102'
         Compiler: 'Clang'
         Target arch: 'x86_64-arm64'
-        Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
+        Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors']
-        Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
+        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_CONFIGURE_ARGS=-DFEATURE_gds=OFF',
-            'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}}',
+            'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
-            'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang'
-        ]
-
-    -
-        Id: 'macos-latest-xcode-arm64-universal-build'
-        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"'
         ]
 
     # Test on all supported macOS versions (deployment targets)
@@ -47,7 +35,7 @@ Configurations:
         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-x86_64-104'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-latest-xcode-universal-packaging-build'
@@ -63,30 +51,12 @@ Configurations:
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
         Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-    -
-        Id: 'macos-13-arm64-tests'
-        Template: 'qtci-macos-13-arm64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging']
-        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-latest-xcode-universal-packaging-build'
-    -
-        Id: 'macos-12-arm64-arm64-universal-build-tests'
-        Template: 'qtci-macos-12-arm64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-universal-build'
-    -
-        Id: 'macos-12-x86_64-arm64-universal-build-tests'
-        Template: 'qtci-macos-12-x86_64-105'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-universal-build'
 
     # =========================================================================
     # Developer build. Single architecture builds.
@@ -96,64 +66,33 @@ Configurations:
 
     -
         Id: 'macos-latest-xcode-x86_64-developer-build'
-        Template: 'qtci-macos-12-x86_64-105'
+        Template: 'qtci-macos-12-x86_64-102'
         Compiler: 'Clang'
-        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
+        Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors']
-        Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
+        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}}'
-        Environment variables: [
-            'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
-            'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
-        ]
     -
         Id: 'macos-latest-xcode-arm64-developer-build'
         Template: 'qtci-macos-12-arm64'
         Compiler: 'Clang'
-        Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
+        Features: ['DoNotRunTests', 'WarningsAreErrors']
-        Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework'
+        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-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-x86_64-105'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
-        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
     -
         Id: 'macos-11-arm64-developer-build-tests'
         Template: 'qtci-macos-11.0-arm64'
         Compiler: 'Clang'
         Features: ['TestOnly']
         Platform dependency: 'macos-latest-xcode-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-latest-xcode-x86_64-developer-build'
     -
         Id: 'macos-12-arm64-developer-build-tests'
         Template: 'qtci-macos-12-arm64'
         Compiler: 'Clang'
         Features: ['TestOnly']
         Platform dependency: 'macos-latest-xcode-arm64-developer-build'
-    -
+
-        Id: 'macos-13-arm64-developer-build-tests'
+    # See macos-developer-build-tests.yaml for x86_64 tests,
-        Template: 'qtci-macos-13-arm64'
+    # as we limit those to qtbase and declarative.
-        Compiler: 'Clang'
-        Features: ['TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-developer-build'

coin/platform_configs/nightly_qnx710_host_windows.yaml

@@ -1,20 +0,0 @@
-Version: 2
-Include: [
-    cmake_platforms.yaml: [
-        Windows10_21H2-MSVC2019-x64-host
-    ]
-]
-Configurations:
--
-    Template: 'qtci-windows-10_21H2-x86_64-51'
-    Target os: 'QNX_710'
-    Target arch: 'arm64'
-    Compiler: 'MSVC2019'
-    Target compiler: 'QCC'
-    Platform dependency: 'Windows10_21H2-MSVC2019-x64-host'
-    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'
-    ]

coin/platform_configs/precheck.yaml

@@ -1,22 +0,0 @@
-Version: 2
-Module only: True
-Include: [
-  cmake_platforms.yaml: [
-    "Ubuntu-20.04-host",
-    "Windows10_21H2-MSVC2019-x64-host",
-    "ios-universal"
-  ],
-  macos.yaml: [
-    "macos-12-x86_64-tests",
-  ],
-  cmake_platforms_target_android.yaml: [
-    "android-arm64-on-macos"
-  ],
-  cmake_platforms_qemu.yaml: [
-    "qemu-armv7-on-ubuntu20.04"
-  ],
-  cmake_platforms_qemu_qnx710.yaml: [
-    "qnx-x86_64-on-ubuntu20.04"
-  ]
-]
-Configurations: []

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']

coin/platform_configs/qt-creator.yaml

@@ -4,7 +4,7 @@ Configurations:
 -
     Template: 'qtci-windows-10_21H2-x86_64-51'
     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']
@@ -18,19 +18,13 @@ Configurations:
 -
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
-    Configure arguments: ''
-    Environment variables: []
--
-    Template: 'qtci-linux-RHEL-8.4-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Qt5', 'Sccache', 'DebugAndRelease']
     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: []
 -

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=-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_INSTALL_DIR={{.InstallDir}}/target',
+        'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang']
+

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
 ]

coin/platform_configs/qthttpserver.yaml

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

coin/platform_configs/qtquick3dphysics.yaml

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

coin/platform_configs/qtsaferenderer.yaml

@@ -4,21 +4,21 @@ Configurations:
     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_21H2-x86_64-51'
     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-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'

coin/platform_configs/qtwebengine.yaml

@@ -1,5 +1,6 @@
 Version: 2
 Include: [
-    cmake_platforms.yaml
+    cmake_platforms.yaml,
+    macos-developer-build-tests.yaml
 ]
 Configurations: []

coin/platform_configs/tqtc-android-automotive.yaml

@@ -1,45 +1,38 @@
 Version: 2
-Include: [ cmake_platforms_target_android.yaml ]
+Include: [
+    cmake_platforms_target_android_host_linux.yaml,
+    cmake_platforms_target_android_host_macos.yaml,
+    cmake_platforms_target_android_host_windows.yaml
+    ]
 Configurations:
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
-    Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
 -
     Id: 'Windows10_21H2-Mingw11-x64-host'
     Template: 'qtci-windows-10_21H2-x86_64-51'
     Compiler: 'Mingw'
-    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DoNotRunTests']
-    Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg'
+    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_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
-    ]
 -
     Id: 'macos-latest-xcode-universal-packaging-build'
-    Template: 'qtci-macos-12-x86_64-105'
+    Template: 'qtci-macos-12-x86_64-102'
     Compiler: 'Clang'
     Target arch: 'x86_64-arm64'
-    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors']
-    Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
+    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_CONFIGURE_ARGS=-DFEATURE_gds=OFF',
-        'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF',
+        'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang']
-        'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
-    ]
 -
     Id: 'RHEL-8.4-host'
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'DoNotRunTests']
-    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'
+    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/linux-x86_64-gcc']
-        'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'
-    ]
 -
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
     Target os: 'Android_ANY'
@@ -47,11 +40,9 @@ Configurations:
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: 'RHEL-8.4-host'
-    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun']
     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_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}}',
-        'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
         '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'
+        'ANDROID_EMULATOR=@x86AutomotiveEmulator']
-    ]

coin/platform_configs/tqtc-qtinsighttracker.yaml

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

coin/platform_configs/tqtc-qtvncserver.yaml

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

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']

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

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

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

@@ -27,12 +27,3 @@
   - Copy its content to Tier1 folder
 * Copy Tier1 folder to 101 NFS
    - Check folder access rights
-
-# How to upgrade existing Tier1 image
-
-* Open KVM connection to Intel mac Parallels host
-   - Open Parallels :: create new VM :: select macOS :: start installation but then stop it when machine boots to recovery mode
-* You should now have a virtual machine folder in /Users/qt/Parallels/<VM folder>
-* Remove files from <VM folder>/harddisk.hdd/ and copy Tier1 VM files from NFS to <VM folder>/harddisk.hdd/
-* Start the virtual machine and make needed changes
-* Copy <VM folder>/harddisk.hdd to NFS with updated number in its name

coin/provisioning/common/linux/android_linux.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2022 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -55,59 +55,32 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 targetFolder="/opt/android"
 sdkTargetFolder="$targetFolder/sdk"
 
-sudo mkdir -p $sdkTargetFolder
-
 basePath="http://ci-files01-hki.intra.qt.io/input/android"
 
 toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
-ndkVersionLatest="r23b"
+ndkVersion="r22b"
-ndkVersionDefault=$ndkVersionLatest
+ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
 sdkBuildToolsVersion="31.0.0"
 sdkApiLevel="android-31"
 
 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
-ndkSha1Latest="f47ec4c4badd11e9f593a8450180884a927c330d"
+ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc"
-ndkSha1Default=$ndkSha1Latest
-# Android automotive
-sdkApiLevelAutomovie="android-30"
-androidAutomotive11Url="$basePath/${sdkApiLevelAutomovie}_automotive.tar.gz"
-androidAutomotive="android-automotive"
-android11Sha="4a5cd2bea7ce323b724c3ff1faab13d99f9d2be9"
 
 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
+ndkTargetFile="/tmp/$ndkFile"
+ndkSourceFile="$basePath/$ndkFile"
 
-echo "Download and unzip Android SDK"
 DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile"
+DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
+echo "Unzipping Android NDK to '$targetFolder'"
+sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
 echo "Unzipping Android Tools to '$sdkTargetFolder'"
 sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder"
+rm "$ndkTargetFile"
 rm "$toolsTargetFile"
 
-function InstallNdk() {
-
-    ndkVersion=$1
-    ndkSha1=$2
-
-    if [[ ! -d $targetFolder/android-ndk-$ndkVersion ]]; then
-
-        ndkFile="android-ndk-$ndkVersion-linux.zip"
-        ndkTargetFile="/tmp/$ndkFile"
-        ndkSourceFile="$basePath/$ndkFile"
-
-        DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
-        echo "Unzipping Android NDK to '$targetFolder'"
-        sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
-        rm "$ndkTargetFile"
-    fi
-
-}
-
-InstallNdk $ndkVersionDefault $ndkSha1Default
-SetEnvVar "ANDROID_NDK_ROOT_DEFAULT" "$targetFolder/android-ndk-$ndkVersionDefault"
-InstallNdk $ndkVersionLatest $ndkSha1Latest
-SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest"
-
 echo "Changing ownership of Android files."
 if uname -a |grep -q "el7"; then
     sudo chown -R qt:wheel "$targetFolder"
@@ -143,6 +116,7 @@ echo "Checking the contents of Android SDK..."
 ls -l "$sdkTargetFolder"
 
 SetEnvVar "ANDROID_SDK_ROOT" "$sdkTargetFolder"
+SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion"
 SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
 SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
 
@@ -162,15 +136,6 @@ echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86"  \
 echo "Checking the contents of Android SDK again..."
 ls -l "$sdkTargetFolder"
 
-echo "no" | ./avdmanager create avd -n emulator_x86_api_23 -c 2048M -f \
+echo "no" | ./avdmanager create avd -n x86emulator -k "system-images;android-23;google_apis;x86" -c 2048M -f
-    -k "system-images;android-23;google_apis;x86"
-
-echo "Install $sdkApiLevelAutomovie $androidAutomotive"
-DownloadURL "$androidAutomotive11Url" "$androidAutomotive11Url" "$android11Sha" \
-    "/tmp/${sdkApiLevelAutomovie}_automotive.tar.gz"
-sudo tar -xzf "/tmp/${sdkApiLevelAutomovie}_automotive.tar.gz" -C $sdkTargetFolder/system-images
-echo "no" | ./avdmanager create avd -n automotive_emulator_x86_api_30 -c 2048M -f \
-    -k "system-images;${sdkApiLevelAutomovie};${androidAutomotive};x86"
-
 # Purely informative, show the list of avd devices
 ./avdmanager list avd

coin/provisioning/common/linux/bootstrap-autostart.sh

@@ -1,126 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2022 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-set -ex
-
-# Make bootstap agent run in background without terminal view
-# Terminal view can cause issues with Autotests
-
-# Create shell wrapper to pass environment variables
-wrapper="${HOME}/bootstrap-agent.sh"
-autostart_folder="${HOME}/.config/autostart"
-# This directory should exist. Created in base image (tier 1)
-mkdir -p ${autostart_folder}
-
-# Create autostart desktop file and shell wrapper
-sudo tee ${autostart_folder}/coin-bootstrap-agent.desktop <<"EOF"
-[Desktop Entry]
-Type=Application
-Exec=/home/qt/bootstrap-agent.sh
-Hidden=false
-X-GNOME-Autostart-enabled=true
-Name=Coin
-EOF
-
-sudo tee $wrapper <<"EOF"
-#!/bin/sh
-# Wait for network to come up
-x=0
-while ! cat "/etc/resolv.conf" | grep -v "#" | grep "nameserver" > /dev/null ; do
-    echo "(WW) wating for network ($x/20)..." >> /home/qt/bootstrap-agent.txt
-    x=$((x+1))
-    sleep 1
-    if [ "$x" -gt 20 ]; then
-        echo "(EE) netowrk down. Exiting bootstrap." >> /home/qt/bootstrap-agent.txt
-        exit 1
-    fi
-done
-echo "(**) network found." >>  /home/qt/bootstrap-agent.txt
-
-# Wait for context to be mounted
-x=0
-while ! ([ -f "/media/qt/CONTEXT/context.sh" ] || [ -f "/media/CONTEXT/context.sh" ] || [ -f "/run/media/qt/CONTEXT/context.sh" ]); do
-    echo "(WW) waiting for context file to be mounted ($x/20)..." >> /home/qt/bootstrap-agent.txt
-    x=$((x+1))
-    sleep 1
-    if [ "$x" -gt 20 ]; then
-        echo "(WW) no context file found. Mounting manually." >> /home/qt/bootstrap-agent.txt
-        break
-    fi
-done
-
-# establish mount path (differs per distro)
-if ! ([ -f "/media/qt/CONTEXT/context.sh" ] || [ -f "/media/CONTEXT/context.sh" ] || [ -f "/run/media/qt/CONTEXT/context.sh" ]); then
-    MOUNTPATH="invalid"
-    if [ -d "/run/media/qt/CONTEXT" ]; then
-            MOUNTPATH="/run/media/qt/CONTEXT"
-    fi
-    if [ -d "/media/qt/CONTEXT" ]; then
-            MOUNTPATH="/media/qt/CONTEXT"
-    fi
-    if [ -d "/media/CONTEXT" ]; then
-            MOUNTPATH="/media/CONTEXT"
-    fi
-
-    # try mounting if unmounted
-    if [ -d "$MOUNTPATH" ]; then
-        if ! mount | grep "$MOUNTPATH" > /dev/null ; then
-            echo "(WW) context file not mounted..." >> /home/qt/bootstrap-agent.txt
-            echo "(WW) waiting 1 minute" >> /home/qt/bootstrap-agent.txt
-            sleep 60
-            echo "(**) mount /dev/sr0 $MOUNTPATH" >> /home/qt/bootstrap-agent.txt
-            sudo mount -r /dev/sr0 $MOUNTPATH
-        fi
-    fi
-fi
-
-if ([ -f "/media/qt/CONTEXT/context.sh" ] || [ -f "/media/CONTEXT/context.sh" ] || [ -f "/run/media/qt/CONTEXT/context.sh" ]); then
-    echo "(**) context found." >>  /home/qt/bootstrap-agent.txt
-else
-    echo "(EE) context not found. Starting bootstrap anyway." >>  /home/qt/bootstrap-agent.txt
-fi
-
-/home/qt/bootstrap-agent /dev/ttyS0
-EOF
-
-# set owner and permissions
-sudo chown qt:users $wrapper
-sudo chmod 755 $wrapper

coin/provisioning/common/linux/cleanup_cache.sh

@@ -1,96 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2022 The Qt Company Ltd.
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script needs to be called at the end of provisioning, to clean the cache directory
-
-set -e
-set -f
-QT_USER="qt"
-CACHE=".cache"
-
-echo "---- starting cache cleanup."
-
-# skip if user qt does not exist
-echo "---- checking user $QT_USER"
-if grep -q "^$QT_USER:" /etc/passwd; then
-    echo "(**) found user $QT_USER"
-else
-    echo "(WW) user $QT_USER not found."
-    echo "---- skipping cache cleanup."
-    exit 0;
-fi
-
-# assume /home/qt as ~ won't expand into sudo
-CACHEDIR="/home/$QT_USER/$CACHE"
-
-# delete files from a directory if it exists
-echo "---- checking cache directory  $CACHEDIR"
-if sudo [ -d "$CACHEDIR" ]; then
-    if [ "$(sudo ls -A $CACHEDIR)" ]; then
-       echo "(WW) cache in $CACHEDIR is not empty."
-       echo "---- removing content:"
-
-       # List files and delete in a loop as wildcard won't expand into sudo
-       FILES=`sudo ls -A1 $CACHEDIR`
-       while read FILE;
-           do
-           echo "--- rm -rf $FILE"
-           sudo rm -rf "$CACHEDIR/$FILE"
-       done <<< $FILES
-    else
-       echo "(**) cache in $CACHEDIR is empty."
-    fi
-else
-    if sudo [ -f "$CACHEDIR" ]; then
-        # replace a cache file with a directory
-        echo "(WW) $CACHEDIR is a file."
-        echo "---- removing $CACHEDIR."
-        sudo rm -rf "$CACHEDIR"
-    else
-        echo "(WW) cache directory $CACHEDIR not found."
-    fi
-
-    # create new cache directory and assign rights
-    echo "---- creating cache director $CACHEDIR."
-    sudo mkdir "$CACHEDIR"
-    sudo chown $QT_USER:users $CACHEDIR
-    sudo chmod 700 $CACHEDIR
-fi