Update submodules on '6.0.0' in qt/qt5

Change-Id: Id0ba767da51533b5e7682bf7d15f1936b34ef067
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

.gitmodules

@@ -1,20 +1,20 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = dev
+	branch = 6.0.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = dev
+	branch = 6.0.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = dev
+	branch = 6.0.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
@@ -34,7 +34,7 @@
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = dev
+	branch = 6.0.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
@@ -47,7 +47,7 @@
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = dev
+	branch = 6.0.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -55,7 +55,7 @@
 	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = dev
+	branch = 6.0.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -123,7 +123,7 @@
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = dev
+	branch = 6.0.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
@@ -229,7 +229,7 @@
 	recommends = qtimageformats qtgraphicaleffects
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = dev
+	branch = 6.0.0
 	status = essential
 [submodule "qtpurchasing"]
 	depends = qtbase
@@ -309,23 +309,23 @@
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = dev
+	branch = 6.0.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = dev
+	branch = 6.0.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = dev
+	branch = 6.0.0
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = dev
+	branch = 6.0.0
 	status = deprecated

CMakeLists.txt

@@ -1,6 +1,12 @@
-cmake_minimum_required(VERSION 3.15.0)
+set(__qt6_qtbase_src_path "${CMAKE_CURRENT_SOURCE_DIR}/qtbase")
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/qtbase/cmake/QtAutoDetect.cmake)
+include("${__qt6_qtbase_src_path}/.cmake.conf")
+include("${__qt6_qtbase_src_path}/cmake/QtCMakeVersionHelpers.cmake")
+qt_internal_check_for_suitable_cmake_version()
+qt_internal_get_computed_minimum_cmake_version(__qt_minimum_cmake_version)
+cmake_minimum_required(VERSION ${__qt_minimum_cmake_version})
+
+include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")
 
 project(Qt
     VERSION 6.0.0
@@ -13,42 +19,17 @@ project(Qt
 enable_testing()
 
 set(qt_module_prop_prefix "__qt_prop_")
-function(extract_git_submodules out_module_list)
-    set(current_module "")
-    set(module_list "")
-    file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules" lines)
-    foreach(line IN LISTS lines)
-        # Skip empty lines.
-        if(NOT line)
-            continue()
-        endif()
-        string(REGEX REPLACE "^\\[submodule \"([^\"]+)\"\\]$" "\\1" module "${line}")
-        if (NOT module STREQUAL line)
-            set(current_module "${module}")
-            list(APPEND module_list "${module}")
-        else()
-            string(REGEX REPLACE "^\t([^ =]+) *=.*$" "\\1" prop "${line}")
-            if (NOT prop STREQUAL line)
-                string(REGEX REPLACE "^[^=]+= *" "" value "${line}")
-                string(REPLACE " " ";" value "${value}")
-                set("${qt_module_prop_prefix}${current_module}_${prop}" "${value}" PARENT_SCOPE)
-            else()
-                message(FATAL_ERROR "Malformed line ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules: ${line}")
-            endif()
-        endif()
-    endforeach()
-    set(${out_module_list} ${module_list} PARENT_SCOPE)
-endfunction()
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 if (NOT QT_BUILD_STANDALONE_TESTS)
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/qtbase/cmake")
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/qtbase/cmake/3rdparty/extra-cmake-modules/find-modules")
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/qtbase/cmake/3rdparty/kwin")
+    list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake")
+    list(APPEND CMAKE_MODULE_PATH
+        "${__qt6_qtbase_src_path}/cmake/3rdparty/extra-cmake-modules/find-modules")
+    list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake/3rdparty/kwin")
 endif()
 
+include("QtTopLevelHelpers")
 include(ECMOptionalAddSubdirectory)
-include(TopologicalSort)
 
 # Also make sure the CMake config files do not recreate the already-existing targets
 if (NOT QT_BUILD_STANDALONE_TESTS)
@@ -56,64 +37,53 @@ if (NOT QT_BUILD_STANDALONE_TESTS)
 endif()
 set(QT_SUPERBUILD TRUE)
 
-# Get submodules list
-extract_git_submodules(git_module_list)
-foreach(module IN LISTS git_module_list)
-    # Prepare a list of dependencies to be fed into topological sort
-    set("${qt_module_prop_prefix}${module}_all_dependencies"
-            ${${qt_module_prop_prefix}${module}_depends}
-            ${${qt_module_prop_prefix}${module}_recommends}
-            ${${qt_module_prop_prefix}${module}_serialize}
-    )
-endforeach()
-
-# Sort by dependencies
-topological_sort(git_module_list "${qt_module_prop_prefix}" "_all_dependencies")
-
-# Check for unknown modules
-foreach(module IN LISTS git_module_list)
-    foreach(dep IN LISTS "${qt_module_prop_prefix}${module}_all_dependencies")
-        if (NOT dep IN_LIST git_module_list)
-            message(FATAL_ERROR "Module '${module}' depends on undeclared module '${dep}'")
-        endif()
-    endforeach()
-endforeach()
-
-# qtbase is always needed
-list(REMOVE_ITEM git_module_list qtbase)
-add_subdirectory(qtbase)
-
-if (NOT QT_BUILD_STANDALONE_TESTS)
-    list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/lib/cmake")
-    list(APPEND CMAKE_FIND_ROOT_PATH "${QtBase_BINARY_DIR}")
+# Get submodule list if not already defined
+if (NOT BUILD_SUBMODULES)
+    qt_internal_find_modules(BUILD_SUBMODULES)
 endif()
 
-foreach(module IN LISTS git_module_list)
-    ecm_optional_add_subdirectory(${module})
-endforeach()
+set(qt_module_dependency_map_prefix "__qt_module_dependencies_")
+qt_internal_sort_module_dependencies("${BUILD_SUBMODULES}" BUILD_SUBMODULES
+                                     "${qt_module_dependency_map_prefix}")
 
-# Check for unmet dependencies
-foreach(module IN LISTS git_module_list)
-    foreach(dep IN LISTS "${qt_module_prop_prefix}${module}_depends")
-        if (dep STREQUAL qtbase)
-            # Always available skip
-            continue()
-        endif()
-        if (DEFINED BUILD_${module} AND BUILD_${module})
+foreach(module IN LISTS BUILD_SUBMODULES)
+    # Check for unmet dependencies
+    if(NOT DEFINED BUILD_${module} OR BUILD_${module})
+        message(NOTICE "Check dependencies of '${module}'")
+        foreach(dep IN LISTS "${qt_module_dependency_map_prefix}${module}")
+            if (dep STREQUAL "qtbase")
+                # Always available skip
+                continue()
+            endif()
             if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${dep}/CMakeLists.txt")
-                message(FATAL_ERROR "Module '${module} depends on '${dep}', but ${deps}'s CMakeLists.txt couldn't be found.\n")
+                message(FATAL_ERROR "Module '${module}' depends on '${dep}', but ${dep}'s \
+                CMakeLists.txt couldn't be found.\nNote: Use '-skip ${module}' to exclude it \
+                from build.\n")
             endif()
-            if(NOT BUILD_${dep})
-                message(FATAL_ERROR "Module '${module} depends on '${dep}', but ${deps} will not be built.\n")
+            if(DEFINED BUILD_${dep} AND NOT BUILD_${dep})
+                message(FATAL_ERROR "Module '${module}' depends on '${dep}', but '${dep}' \
+                will not be built.\nNote: Use '-skip ${module}' to exclude it from build.\n")
             endif()
-        endif()
-    endforeach()
+        endforeach()
+    endif()
 endforeach()
 
+foreach(module IN LISTS BUILD_SUBMODULES)
+    message(NOTICE "Configuring '${module}'")
+    ecm_optional_add_subdirectory("${module}")
+
+    if(module STREQUAL "qtbase")
+        if (NOT QT_BUILD_STANDALONE_TESTS)
+            list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/lib/cmake")
+            list(APPEND CMAKE_FIND_ROOT_PATH "${QtBase_BINARY_DIR}")
+        endif()
+    endif()
+endforeach()
 
 if(NOT QT_BUILD_STANDALONE_TESTS)
     # Display a summary of everything
     include(QtBuildInformation)
+    include(QtPlatformSupport)
     qt_print_feature_summary()
     qt_print_build_instructions()
 endif()

cmake/QtSynchronizeRepo.cmake

@@ -0,0 +1,3 @@
+include(cmake/QtTopLevelHelpers.cmake)
+
+qt_internal_sync_to(${SYNC_TO_MODULE} ${SYNC_TO_BRANCH})

cmake/QtTopLevelHelpers.cmake

@@ -0,0 +1,282 @@
+# Populates $out_module_list with all subdirectories that have a CMakeLists.txt file
+function(qt_internal_find_modules out_module_list)
+    set(module_list "")
+    file(GLOB directories LIST_DIRECTORIES true RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *)
+    foreach(directory IN LISTS directories)
+        if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${directory}"
+           AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${directory}/CMakeLists.txt")
+            list(APPEND module_list "${directory}")
+        endif()
+    endforeach()
+    message(DEBUG "qt_internal_find_modules: ${module_list}")
+    set(${out_module_list} "${module_list}" PARENT_SCOPE)
+endfunction()
+
+# poor man's yaml parser, populating $out_dependencies with all dependencies
+# in the $depends_file
+# Each entry will be in the format dependency/sha1
+function(qt_internal_parse_dependencies depends_file out_dependencies)
+    file(STRINGS "${depends_file}" lines)
+    set(dependencies "")
+    set(dependency "")
+    foreach(line IN LISTS lines)
+        if(line STREQUAL "dependencies:")
+            set(found_dependencies 1)
+        elseif(found_dependencies)
+            if(line MATCHES "^    ref: (.*)$")
+                set(revision "${CMAKE_MATCH_1}")
+                list(APPEND dependencies ${dependency}/${revision})
+                set(dependency "")
+            elseif (line MATCHES "^  (.*):$")
+                if(dependency)
+                    message(FATAL_ERROR "Format error in ${depends_file} - ${dependency} does not specify revision!")
+                endif()
+                set(dependency "${CMAKE_MATCH_1}")
+                # dependencies are specified with relative path to this module
+                string(REPLACE "../" "" dependency ${dependency})
+            endif()
+        endif()
+    endforeach()
+    message(DEBUG "qt_internal_parse_dependencies for ${depends_file}: ${dependencies} ${revisions}")
+    set(${out_dependencies} "${dependencies}" PARENT_SCOPE)
+endfunction()
+
+# Load $module and populate $out_ordered with the submodules based on their dependencies
+# $ordered carries already sorted dependencies; $out_has_dependencies is left empty
+# if there are no dependencies, otherwise set to 1; Save list of dependencies for $module into
+# $out_module_dependencies. List may contain duplicates, since function checks max depth
+# dependencies.
+# Function calls itself recursively if a dependency is found that is not yet in $ordered.
+function(qt_internal_add_module_dependencies module ordered out_ordered out_has_dependencies
+                                             out_module_dependencies out_revisions)
+    set(depends_file "${CMAKE_CURRENT_SOURCE_DIR}/${module}/dependencies.yaml")
+    if(NOT EXISTS "${depends_file}")
+        set(${out_has_dependencies} "" PARENT_SCOPE)
+        return()
+    endif()
+    set(${out_has_dependencies} "1" PARENT_SCOPE)
+    set(dependencies "")
+    qt_internal_parse_dependencies("${depends_file}" dependencies)
+    # module hasn't been seen yet, append it
+    list(FIND ordered "${module}" pindex)
+    if (pindex EQUAL -1)
+        list(LENGTH ordered pindex)
+        list(APPEND ordered "${module}")
+        list(APPEND revisions "HEAD")
+    endif()
+    set(modules_dependencies "")
+    foreach(dependency IN LISTS dependencies)
+        string(FIND "${dependency}" "/" splitindex REVERSE)
+        string(SUBSTRING "${dependency}" ${splitindex} -1 revision)
+        string(SUBSTRING "${revision}" 1 -1 revision)
+        string(SUBSTRING "${dependency}" 0 ${splitindex} dependency)
+        list(APPEND modules_dependencies "${dependency}")
+        list(FIND ordered "${dependency}" dindex)
+        if (dindex EQUAL -1)
+            # dependency hasnt' been seen yet - load it
+            list(INSERT ordered ${pindex} "${dependency}")
+            list(INSERT revisions ${pindex} "${revision}")
+            qt_internal_add_module_dependencies(${dependency} "${ordered}" ordered has_dependency
+                                                "${out_module_dependencies}" revisions)
+        elseif(dindex GREATER pindex)
+            # otherwise, make sure it is before module
+            list(REMOVE_AT ordered ${dindex})
+            list(REMOVE_AT revisions ${dindex})
+            list(INSERT ordered ${pindex} "${dependency}")
+            list(INSERT revisions ${pindex} "${revision}")
+        endif()
+    endforeach()
+    set(${out_ordered} "${ordered}" PARENT_SCOPE)
+    set(${out_module_dependencies} ${${out_module_dependencies}} ${modules_dependencies} PARENT_SCOPE)
+    set(${out_revisions} "${revisions}" PARENT_SCOPE)
+endfunction()
+
+# populates $out_all_ordered with the sequence of the modules that need
+# to be built in order to build $modules; dependencies for each module are populated
+# in variables with specified in $dependencies_map_prefix prefix
+function(qt_internal_sort_module_dependencies modules out_all_ordered dependencies_map_prefix)
+    set(ordered "")
+    foreach(module IN LISTS modules)
+        set(out_ordered "")
+        if(NOT dependencies_map_prefix)
+            message(FATAL_ERROR "dependencies_map_prefix is not provided")
+        endif()
+        set(module_dependencies_list_var_name "${dependencies_map_prefix}${module}")
+        qt_internal_add_module_dependencies(${module} "${ordered}" out_ordered module_depends
+                                            "${module_dependencies_list_var_name}" revisions)
+        set(${module_dependencies_list_var_name}
+                "${${module_dependencies_list_var_name}}" PARENT_SCOPE)
+        if(NOT module_depends)
+            list(APPEND no_dependencies "${module}")
+        endif()
+        set(ordered "${out_ordered}")
+    endforeach()
+    if (no_dependencies)
+        list(APPEND ordered "${no_dependencies}")
+    endif()
+    message(DEBUG "qt_internal_parse_dependencies sorted ${modules}: ${ordered}")
+    set(${out_all_ordered} "${ordered}" PARENT_SCOPE)
+endfunction()
+
+# does what it says, but also updates submodules
+function(qt_internal_checkout module revision)
+    message(NOTICE "Checking '${module}' out to revision '${revision}'")
+    execute_process(
+        COMMAND "git" "checkout" "${revision}"
+        WORKING_DIRECTORY "./${module}"
+        RESULT_VARIABLE git_result
+        OUTPUT_VARIABLE git_stdout
+        ERROR_VARIABLE git_stderr
+    )
+    if (VERBOSE)
+        message(NOTICE ${git_stdout})
+    endif()
+    if (git_result)
+        message(WARNING "${git_stdout}")
+        message(FATAL_ERROR "Failed to check '${module}' out to '${revision}': ${git_stderr}")
+    endif()
+    execute_process(
+        COMMAND "git" "submodule" "update"
+        WORKING_DIRECTORY "./${module}"
+        RESULT_VARIABLE git_result
+        OUTPUT_VARIABLE git_stdout
+        ERROR_VARIABLE git_stderr
+    )
+endfunction()
+
+# clones or creates a worktree for $dependency, using the source of $dependent
+function(qt_internal_get_dependency dependent dependency)
+    set(gitdir "")
+    set(remote "")
+
+    # try to read the worktree source
+    execute_process(
+        COMMAND "git" "rev-parse" "--git-dir"
+        WORKING_DIRECTORY "./${dependent}"
+        RESULT_VARIABLE git_result
+        OUTPUT_VARIABLE git_stdout
+        ERROR_VARIABLE git_stderr
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    string(FIND "${git_stdout}" "${module}" index)
+    string(SUBSTRING "${git_stdout}" 0 ${index} gitdir)
+    message(DEBUG "Will look for clones in ${gitdir}")
+
+    execute_process(
+        COMMAND "git" "remote" "get-url" "origin"
+        WORKING_DIRECTORY "./${dependent}"
+        RESULT_VARIABLE git_result
+        OUTPUT_VARIABLE git_stdout
+        ERROR_VARIABLE git_stderr
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    string(FIND "${git_stdout}" "${dependent}.git" index)
+    string(SUBSTRING "${git_stdout}" 0 ${index} remote)
+    message(DEBUG "Will clone from ${remote}")
+
+    if(EXISTS "${gitdir}${dependency}")
+        # for the module we want, there seems to be a clone parallel to what we have
+        message(DEBUG "Adding worktree for ${dependency} from ${gitdir}${dependency}")
+        execute_process(
+            COMMAND "git" "worktree" "add" "${CMAKE_CURRENT_SOURCE_DIR}/${dependency}"
+            WORKING_DIRECTORY "${gitdir}/${dependency}"
+            RESULT_VARIABLE git_result
+            OUTPUT_VARIABLE git_stdout
+            ERROR_VARIABLE git_stderr
+        )
+        if (git_result)
+            message(WARNING "${git_stdout}")
+            message(FATAL_ERROR "Failed to create worktree for '${dependency}': ${git_stderr}")
+        endif()
+    else()
+        # we don't find the existing clone, so clone from the saame remote
+        message(DEBUG "Cloning ${dependency} from ${remote}${dependency}.git")
+        execute_process(
+            COMMAND "git" "clone" "${remote}${dependency}.git"
+            WORKING_DIRECTORY "."
+            RESULT_VARIABLE git_result
+            OUTPUT_VARIABLE git_stdout
+            ERROR_VARIABLE git_stderr
+        )
+        if (git_result)
+            message(WARNING "${git_stdout}")
+            message(FATAL_ERROR "Failed to clone '${dependency}': ${git_stderr}")
+        endif()
+    endif()
+endfunction()
+
+# evaluates the dependencies for $module, and checks all dependencies
+# out so that it is a consistent set
+function(qt_internal_sync_to module)
+    if(ARGN)
+        set(revision "${ARGV1}")
+        # special casing "." as the target module - checkout all out to $revision
+        if("${module}" STREQUAL ".")
+            qt_internal_find_modules(modules)
+            foreach(module IN LISTS modules)
+                qt_internal_checkout("${module}" "${revision}")
+            endforeach()
+            return()
+        endif()
+    else()
+        set(revision "HEAD")
+    endif()
+    qt_internal_checkout("${module}" "${revision}")
+
+    set(revision "")
+    set(checkedout "1")
+    # Load all dependencies for $module, then iterate over the dependencies in reverse order,
+    # and check out the first that isn't already at the required revision.
+    # Repeat everything (we need to reload dependencies after each checkout) until no more checkouts
+    # are done.
+    while(${checkedout})
+        set(dependencies "")
+        set(revisions "")
+        set(prefix "")
+        qt_internal_add_module_dependencies(${module} "${dependencies}" dependencies has_dependencies prefix revisions)
+        message(DEBUG "${module} dependencies: ${dependencies}")
+        message(DEBUG "${module} revisions   : ${revisions}")
+
+        if (NOT has_dependencies)
+            message(NOTICE "Module ${module} has no dependencies")
+            return()
+        endif()
+
+        list(LENGTH dependencies count)
+        math(EXPR count "${count} - 1")
+        set(checkedout 0)
+        foreach(i RANGE ${count} 0 -1 )
+            list(GET dependencies ${i} dependency)
+            list(GET revisions ${i} revision)
+            if ("${revision}" STREQUAL "HEAD")
+                message(DEBUG "Not changing checked out revision of ${dependency}")
+                continue()
+            endif()
+
+            if(NOT EXISTS "./${dependency}")
+                message(DEBUG "No worktree for '${dependency}' found in '${CMAKE_CURRENT_SOURCE_DIR}'")
+                qt_internal_get_dependency("${module}" "${dependency}")
+            endif()
+
+            execute_process(
+                COMMAND "git" "rev-parse" "HEAD"
+                WORKING_DIRECTORY "./${dependency}"
+                RESULT_VARIABLE git_result
+                OUTPUT_VARIABLE git_stdout
+                ERROR_VARIABLE git_stderr
+                OUTPUT_STRIP_TRAILING_WHITESPACE
+            )
+            if (git_result)
+                message(WARNING "${git_stdout}")
+                message(FATAL_ERROR "Failed to get current HEAD of '${dependency}': ${git_stderr}")
+            endif()
+            if ("${git_stdout}" STREQUAL "${revision}")
+                continue()
+            endif()
+
+            qt_internal_checkout("${dependency}" "${revision}")
+            set(checkedout 1)
+            break()
+        endforeach()
+    endwhile()
+endfunction()

coin/module_config.yaml

@@ -14,13 +14,39 @@ instructions:
     - type: ChangeDirectory
       directory: "{{.BuildDir}}"
     - type: ExecuteCommand
-      command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -DBUILD_TESTING=OFF {{.SourceDir}}"
+      command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -DQT_BUILD_TESTS=OFF {{.SourceDir}}"
       executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
       maxTimeInSeconds: 6000
       maxTimeBetweenOutput: 1200
       userMessageOnFailure: >
         Failed to call cmake.
 
+    - type: Group
+      instructions:
+        - type: ExecuteCommand
+          command: "{{.Env.ENV_PREFIX}} cmake --build . --target qttools/all --parallel -v"
+          maxTimeInSeconds: 12000
+          maxTimeBetweenOutput: 1200
+          userMessageOnFailure: >
+            Failed to build sources.
+        - type: ExecuteCommand
+          command: "{{.Env.ENV_PREFIX}} cmake --build . --target generate_docs -v"
+          maxTimeInSeconds: 12000
+          maxTimeBetweenOutput: 1200
+          userMessageOnFailure: >
+            Failed to generate docs.
+        - type: MakeDirectory
+          directory: "{{.BuildDir}}/qtbase/doc/global"
+        - type: UploadArtifact
+          archiveDirectory: '{{.BuildDir}}/doc'
+          transferType: UploadModuleDocumentation
+          maxTimeInSeconds: 1800
+          maxTimeBetweenOutput: 1800
+      enable_if:
+        condition: property
+        property: features
+        contains_value: "Documentation"
+
   Test:
     - type: EnvironmentVariable
       variableName: Dummy

coin/platform_configs/cmake_platforms.yaml

@@ -9,30 +9,45 @@ Configurations:
 -
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'Insignificant']
-    Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DWARNINGS_ARE_ERRORS=ON -DQT_NAMESPACE=TestNamespace -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Features: ['Sccache']
+    Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_widgets=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'DisableTests']
+    Configure arguments: '-DFEATURE_developer_build=ON -DFEATURE_gui=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Environment variables: [
+        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'Documentation']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
     Id: 'Ubuntu-20.04-host'
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'Insignificant']
-    Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Features: ['Sccache']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
     Template: 'qtci-linux-openSUSE-15.1-x86_64'
     Compiler: 'GCC'
-    Features: ['Sccache']
-    Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Features: ['Sccache', 'InsignificantTests']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
     Template: 'qtci-linux-SLES-15_SP2-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'DisableTests']
-    Configure arguments: '-DBUILD_EXAMPLES=OFF -FEATURE_developer_build=ON -DBUILD_WITH_PCH=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DBUILD_WITH_PCH=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
@@ -40,14 +55,14 @@ Configurations:
     Template: 'qtci-macos-10.14-x86_64'
     Compiler: 'Clang'
     Features: ['Packaging', 'Sccache']
-    Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..'
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..'
     Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
     Template: 'qtci-macos-10.14-x86_64'
     Compiler: 'Clang'
     Features: ['DisableTests', 'Sccache']
-    Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: [
         'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
@@ -55,21 +70,27 @@ Configurations:
 -
     Template: 'qtci-windows-10-x86_64-51'
     Compiler: 'MSVC2019'
-    Features: ['Packaging']
-    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
-    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=']
+    Features: ['Packaging', 'Sccache', "DebugAndRelease"]
+    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Environment variables: [
+        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
+    ]
 -
     Template: 'qtci-windows-10-x86_64-51'
     Compiler: 'MSVC2019'
-    Features: ['Insignificant']
-    Configure arguments: '-G"Ninja Multi-Config" -DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
-    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=']
+    Features: ['InsignificantTests', 'Sccache', "DebugAndRelease"]
+    Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Environment variables: [
+        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
-    Id: 'RHEL-7.6-host'
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Id: 'CentOS-8.1-host'
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
     Compiler: 'GCC'
     Features: ['Packaging', 'Sccache']
-    Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -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_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
@@ -79,13 +100,17 @@ Configurations:
     Compiler: 'Clang'
     Target compiler: 'Clang'
     Platform dependency: 'macos-10.14-host'
-    Features: ['Packaging', 'Sccache']
-    Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON -DBUILD_WITH_PCH=OFF', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
+    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DBUILD_WITH_PCH=OFF', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
 -
     Id: 'Windows10-Mingw8-x64-host'
     Template: 'qtci-windows-10-x86_64-51'
     Compiler: 'Mingw'
     Features: ['Packaging', 'Sccache']
-    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
-    Environment variables: ['Path={{.Env.MINGW810}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
+    Environment variables: [
+        'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
+        'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
+    ]

coin/platform_configs/cmake_platforms_qemu.yaml

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

coin/platform_configs/cmake_platforms_target_android_host_linux.yaml

@@ -1,46 +1,46 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'arm64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-7.6-host'
+    Platform dependency: 'CentOS-8.1-host'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'armv7'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-7.6-host'
+    Platform dependency: 'CentOS-8.1-host'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-7.6-host'
+    Platform dependency: 'CentOS-8.1-host'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-7.6-host'
+    Platform dependency: 'CentOS-8.1-host'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']

coin/platform_configs/cmake_platforms_target_android_host_macos.yaml

@@ -9,7 +9,7 @@ Configurations:
     Platform dependency: 'macos-10.14-host'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
     Template: 'qtci-macos-10.14-x86_64'
@@ -20,7 +20,7 @@ Configurations:
     Platform dependency: 'macos-10.14-host'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
     Template: 'qtci-macos-10.14-x86_64'
@@ -31,7 +31,7 @@ Configurations:
     Platform dependency: 'macos-10.14-host'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
     Template: 'qtci-macos-10.14-x86_64'
@@ -42,5 +42,5 @@ Configurations:
     Platform dependency: 'macos-10.14-host'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']

coin/platform_configs/cmake_platforms_target_android_host_windows.yaml

@@ -10,7 +10,7 @@ Configurations:
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
         'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
     Template: 'qtci-windows-10-x86_64-51'
@@ -22,7 +22,7 @@ Configurations:
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
         'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
     Template: 'qtci-windows-10-x86_64-51'
@@ -34,7 +34,7 @@ Configurations:
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
         'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
     Template: 'qtci-windows-10-x86_64-51'
@@ -46,5 +46,5 @@ Configurations:
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
         'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']

coin/platform_configs/default.yaml

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

coin/platform_configs/flashing-wizard.yaml

@@ -5,18 +5,18 @@ Configurations:
         Template: 'qtci-windows-10-x86_64-51'
         Compiler: 'MSVC2019'
         Features: ['Packaging', 'UseLegacyInstructions']
-        Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
+        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
     -
         Template: 'qtci-windows-10-x86_64-51'
         Compiler: 'MSVC2019'
         Target arch: 'x86'
         Features: ['Packaging', 'UseLegacyInstructions']
-        Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
+        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
     -
-        Template: 'qtci-linux-RHEL-7.6-x86_64'
+        Template: 'qtci-linux-CentOS-8.1-x86_64-50'
         Compiler: 'GCC'
         Features: ['Packaging', 'UseLegacyInstructions']
-        Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s -static -no-icu'
+        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
     -
         Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
         Compiler: 'GCC'

coin/platform_configs/pyside-setup.yaml

@@ -0,0 +1,9 @@
+Version: 2
+Module only: True
+Include: [cmake_platforms.yaml]
+Configurations:
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'LicenseCheck']
+

coin/platform_configs/qdb.yaml

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

coin/platform_configs/qt5.yaml

@@ -1,18 +1,3 @@
 Version: 2
 Include: [cmake_platforms.yaml]
-Configurations:
--
-    Template: 'qtci-windows-10-x86_64-51'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
--
-    Template: 'qtci-windows-10-x86_64-51'
-    Target os: 'Android_ANY'
-    Target arch: 'multi'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
-    Target compiler: 'Clang'
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r21d'
+Configurations: []

coin/platform_configs/qtbase.yaml

@@ -6,17 +6,17 @@ Configurations:
     Target os: 'WebAssembly'
     Compiler: 'GCC'
     Features: ['DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten'
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten'
 -
     Template: 'qtci-macos-10.14-x86_64'
     Compiler: 'Clang'
     Features: ['UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
 -
     Template: 'qtci-macos-10.14-x86_64'
     Compiler: 'Clang'
     Features: ['Sccache']
-    Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: [
         'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'

coin/platform_configs/qtdeclarative.yaml

@@ -5,12 +5,12 @@ Configurations:
     Template: 'qtci-macos-10.14-x86_64'
     Compiler: 'Clang'
     Features: ['UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
 -
     Template: 'qtci-macos-10.14-x86_64'
     Compiler: 'Clang'
     Features: ['Sccache']
-    Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: [
         'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'

coin/platform_configs/qtsaferenderer.yaml

@@ -4,16 +4,16 @@ Configurations:
     Template: 'qtci-windows-10-x86_64-51'
     Compiler: 'Mingw'
     Environment variables: ['PATH=C:\MINGW810\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-x86_64-51'
     Compiler: 'Mingw'
     Environment variables: ['PATH=C:\MINGW810\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-7.6-x86_64'
+    Template: 'qtci-linux-CentOS-8.1-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/qtsdk.yaml

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

coin/platform_configs/qtwebengine.yaml

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

coin/platform_configs/qtwebkit.yaml

@@ -5,4 +5,4 @@ Configurations:
     Compiler: 'Mingw'
     Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
     Features: ['Packaging', UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s'
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s'

coin/platform_configs/tqtc-pyside-setup.yaml

@@ -0,0 +1,9 @@
+Version: 2
+Module only: True
+Include: [cmake_platforms.yaml]
+Configurations:
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'LicenseCheck']
+

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

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

coin/platform_configs/tqtc-qt-rta.yaml

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

coin/pre-provisioning/qtci-linux-CENTOS-8.1-x86_64/README_MANUAL_INSTALLATIONS

@@ -0,0 +1,45 @@
+### CENTOS 8.1 ###
+Hard Disk: 500G
+Network: CI
+Video Card: Total Video Memory: 64MB
+Boot options/Firmware: BIOS
+
+Language: English (United States)
+Time & Date: Europe/Helsinki
+Software Selection: Server with GUI
+Network & Host..: Connect
+
+Language: English (US)
+Typing:English (US)
+Privacy: Location Services: OFF
+Connect Your Online Accounts: Skip
+
+
+# Configure Settings
+ Notifications:
+    * Notification Popups: OFF
+    * Lock Screen Notifications: OFF
+ Privacy:
+    * Screen Lock: OFF
+ Power:
+    * Blank screen: Never
+ Devices:
+    * Displays: Resolution 1280 x 800
+ Details:
+    * Time Zone: GMT
+    * Users: Automatic login on
+
+# Add user to sudoers
+Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
+
+# Fetch and run coin-setup
+Download http://coin/coin/binary/linux_386/coin-setup
+
+run 'sudo ./coin-setup'
+
+Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub
+grub2-mkconfig -o /etc/grub2.cfg
+grub2-mkconfig -o /boot/grub2/grub.cfg
+
+Reboot
+

coin/provisioning/common/linux/cmake_linux.sh

@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-majorminorversion="3.18"
-version="3.18.3"
+majorminorversion="3.19"
+version="3.19.0"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz"
 AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz"
-SHA1="6e5bb13e07616e8fa28ec22e8e8dd2396510f10c"
+SHA1="e2da8449626d9fd8ed1c0eb4babaab6d535f7e72"
 targetFolder="/opt/cmake-$version"
 appPrefix="cmake-$version-Linux-x86_64"
 

coin/provisioning/common/linux/gcc.sh

@@ -1,4 +1,3 @@
-
 #!/usr/bin/env bash
 
 #############################################################################

coin/provisioning/common/linux/install_dwz.sh

@@ -43,7 +43,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
 version="0.13"
 sha1="21e6d5878bb84ac6c9ad07b00ed248d8c547bc7d"
-internalUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/dwz-$version.tar.xz"
+internalUrl="http://ci-files01-hki.intra.qt.io/input/centos/dwz-$version.tar.xz"
 externalUrl="https://www.sourceware.org/ftp/dwz/releases/dwz-$version.tar.xz"
 
 targetDir="$HOME/dwz"
@@ -52,8 +52,10 @@ DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile"
 tar -xJf "$targetFile" -C "$HOME"
 sudo rm "$targetFile"
 
-# devtoolset is needed when running configuration
-export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH"
+# devtoolset is needed when running configuration in RedHat
+if uname -a |grep -q "el7"; then
+    export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH"
+fi
 
 installPrefix="/opt/dwz-$version"
 

coin/provisioning/common/macos/cmake.sh

@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-majorminorversion="3.18"
-version="3.18.3"
+majorminorversion="3.19"
+version="3.19.0"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Darwin-x86_64.tar.gz"
 AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Darwin-x86_64.tar.gz"
-SHA1="75a9bd7ec1ec7cbb7b7fb4ecbe4ec26b691c67c9"
+SHA1="856906e435d24a609e76f3c5162a4129e3319531"
 appPrefix="cmake-$version-Darwin-x86_64"
 
 InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"

coin/provisioning/common/unix/libclang.sh

@@ -54,11 +54,6 @@ if uname -a |grep -q Darwin; then
     url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-mac.7z"
     url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-mac.7z"
     sha1="6e019c428511e74c5d46d0ddca79d8e804b67f8a"
-elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat"; then
-    version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
-    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
-    sha1="16fcb99c139ee613ccc46683fa842a5187457f35"
 else
     version=$libclang_version
     url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"

coin/provisioning/common/unix/mqtt_broker.sh

@@ -39,10 +39,10 @@
 source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh"
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-CommitSHA="20bad2475c27a6e1d24a56d90a9fceb40963261e"
+CommitSHA="2873885d7e840b4e06483f36f170c609eb30527d"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
 AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
-SHA1="a0ac88715c2aebb9573a113dc13925a90da19233"
+SHA1="1fcc4e61b12f11a1421cc8c3f379276d732e62b7"
 targetFolder="/opt/paho_broker"
 appPrefix="paho.mqtt.testing-$CommitSHA"
 

coin/provisioning/common/windows/cmake.ps1

@@ -33,8 +33,8 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-$majorminorversion = "3.18"
-$version = "3.18.3"
+$majorminorversion = "3.19"
+$version = "3.19.0"
 
 $zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip")
 $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip"
@@ -44,7 +44,7 @@ Write-Host "Removing old cmake"
 Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue
 
 Download $officialurl $cachedurl $zip
-Verify-Checksum $zip "ab82b5dd945a7f54d4ecb435441bae247c646c26"
+Verify-Checksum $zip "fac77ed3eca52168b15c30979ee43310a3cb968e"
 
 Extract-7Zip $zip C:
 $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"

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

@@ -33,46 +33,50 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-# This script installs 7-Zip
+# This script will installs msys2
 
-$version = "20181211"
+$version = "20200903"
 $prog = "msys2"
-if (Is64BitWinHost) {
-    $arch = "x86_64"
-    $sha1 = "d689ff74fd060934bd7aaf458a11db67833463c2"
-    $folder = "msys64"
-} else {
-    $arch = "i686"
-    $sha1 = "928f9d1537d1a77dc7f2adab74fb438e7d11a98e"
-    $folder = "msys32"
-}
+$arch = "x86_64"
+$sha1 = "5a1644585fac2d58855d48b4ba4a92579a14cf03"
+$sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8"
+$folder = "msys64"
+
+$package_prebuilt = $folder + "_" + $version + "_prebuilt.7z"
 $package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz"
 
-
+$url_cache_prebuilt = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package_prebuilt"
 $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
 $url_official = "http://repo.msys2.org/distrib/$arch/$package"
-$PackagePath = "C:\Windows\Temp\$package"
 $TargetLocation = "C:\Utils"
 
 
-Download $url_official $url_cache $PackagePath
-Verify-Checksum $PackagePath $sha1
-Extract-tar_gz $PackagePath $TargetLocation
-$msys = "$TargetLocation\$folder\msys2_shell.cmd"
+if ((Test-Path $url_cache_prebuilt)) {
+    $PackagePath = "C:\Windows\Temp\$package_prebuilt"
+    Download $url_cache_prebuilt $url_cache_prebuilt $PackagePath
+    Verify-Checksum $PackagePath $sha1_prebuilt
+    Extract-7Zip $PackagePath $TargetLocation
+} else {
+    $PackagePath = "C:\Windows\Temp\$package"
+    Download $url_official $url_cache $PackagePath
+    Verify-Checksum $PackagePath $sha1
+    Extract-tar_gz $PackagePath $TargetLocation
+    $msys = "$TargetLocation\$folder\msys2_shell.cmd"
 
-# install perl
-# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file.
-cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
-Start-Sleep -s 60
-cmd /c "$msys `"-l`" `"-c`" `"echo y | cpan -i Text::Template Test::More`""
+    # install perl
+    # Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file.
+    cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`""
+    Start-Sleep -s 60
+    cmd /c "$msys `"-l`" `"-c`" `"echo y | cpan -i Text::Template Test::More`""
 
-# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed.
-# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process.
-Start-Sleep -s 360
-if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent }
-if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }
+    # Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed.
+    # Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process.
+    Start-Sleep -s 360
+    if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent }
+    if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }
+}
 
 Write-Host "Cleaning $PackagePath.."
 Remove-Item -Recurse -Force -Path "$PackagePath"
 
-Write-Output "7-Zip = $version" >> ~\versions.txt
+Write-Output "msys2 = $version" >> ~\versions.txt

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

@@ -1,6 +1,6 @@
 ############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -35,13 +35,13 @@
 
 # This script installs Strawberry Perl
 
-$version = "5.26.0.1"
+$version = "5.32.0.1"
 if (Is64BitWinHost) {
     $arch = "-64bit"
-    $sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D"
+    $sha1 = "9ec5ebc865da82eacc2d95ff2976492ca69934ab"
 } else {
     $arch = "-32bit"
-    $sha1 = "b50b688a879f33941433774b2813bfd4b917e4ee"
+    $sha1 = "6ad89c6358a174c048f113bfd274d2d0378d60aa"
 }
 $installer_name = "strawberry-perl-" + $version + $arch + ".msi"
 $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $installer_name

coin/provisioning/common/windows/libclang.ps1

@@ -60,9 +60,9 @@ if ( $toolchain -eq "mingw" ) {
 install $sha1 $baseDestination-$archVer
 
 if ( $setDefault ) {
-    Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_")
+    Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-$archVer")
 }
-Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_")
+Set-EnvironmentVariable ("LLVM_INSTALL_DIR_${toolchainSuffix}") ($baseDestination + "-$archVer")
 
 if ( $libclang_version -eq "100" ) {
     # This is a hacked static build of libclang which requires special

coin/provisioning/qtci-linux-CentOS-8.1-x86_64/01-remove_network_manager_secret_key.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Ipv6 link local becomes tentative and dadfailed if two systems has the same secret_key
+# New unique secret key will be created automatically during start up.
+# https://access.redhat.com/solutions/3553581
+echo "Removing secret_key"
+sudo rm -f "/var/lib/NetworkManager/secret_key"
+
+

coin/provisioning/qtci-linux-CentOS-8.1-x86_64/02-install-rhel-epel.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -38,10 +38,10 @@ set -ex
 # shellcheck source=../common/unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 
-package="epel-release-7-12.noarch.rpm"
-primaryUrl="https://dl.fedoraproject.org/pub/epel/7/x86_64/Packages/e/$package"
-cacheUrl="http://ci-files01-hki.intra.qt.io/input/rhel7/$package"
-sha256="d6bb83c00ab3af26ded56459e7d6fceabfef66efbe0780b4dedbe81d62c07cd5"
+package="epel-release-latest-8.noarch.rpm"
+primaryUrl="https://dl.fedoraproject.org/pub/epel/$package"
+cacheUrl="http://ci-files01-hki.intra.qt.io/input/centos/$package"
+sha256="8949517e8a84556d06dba8b030fb5bc4553474b352d7ce25799469aa9af4cc62"
 targetFile="/tmp/$package"
 
 DownloadURL "$cacheUrl" "$primaryUrl" "$sha256" "$targetFile"

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

@@ -1,6 +1,8 @@
-############################################################################
+#!/usr/bin/env bash
+
+#############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -29,19 +31,14 @@
 ##
 ## $QT_END_LICENSE$
 ##
-############################################################################
+#############################################################################
 
-. "$PSScriptRoot\helpers.ps1"
+set -ex
 
-# This script installs ICU.
+sudo yum -y install yum-utils
 
-$version = "53_1"
+sudo yum-config-manager --enable AppStream
+sudo yum-config-manager --enable PowerTools
+sudo yum-config-manager --enable BaseOS
+sudo yum-config-manager --enable epel-playground
 
-if (Is64BitWinHost) {
-
-# FIXME: do we really want to use the 4.8.2 ICU build?
-Set-EnvironmentVariable "CI_ICU_PATH_Mingw49" "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1"
-
-}
-
-Write-Output "ICU = $version" >> ~\versions.txt

coin/provisioning/qtci-linux-CentOS-8.1-x86_64/04-install-packages.sh

@@ -38,10 +38,8 @@ set -ex
 # Remove update notifications and packagekit running in the background
 sudo yum -y remove PackageKit gnome-software
 
-sudo yum-config-manager --enable rhel-server-rhscl-7-rpms
-
 installPackages=()
-installPackages+=(rh-git29)
+installPackages+=(git)
 installPackages+=(zlib-devel)
 installPackages+=(glib2-devel)
 installPackages+=(openssl-devel)
@@ -65,6 +63,8 @@ installPackages+=(postgresql-devel)
 installPackages+=(cups-devel)
 installPackages+=(dbus-devel)
 # gstreamer 1 for QtMultimedia
+# Note! gstreamer1-plugins-bad-free needs to be upgraded or it will conflicts with gstreamer1-plugins-base-devel
+installPackages+=(gstreamer1-plugins-bad-free)
 installPackages+=(gstreamer1-devel)
 installPackages+=(gstreamer1-plugins-base-devel)
 # gtk3 style for QtGui/QStyle
@@ -74,9 +74,9 @@ installPackages+=(libusbx-devel)
 # speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux
 installPackages+=(speech-dispatcher-devel)
 # Python 2 devel and pip. python-pip requires the EPEL repository to be added
-installPackages+=(python-devel python-pip)
+installPackages+=(python2-devel python2-pip)
 # Python 3 with python-devel, pip and virtualenv
-installPackages+=(rh-python36)
+installPackages+=(python36)
 installPackages+=(python36-devel)
 # WebEngine
 installPackages+=(bison)
@@ -87,14 +87,10 @@ installPackages+=(pulseaudio-libs-devel)
 installPackages+=(libXtst-devel)
 installPackages+=(nspr-devel)
 installPackages+=(nss-devel)
-installPackages+=(rh-nodejs12-nodejs)
-installPackages+=(rh-nodejs12-nodejs-devel)
 # For Android builds
 installPackages+=(java-1.8.0-openjdk-devel)
 # For receiving shasum
 installPackages+=(perl-Digest-SHA)
-# For Clang 11 tests
-installPackages+=(perl-Digest-MD5)
 # INTEGRITY requirements
 installPackages+=(glibc.i686)
 # Enable Qt Bluetooth
@@ -126,6 +122,7 @@ installPackages+=(unixODBC-devel)
 installPackages+=(unixODBC)
 # Vulkan support
 installPackages+=(vulkan-devel)
+installPackages+=(vulkan-tools)
 # Conan: For Python build
 installPackages+=(xz-devel)
 installPackages+=(zlib-devel)
@@ -133,27 +130,31 @@ installPackages+=(libffi-devel)
 installPackages+=(libsqlite3x-devel)
 # Build.pl
 installPackages+=(perl-Data-Dumper)
+# In RedHat these come with Devtoolset
+installPackages+=(gcc)
+installPackages+=(gcc-c++)
+installPackages+=(libstdc++-static)
+installPackages+=(make)
+# Open source VMware Tools
+installPackages+=(open-vm-tools)
 
 sudo yum -y install "${installPackages[@]}"
 
-scl enable rh-git29 bash
-sudo ln -s /opt/rh/rh-git29/root/usr/bin/git /usr/local/bin/git
+sudo ln -s /usr/bin/python2 /usr/bin/python
 
-sudo ln -s /opt/rh/rh-python36/root/usr/bin/python3 /usr/local/bin/python3
-sudo ln -s /opt/rh/rh-python36/root/usr/bin/pip3 /usr/local/bin/pip3
 # We shouldn't use yum to install virtualenv. The one found from package repo is not
 # working, but we can use installed pip
-sudo pip install --upgrade pip
-sudo pip install virtualenv wheel
+sudo pip3 install --upgrade pip
+sudo pip3 install virtualenv wheel
 
-sudo /usr/local/bin/pip3 install wheel
+sudo /usr/bin/pip3 install wheel
 # Install all needed packages in a special wheel cache directory
-/usr/local/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
+/usr/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
 
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
 
-gccVersion="$(gcc --version |grep gcc |cut -b 11-16)"
-echo "GCC = $gccVersion" >> versions.txt
+OpenSSLVersion="$(openssl version |cut -b 9-14)"
+echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
 

coin/provisioning/qtci-linux-CentOS-8.1-x86_64/30-install_icu.sh

@@ -50,14 +50,14 @@ sha1Dev="bffde26cdea752bee0edd281820c57f1adac3864"
 develPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z"
 develPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z"
 
-echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
+echo "Installing custom ICU $icuVersion $sha1 packages on CentOS to $icuLocation"
 
 targetFile=$(mktemp)
 DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile"
 sudo 7z x -y -o/usr/lib64 "$targetFile"
 sudo rm "$targetFile"
 
-echo "Installing custom ICU devel packages on RHEL"
+echo "Installing custom ICU devel packages on CentOS"
 
 tempDir=$(mktemp -d)
 

coin/provisioning/qtci-linux-CentOS-8.1-x86_64/50-openssl_for_android_linux.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -32,11 +32,6 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-set +e
-
-# shellcheck disable=SC1091
-source /opt/rh/devtoolset-4/enable
-
 set -ex
 
 # shellcheck source=../common/linux/openssl_for_android_linux.sh

coin/provisioning/qtci-linux-CentOS-8.1-x86_64/70-install_QemuGA.sh

@@ -33,16 +33,9 @@
 ##
 #############################################################################
 
-set -e
+# This script installs QEMU Guest Agent
 
-curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null
-sudo chmod 755 /tmp/redhat_ak.sh
-/tmp/redhat_ak.sh
+set -ex
 
-# refresh local certificates
-sudo subscription-manager refresh
-
-# Attach available subscriptions to system. This is needed when subscriptions are renewed.
-sudo subscription-manager attach --auto
-
-sudo rm -f /tmp/redhat_ak.sh
+sudo yum -y install qemu-guest-agent
+sudo systemctl start qemu-guest-agent

coin/provisioning/qtci-linux-RHEL-7.6-x86_64/01-disable-mlocate.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-BASEDIR=$(dirname "$0")
-# shellcheck source=../common/linux/disable-mlocate.sh
-"$BASEDIR/../common/linux/disable-mlocate.sh"

coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh

@@ -1,77 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-set -ex
-
-echo "set WritePreparedUpdates=false" | sudo tee -a /etc/PackageKit/PackageKit.conf
-sudo systemctl stop packagekit
-sudo systemctl disable packagekit
-sudo yum -y remove PackageKit gnome-software
-
-sudo subscription-manager config --rhsm.manage_repos=0
-sudo subscription-manager refresh
-
-sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC
-[rhel-7-workstation-rpms]
-metadata_expire = 86400
-baseurl = http://repo-clones.ci.qt.io/repos/rhel-7-workstation-rpms
-ui_repoid_vars = releasever basearch
-name = Qt Red Hat Enterprise Linux 7 Workstation (RPMs)
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-enabled = 1
-gpgcheck = 1
-
-[rhel-7-workstation-optional-rpms]
-metadata_expire = 86400
-baseurl = http://repo-clones.ci.qt.io/repos/rhel-7-workstation-optional-rpms
-ui_repoid_vars = releasever basearch
-name = Qt Red Hat Enterprise Linux 7 Workstation - Optional (RPMs)
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-enabled = 1
-gpgcheck = 1
-
-[rhel-workstation-rhscl-7-rpms]
-metadata_expire = 86400
-baseurl = http://repo-clones.ci.qt.io/repos/rhel-workstation-rhscl-7-rpms
-ui_repoid_vars = releasever basearch
-name = Qt Red Hat Software Collections RPMs for Red Hat Enterprise Linux 7 Workstation
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
-enabled = 1
-gpgcheck = 1
-EOC
-
-sudo yum clean all
-# As well as this fetching the repository data, we also get a printout of the used repos
-sudo yum repolist

coin/provisioning/qtci-linux-RHEL-7.6-x86_64/09-install-openssl.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# shellcheck source=../common/unix/install-openssl.sh
-source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"

coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh

@@ -111,3 +111,6 @@ sudo zypper -nq update open-vm-tools
 
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt
+
+OpenSSLVersion="$(openssl version |cut -b 9-14)"
+echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/70-install_QemuGA.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,9 +33,8 @@
 ##
 #############################################################################
 
+# This script installs QEMU Guest Agent
+
 set -ex
 
-sudo yum -y install devtoolset-7
-
-echo "source /opt/rh/devtoolset-7/enable" >> ~/.bashrc
-
+sudo zypper -nq install qemu-guest-agent

coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh

@@ -202,3 +202,7 @@ pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/sh
 
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
+
+OpenSSLVersion="$(openssl version |cut -b 9-14)"
+echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
+

coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/09-install-openssl.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# shellcheck source=../common/unix/install-openssl.sh
-source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"

coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/70-install_QemuGA.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2020 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script installs QEMU Guest Agent
+
+set -ex
+
+sudo apt -y install qemu-guest-agent
+sudo systemctl start qemu-guest-agent

coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/81-fix_mdns_docker_resolution.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# The new version of libnss-mdns resolver library automatically rejects all
+# hostnames with more than two labels (i.e. subdomains deep), for example
+# vsftpd.test-net.qt.local is automatically rejected. The changes here fix
+# this, see also https://github.com/lathiat/nss-mdns#etcmdnsallow
+
+cat <<EOT | sudo tee /etc/mdns.allow
+.local.
+.local
+EOT
+
+sudo sed -i '/^hosts:/s/mdns4_minimal/mdns4/' /etc/nsswitch.conf

coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh

@@ -2,11 +2,11 @@
 
 set -ex
 
-sudo zypper -nq install git gcc7 gcc7-c++ ninja
-sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 1 \
-                                     --slave /usr/bin/g++ g++ /usr/bin/g++-7 \
-                                     --slave /usr/bin/cc cc /usr/bin/gcc-7 \
-                                     --slave /usr/bin/c++ c++ /usr/bin/g++-7
+sudo zypper -nq install git gcc9 gcc9-c++ ninja
+sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 1 \
+                                     --slave /usr/bin/g++ g++ /usr/bin/g++-9 \
+                                     --slave /usr/bin/cc cc /usr/bin/gcc-9 \
+                                     --slave /usr/bin/c++ c++ /usr/bin/g++-9
 
 sudo zypper -nq install bison flex gperf \
         zlib-devel \
@@ -53,3 +53,6 @@ sudo zypper -nq install libspeechd-devel
 
 gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
 echo "GCC = $gccVersion" >> versions.txt
+
+OpenSSLVersion="$(openssl version |cut -b 9-14)"
+echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/09-install-openssl.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# shellcheck source=../common/unix/install-openssl.sh
-source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux"

coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/70-install_QemuGA.sh

@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2020 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script installs QEMU Guest Agent
+
+set -ex
+
+sudo zypper -nq install qemu-guest-agent

coin/provisioning/qtci-windows-10-x86/01-enable-guest-logon.ps1

@@ -0,0 +1,2 @@
+# Allow SMB client guest logons to SMB server.
+reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F

coin/provisioning/qtci-windows-10-x86/10-icu.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\icu.ps1"

coin/provisioning/qtci-windows-10-x86_64/01-enable-guest-logon.ps1

@@ -0,0 +1,2 @@
+# Allow SMB client guest logons to SMB server.
+reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F

coin/provisioning/qtci-windows-10-x86_64/05-msvc2015.ps1

@@ -34,7 +34,7 @@
 # Visual Studios are pre-provisioned to tier1 images
 
 # MSVC 2015 Update 3
-Write-Output "Visual Studio 2015 = Version 14.0.25431.01 Update 3" >> ~\versions.txt
+Write-Output "Visual Studio 2015 = Version 14.0.25420.1 Update 3" >> ~\versions.txt
 
 # MSVC 2019 and Build Tools are pre-provisioned, but the updating happens with "$PSScriptRoot\..\common\windows\update-msvc2019.ps1"
 

coin/provisioning/qtci-windows-10-x86_64/08-libclang.ps1

@@ -1,5 +1,3 @@
 # Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False
 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019
-. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw $False
-. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 vs2019

coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1

@@ -1,10 +0,0 @@
-. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
-
-# This script will install 64-bit MinGW 5.3.0
-
-$release = "x86_64-5.3.0-release-posix-seh-rt_v4-rev0"
-$sha1 = "7EB12DD3EDDCF609722C9552F8592BD9948DA1FC"
-
-InstallMinGW $release $sha1
-
-

coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1

@@ -1,8 +0,0 @@
-. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
-
-# This script will install 64-bit MinGW 6.3.0
-
-$release = "x86_64-6.3.0-release-posix-seh-rt_v5-rev2"
-$sha1    = "49E7F8997E3D15C75B1A4DE1C380ABE1FB9B7533"
-
-InstallMinGW $release $sha1

coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1

@@ -1,11 +0,0 @@
-. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
-
-# This script will install MinGW 7.3.0
-
-$release = "i686-7.3.0-release-posix-dwarf-rt_v5-rev0"
-$sha1 = "96e11c754b379c093e1cb3133f71db5b9f3e0532"
-$suffix = "_i686"
-
-InstallMinGW $release $sha1 $suffix
-
-

coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730_64.ps1

@@ -1,9 +0,0 @@
-. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
-
-# This script will install 64-bit MinGW 7.3.0
-
-$release = "x86_64-7.3.0-release-posix-seh-rt_v5-rev0"
-$sha1    = "0fce15036400568babd10d65b247e9576515da2c"
-
-InstallMinGW $release $sha1
-

coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\icu.ps1"