Update submodules on '6.2.0' in qt/qt5

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

.gitmodules

@@ -1,61 +1,61 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = dev
+	branch = 6.2.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
-	recommends = qtsvg
+	recommends = qtimageformats qtshadertools qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = dev
+	branch = 6.2.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 [submodule "qtmultimedia"]
-	depends = qtbase
+	depends = qtbase qtshadertools
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = dev
+	branch = 6.2.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = dev
+	branch = 6.2.0
 	status = ignore
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = dev
+	branch = 6.2.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative qttools
-	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
+	recommends = qtmultimedia
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = dev
+	branch = 6.2.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -73,18 +73,18 @@
 	priority = 50
 [submodule "qtlocation"]
 	depends = qtbase
-	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
+	recommends = qtdeclarative qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -99,12 +99,6 @@
 	url = ../qtfeedback.git
 	branch = master
 	status = ignore
-[submodule "qtdocgallery"]
-	depends = qtdeclarative
-	path = qtdocgallery
-	url = ../qtdocgallery.git
-	branch = master
-	status = ignore
 [submodule "qtpim"]
 	depends = qtdeclarative
 	path = qtpim
@@ -113,219 +107,186 @@
 	status = ignore
 [submodule "qtconnectivity"]
 	depends = qtbase
-	recommends = qtdeclarative qtandroidextras
+	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
-[submodule "qtgraphicaleffects"]
-	depends = qtdeclarative
-	path = qtgraphicaleffects
-	url = ../qtgraphicaleffects.git
-	branch = dev
-	status = ignore
-[submodule "qtquickcontrols"]
-	depends = qtdeclarative
-	recommends = qtgraphicaleffects
-	path = qtquickcontrols
-	url = ../qtquickcontrols.git
-	branch = dev
-	status = ignore
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
-[submodule "qtx11extras"]
-	depends = qtbase
-	path = qtx11extras
-	url = ../qtx11extras.git
-	branch = dev
-	status = ignore
-[submodule "qtmacextras"]
-	depends = qtbase
-	path = qtmacextras
-	url = ../qtmacextras.git
-	branch = dev
-	status = ignore
-[submodule "qtwinextras"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtwinextras
-	url = ../qtwinextras.git
-	branch = dev
-	status = ignore
-[submodule "qtandroidextras"]
-	depends = qtbase
-	path = qtandroidextras
-	url = ../qtandroidextras.git
-	branch = dev
-	status = ignore
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
-	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
+	recommends = qtlocation qtwebchannel qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = dev
+	branch = 6.2.0
 	status = ignore
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
-[submodule "qtquickcontrols2"]
-	depends = qtdeclarative
-	recommends = qtimageformats qtgraphicaleffects
-	path = qtquickcontrols2
-	url = ../qtquickcontrols2.git
-	branch = dev
-	status = essential
-[submodule "qtpurchasing"]
-	depends = qtbase
-	recommends = qtdeclarative qtandroidextras
-	path = qtpurchasing
-	url = ../qtpurchasing.git
-	branch = dev
-	status = ignore
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia qtquickcontrols
+	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = dev
+	branch = 6.2.0
 	status = ignore
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = dev
+	branch = 6.2.0
 	status = ignore
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = dev
+	branch = 6.2.0
 	status = ignore
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = dev
+	branch = 6.2.0
-	status = ignore
+	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
+	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qt5compat"]
-	depends = qtbase
+	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = dev
+	branch = 6.2.0
 	status = deprecated
+[submodule "qtcoap"]
+	depends = qtbase
+	path = qtcoap
+	url = ../qtcoap.git
+	branch = 6.2.0
+	status = addon
+[submodule "qtmqtt"]
+	depends = qtbase qtdeclarative
+	path = qtmqtt
+	url = ../qtmqtt.git
+	branch = 6.2.0
+	status = addon
+[submodule "qtopcua"]
+	depends = qtbase qtdeclarative
+	path = qtopcua
+	url = ../qtopcua.git
+	branch = 6.2.0
+	status = addon

CMakeLists.txt

@@ -1,9 +1,17 @@
-cmake_minimum_required(VERSION 3.15.0)
+# The real minimum version will be checked by the qtbase project.
+# 3.16 is the absolute minimum though.
+cmake_minimum_required(VERSION 3.16...3.20)
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/qtbase/cmake/QtAutoDetect.cmake)
+# Include qtbase's .cmake.conf for access to QT_REPO_MODULE_VERSION
+set(__qt6_qtbase_src_path "${CMAKE_CURRENT_SOURCE_DIR}/qtbase")
+include("${__qt6_qtbase_src_path}/.cmake.conf")
+
+# Run platform auto-detection /before/ the first project() call and thus
+# before the toolchain file is loaded.
+include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")
 
 project(Qt
-    VERSION 6.0.0
+    VERSION "${QT_REPO_MODULE_VERSION}"
     DESCRIPTION "Qt Libraries"
     HOMEPAGE_URL "https://qt.io/"
     LANGUAGES CXX C ASM
@@ -13,42 +21,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 "${__qt6_qtbase_src_path}/cmake")
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/qtbase/cmake/3rdparty/extra-cmake-modules/find-modules")
+    list(APPEND CMAKE_MODULE_PATH
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/qtbase/cmake/3rdparty/kwin")
+        "${__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 +39,73 @@ if (NOT QT_BUILD_STANDALONE_TESTS)
 endif()
 set(QT_SUPERBUILD TRUE)
 
-# Get submodules list
+# Get submodule list if not already defined
-extract_git_submodules(git_module_list)
+if(NOT QT_BUILD_SUBMODULES)
-foreach(module IN LISTS git_module_list)
+    if(DEFINED ENV{QT_BUILD_SUBMODULES})
-    # Prepare a list of dependencies to be fed into topological sort
+        set(QT_BUILD_SUBMODULES "$ENV{QT_BUILD_SUBMODULES}")
-    set("${qt_module_prop_prefix}${module}_all_dependencies"
+    else()
-            ${${qt_module_prop_prefix}${module}_depends}
+        qt_internal_find_modules(QT_BUILD_SUBMODULES)
-            ${${qt_module_prop_prefix}${module}_recommends}
+    endif()
-            ${${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}")
 endif()
+set(QT_BUILD_SUBMODULES "${QT_BUILD_SUBMODULES}" CACHE STRING "Submodules to build")
 
-foreach(module IN LISTS git_module_list)
+set(qt_module_dependency_map_prefix "__qt_module_dependencies_")
-    ecm_optional_add_subdirectory(${module})
+qt_internal_sort_module_dependencies("${QT_BUILD_SUBMODULES}" QT_BUILD_SUBMODULES
-endforeach()
+                                     "${qt_module_dependency_map_prefix}")
 
-# Check for unmet dependencies
+foreach(module IN LISTS QT_BUILD_SUBMODULES)
-foreach(module IN LISTS git_module_list)
+    # Check for unmet dependencies
-    foreach(dep IN LISTS "${qt_module_prop_prefix}${module}_depends")
+    if(NOT DEFINED BUILD_${module} OR BUILD_${module})
-        if (dep STREQUAL qtbase)
+        message(NOTICE "Checking dependencies of '${module}'")
-            # Always available skip
+        get_property(required_deps GLOBAL PROPERTY QT_REQUIRED_DEPS_FOR_${module})
-            continue()
+        foreach(dep IN LISTS "${qt_module_dependency_map_prefix}${module}")
-        endif()
+            if (dep STREQUAL "qtbase")
-        if (DEFINED BUILD_${module} AND BUILD_${module})
+                # Always available skip
+                continue()
+            endif()
+
+            set(required FALSE)
+            if(dep IN_LIST required_deps)
+                set(required TRUE)
+            endif()
+
+            set(error_reason "")
             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")
+                set(error_reason "${dep}'s CMakeLists.txt couldn't be found")
+            elseif(DEFINED BUILD_${dep} AND NOT BUILD_${dep})
+                set(error_reason "building '${dep}' was explicitly disabled")
             endif()
-            if(NOT BUILD_${dep})
+
-                message(FATAL_ERROR "Module '${module} depends on '${dep}', but ${deps} will not be built.\n")
+            if(NOT error_reason STREQUAL "")
+                if(required)
+                    message(FATAL_ERROR "Module '${module}' depends on '${dep}', "
+                        "but ${error_reason}.\n"
+                        "Note: Use '-skip ${module}' to exclude it from the build.")
+                else()
+                    message(NOTICE "Skipping optional dependency '${dep}' of '${module}', "
+                        "because ${error_reason}.")
+                endif()
             endif()
-        endif()
+        endforeach()
-    endforeach()
+    endif()
 endforeach()
 
+foreach(module IN LISTS QT_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()

README

@@ -1,134 +0,0 @@
-HOW TO BUILD QT5
-================
-
-
- Synopsis
- ========
-
-   System requirements
-   ------------------
-
-    - Perl 5.8 or later
-    - Python 2.7 or later
-    - C++ compiler supporting the C++11 standard
-
-     For other platform specific requirements,
-     please see section "Setting up your machine" on:
-     http://wiki.qt.io/Get_The_Source
-
-   Licensing:
-   ----------
-
-    Opensource users:
-
-        <license>        = -opensource
-
-    Commercial users:
-
-        <license>        = -commercial
-
-   Linux, Mac:
-   -----------
-
-     cd <path>/<source_package>
-     ./configure -prefix $PWD/qtbase <license> -nomake tests
-     make -j 4
-
-   Windows:
-   --------
-
-     Open a command prompt.
-     Ensure that the following tools can be found in the path:
-     * Supported compiler (Visual Studio 2012 or later,
-        MinGW-builds gcc 4.9 or later)
-     * Perl version 5.12 or later   [http://www.activestate.com/activeperl/]
-     * Python version 2.7 or later  [http://www.activestate.com/activepython/]
-     * Ruby version 1.9.3 or later  [http://rubyinstaller.org/]
-
-     cd <path>\<source_package>
-     configure -prefix %CD%\qtbase <license> -nomake tests
-     nmake // jom // mingw32-make
-
-     To accelerate the bootstrap of qmake with MSVC, it may be useful to pass
-     "-make-tool jom" on the configure command line. If you do not use jom,
-     adding "/MP" to the CL environment variable is a good idea.
-
- More details follow.
-
- Build!
- ======
-
- A typical `configure; make' build process is used.
-
- Some relevant configure options (see configure -help):
-
- -release              Compile and link Qt with debugging turned off.
- -debug                Compile and link Qt with debugging turned on.
- -nomake tests         Disable building of tests to speed up compilation
- -nomake examples      Disable building of examples to speed up compilation
- -confirm-license      Automatically acknowledge the LGPL 2.1 license.
-
- Example for a release build:
- (adjust the `-jN' parameter as appropriate for your system)
-
-   ./configure -prefix $PWD/qtbase <license>
-   make -j4
-
- Example for a developer build:
- (enables more autotests, builds debug version of libraries, ...)
-
-   ./configure -developer-build <license>
-   make -j4
-
- See output of `./configure -help' for documentation on various options to
- configure.
-
- The above examples will build whatever Qt5 modules have been enabled by
- default in the build system.
-
- It is possible to build selected modules with their dependencies by doing
- a `make module-<foo>'.  For example, to build only qtdeclarative,
- and the modules it depends on:
-
-   ./configure -prefix $PWD/qtbase <license>
-   make -j4 module-qtdeclarative
-
- This can save a lot of time if you are only interested in a subset of Qt5.
-
-
- Hints
- =====
-
- The submodule repository qtrepotools contains useful scripts for
- developers and release engineers. Consider adding qtrepotools/bin
- to your PATH environment variable to access them.
-
- The qt5_tool in qtrepotools has some more features which may be of interest.
- Try `qt5_tool --help'.
-
-
- Building Qt5 from git
- =====================
- See http://wiki.qt.io/Building_Qt_5_from_Git and README.git
- for more information.
- See http://wiki.qt.io/Qt_5 for the reference platforms.
-
-
- Documentation
- =============
-
- After configuring and compiling Qt, building the documentation is possible by running
- "make docs".
-
- After having built the documentation, you need to install it with the following
- command:
-
-    make install_docs
-
- The documentation is installed in the path set to $QT_INSTALL_DOCS.
- Running "qmake -query" will list the value of QT_INSTALL_DOCS.
-
- Information about Qt 5's documentation is located in qtbase/doc/README
- or in the following page: http://wiki.qt.io/Qt5DocumentationProject
-
- Note: Building the documentation is only tested on desktop platforms.

README.md

@@ -0,0 +1,131 @@
+HOW TO BUILD Qt6
+================
+
+
+Synopsis
+========
+
+System requirements
+------------------
+
+* CMake 3.18 or later
+* Perl 5.8 or later
+* Python 2.7 or later
+* C++ compiler supporting the C++17 standard
+
+It's recommended to have ninja 1.8 or later installed.
+
+For other platform specific requirements,
+please see section "Setting up your machine" on:
+http://wiki.qt.io/Get_The_Source
+
+Linux, Mac:
+-----------
+
+````
+cd <path>/<source_package>
+./configure -prefix $PWD/qtbase
+cmake --build .
+````
+
+Windows:
+--------
+
+1. Open a command prompt.
+2. Ensure that the following tools can be found in the path:
+ * Supported compiler (Visual Studio 2019 or later, or MinGW-builds gcc 8.1 or later)
+ * Perl version 5.12 or later   [http://www.activestate.com/activeperl/]
+ * Python version 2.7 or later  [http://www.activestate.com/activepython/]
+ * Ruby version 1.9.3 or later  [http://rubyinstaller.org/]
+
+````
+cd <path>\<source_package>
+configure -prefix %CD%\qtbase
+cmake --build .
+````
+
+More details follow.
+
+Build!
+======
+
+Qt is built with CMake, and a typical
+`configure && cmake --build .` build process is used.
+
+If ninja is installed, it is automatically chosen as CMake generator.
+
+Some relevant configure options (see configure -help):
+
+* `-release` Compile and link Qt with debugging turned off.
+* `-debug` Compile and link Qt with debugging turned on.
+
+Example for a release build:
+
+````
+./configure -prefix $PWD/qtbase
+cmake --build .
+````
+
+Example for a developer build:
+(enables more autotests, builds debug version of libraries, ...)
+
+````
+./configure -developer-build
+cmake --build .
+````
+
+ See output of `./configure -help` for documentation on various options to
+ configure.
+
+ The above examples will build whatever Qt modules have been enabled
+ by default in the build system.
+
+ It is possible to build selected repositories with their dependencies by doing
+ a `ninja <repo-name>/all'.  For example, to build only qtdeclarative,
+ and the modules it depends on:
+
+````
+./configure
+ninja qtdeclarative/all
+````
+
+This can save a lot of time if you are only interested in a subset of Qt.
+
+
+Hints
+=====
+
+The submodule repository `qtrepotools` contains useful scripts for
+developers and release engineers. Consider adding qtrepotools/bin
+to your `PATH` environment variable to access them.
+
+
+Building Qt from git
+=====================
+See http://wiki.qt.io/Building_Qt_6_from_Git and README.git
+for more information.
+See http://wiki.qt.io/Qt_6 for the reference platforms.
+
+
+Documentation
+=============
+
+After configuring and compiling Qt, building the documentation is possible by running
+
+```
+cmake --build . --target docs
+```
+
+After having built the documentation, you need to install it with the following
+command:
+
+```
+cmake --build . --target install_docs
+```
+
+The documentation is installed in the path specified with the
+configure argument `-docdir`.
+
+Information about Qt's documentation is located in qtbase/doc/README
+
+Note: Building the documentation is only tested on desktop platforms.

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,327 @@
+# 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(eof_marker "---EOF---")
+    list(APPEND lines "${eof_marker}")
+    set(required_default TRUE)
+    set(dependencies "")
+    set(dependency "")
+    set(revision "")
+    set(required "${required_default}")
+    foreach(line IN LISTS lines)
+        if(line MATCHES "^  (.+):$" OR line STREQUAL "${eof_marker}")
+            # Found a repo entry or end of file. Add the last seen dependency.
+            if(NOT dependency STREQUAL "")
+                if(revision STREQUAL "")
+                    message(FATAL_ERROR "Format error in ${depends_file} - ${dependency} does not specify revision!")
+                endif()
+                list(APPEND dependencies "${dependency}/${revision}/${required}")
+            endif()
+            # Remember the current dependency
+            if(NOT line STREQUAL "${eof_marker}")
+                set(dependency "${CMAKE_MATCH_1}")
+                set(revision "")
+                set(required "${required_default}")
+                # dependencies are specified with relative path to this module
+                string(REPLACE "../" "" dependency ${dependency})
+            endif()
+        elseif(line MATCHES "^    ref: (.+)$")
+            set(revision "${CMAKE_MATCH_1}")
+        elseif(line MATCHES "^    required: (.+)$")
+            string(TOUPPER "${CMAKE_MATCH_1}" required)
+        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)
+        if(dependency MATCHES "(.*)/([^/]+)/([^/]+)")
+            set(dependency "${CMAKE_MATCH_1}")
+            set(revision "${CMAKE_MATCH_2}")
+            set(required "${CMAKE_MATCH_3}")
+            if(required)
+                set_property(GLOBAL APPEND PROPERTY QT_REQUIRED_DEPS_FOR_${module} ${dependency})
+            endif()
+        else()
+            message(FATAL_ERROR "Internal Error: wrong dependency format ${dependency}")
+        endif()
+        list(APPEND modules_dependencies "${dependency}")
+        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}")
+        else()
+            set(ordered "${out_ordered}")
+        endif()
+    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)
+    set(swallow_output "") # unless VERBOSE, eat git output, show it in case of error
+    if (NOT VERBOSE)
+        list(APPEND swallow_output "OUTPUT_VARIABLE" "git_output" "ERROR_VARIABLE" "git_output")
+    endif()
+    message(NOTICE "Checking '${module}' out to revision '${revision}'")
+    execute_process(
+        COMMAND "git" "checkout" "${revision}"
+        WORKING_DIRECTORY "./${module}"
+        RESULT_VARIABLE git_result
+        ${swallow_output}
+    )
+    if (git_result EQUAL 128)
+        message(WARNING "${git_output}, trying detached checkout")
+        execute_process(
+            COMMAND "git" "checkout" "--detach" "${revision}"
+            WORKING_DIRECTORY "./${module}"
+            RESULT_VARIABLE git_result
+            ${swallow_output}
+        )
+    endif()
+    if (git_result)
+        message(FATAL_ERROR "Failed to check '${module}' out to '${revision}': ${git_output}")
+    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(swallow_output "") # unless VERBOSE, eat git output, show it in case of error
+    if (NOT VERBOSE)
+        list(APPEND swallow_output "OUTPUT_VARIABLE" "git_output" "ERROR_VARIABLE" "git_output")
+    endif()
+
+    set(gitdir "")
+    set(remote "")
+
+    # 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)
+    string(FIND "${gitdir}" ".git/modules" index)
+    if(index GREATER -1) # submodules have not been absorbed
+        string(SUBSTRING "${gitdir}" 0 ${index} gitdir)
+    endif()
+    message(DEBUG "Will look for clones in ${gitdir}")
+
+    execute_process(
+        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}.gitmodules" AND NOT EXISTS "${gitdir}${dependency}/.git")
+        # super repo exists, but the submodule we need does not - try to initialize
+        message(NOTICE "Initializing submodule '${dependency}' from ${gitdir}")
+        execute_process(
+            COMMAND "git" "submodule" "update" "--init" "${dependency}"
+            WORKING_DIRECTORY "${gitdir}"
+            RESULT_VARIABLE git_result
+            ${swallow_output}
+        )
+        if (git_result)
+            # ignore errors, fall back to an independent clone instead
+            message(WARNING "Failed to initialize submodule '${dependency}' from ${gitdir}")
+        endif()
+    endif()
+
+    if(EXISTS "${gitdir}${dependency}")
+        # for the module we want, there seems to be a clone parallel to what we have
+        message(NOTICE "Adding worktree for ${dependency} from ${gitdir}${dependency}")
+        execute_process(
+            COMMAND "git" "worktree" "add" "--detach" "${CMAKE_CURRENT_SOURCE_DIR}/${dependency}"
+            WORKING_DIRECTORY "${gitdir}/${dependency}"
+            RESULT_VARIABLE git_result
+            ${swallow_output}
+        )
+        if (git_result)
+            message(FATAL_ERROR "Failed to check '${module}' out to '${revision}': ${git_output}")
+        endif()
+    else()
+        # we don't find the existing clone, so clone from the same remote
+        message(NOTICE "Cloning ${dependency} from ${remote}${dependency}.git")
+        execute_process(
+            COMMAND "git" "clone" "${remote}${dependency}.git"
+            WORKING_DIRECTORY "."
+            RESULT_VARIABLE git_result
+            ${swallow_output}
+        )
+        if (git_result)
+            message(FATAL_ERROR "Failed to check '${module}' out to '${revision}': ${git_output}")
+        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()

cmake/TopologicalSort.cmake

@@ -1,148 +0,0 @@
-##############################################################################
-# @file  TopologicalSort.cmake
-# @brief CMake implementation of topological sorting algorithm.
-#
-# Perform a reverse topological sort on the given LIST.
-#
-#   topological_sort(my_list "MY_" "_EDGES")
-#
-# LIST is the name of a variable containing a list of elements to be
-# sorted in reverse topological order. Each element in the list has a
-# set of outgoing edges (for example, those other list elements that
-# it depends on). In the resulting reverse topological ordering
-# (written back into the variable named LIST), an element will come
-# later in the list than any of the elements that can be reached by
-# following its outgoing edges and the outgoing edges of any vertices
-# they target, recursively. Thus, if the edges represent dependencies
-# on build targets, for example, the reverse topological ordering is
-# the order in which one would build those targets.
-#
-# For each element E in this list, the edges for E are contained in
-# the variable named ${PREFIX}${E}${SUFFIX}. If no such variable
-# exists, then it is assumed that there are no edges. For example, if
-# my_list contains a, b, and c, one could provide a dependency graph
-# using the following variables:
-#
-#     MY_A_EDGES     b
-#     MY_B_EDGES
-#     MY_C_EDGES     a b
-#
-#  With the involcation of topological_sort shown above and these
-#  variables, the resulting reverse topological ordering will be b, a, c.
-#
-# @verbatim
-##############################################################################
-# Modified from Boost Utilities
-#
-# Copyright 2010 Kitware, Inc.
-##############################################################################
-# Copyright 2007 Douglas Gregor <doug.gregor@gmail.com>
-# Copyright 2007 Troy Straszheim
-#
-# Distributed under the Boost Software License, Version 1.0.
-##############################################################################
-# Boost Software License - Version 1.0 - August 17th, 2003
-#
-# Permission is hereby granted, free of charge, to any person or organization
-# obtaining a copy of the software and accompanying documentation covered by
-# this license (the "Software") to use, reproduce, display, distribute,
-# execute, and transmit the Software, and to prepare derivative works of the
-# Software, and to permit third-parties to whom the Software is furnished to
-# do so, all subject to the following:
-#
-# The copyright notices in the Software and this entire statement, including
-# the above license grant, this restriction and the following disclaimer,
-# must be included in all copies of the Software, in whole or in part, and
-# all derivative works of the Software, unless such copies or derivative
-# works are solely in the form of machine-executable object code generated by
-# a source language processor.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-# SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-# FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-##############################################################################
-# @endverbatim
-#
-# @ingroup CMakeUtilities
-##############################################################################
-
-function(topological_sort LIST PREFIX SUFFIX)
-  # Clear the stack and output variable
-  set(VERTICES "${${LIST}}")
-  set(STACK)
-  set(${LIST})
-
-  # Loop over all of the vertices, starting the topological sort from
-  # each one.
-  foreach(VERTEX ${VERTICES})
-
-    # If we haven't already processed this vertex, start a depth-first
-    # search from where.
-    if (NOT FOUND_${VERTEX})
-      # Push this vertex onto the stack with all of its outgoing edges
-      string(REPLACE ";" " " NEW_ELEMENT
-        "${VERTEX};${${PREFIX}${VERTEX}${SUFFIX}}")
-      list(APPEND STACK ${NEW_ELEMENT})
-
-      # We've now seen this vertex
-      set(FOUND_${VERTEX} TRUE)
-
-      # While the depth-first search stack is not empty
-      list(LENGTH STACK STACK_LENGTH)
-      while(STACK_LENGTH GREATER 0)
-        # Remove the vertex and its remaining out-edges from the top
-        # of the stack
-        list(GET STACK -1 OUT_EDGES)
-        list(REMOVE_AT STACK -1)
-
-        # Get the source vertex and the list of out-edges
-        separate_arguments(OUT_EDGES)
-        list(GET OUT_EDGES 0 SOURCE)
-        list(REMOVE_AT OUT_EDGES 0)
-
-        # While there are still out-edges remaining
-        list(LENGTH OUT_EDGES OUT_DEGREE)
-        while (OUT_DEGREE GREATER 0)
-          # Pull off the first outgoing edge
-          list(GET OUT_EDGES 0 TARGET)
-          list(REMOVE_AT OUT_EDGES 0)
-
-          if (NOT FOUND_${TARGET})
-            # We have not seen the target before, so we will traverse
-            # its outgoing edges before coming back to our
-            # source. This is the key to the depth-first traversal.
-
-            # We've now seen this vertex
-            set(FOUND_${TARGET} TRUE)
-
-            # Push the remaining edges for the current vertex onto the
-            # stack
-            string(REPLACE ";" " " NEW_ELEMENT
-              "${SOURCE};${OUT_EDGES}")
-            list(APPEND STACK ${NEW_ELEMENT})
-
-            # Setup the new source and outgoing edges
-            set(SOURCE ${TARGET})
-            set(OUT_EDGES
-              ${${PREFIX}${SOURCE}${SUFFIX}})
-          endif(NOT FOUND_${TARGET})
-
-          list(LENGTH OUT_EDGES OUT_DEGREE)
-        endwhile (OUT_DEGREE GREATER 0)
-
-        # We have finished all of the outgoing edges for
-        # SOURCE; add it to the resulting list.
-        list(APPEND ${LIST} ${SOURCE})
-
-        # Check the length of the stack
-        list(LENGTH STACK STACK_LENGTH)
-      endwhile(STACK_LENGTH GREATER 0)
-    endif (NOT FOUND_${VERTEX})
-  endforeach(VERTEX)
-
-  set(${LIST} ${${LIST}} PARENT_SCOPE)
-endfunction(topological_sort)

cmake/TopologicalSort_LICENSE.txt

@@ -1,23 +0,0 @@
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.

cmake/qt_attribution.json

@@ -1,13 +0,0 @@
-{
-    "Id": "cmake_topological_sort",
-    "Name": "CMake Topological Sort",
-    "QDocModule": "qt",
-    "QtUsage": "Used in the CMake super build project file",
-    "Files": "TopologicalSort.cmake",
-
-    "Description": "CMake implementation of the topological sort algorithm",
-    "License": "Boost Software License - Version 1.0",
-    "LicenseFile": "TopologicalSort_LICENSE.txt",
-    "Copyright": "Copyright 2010 Kitware, Inc."
-}
-

coin/module_config.yaml

@@ -14,13 +14,47 @@ 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 qtbase/src/plugins/platforms/all qtbase/src/plugins/sqldrivers/all qttools/all --parallel -v"
+          maxTimeInSeconds: 12000
+          maxTimeBetweenOutput: 1200
+          userMessageOnFailure: >
+            Failed to build sources.
+        - type: ExecuteCommand
+          command: "{{.Env.ENV_PREFIX}} cmake --build . --target docs -v"
+          maxTimeInSeconds: 12000
+          maxTimeBetweenOutput: 1200
+          userMessageOnFailure: >
+            Failed to generate docs.
+        - type: ExecuteCommand
+          command: "cp -r {{.BuildDir}}/qtbase/doc/config {{.BuildDir}}/doc"
+          maxTimeInSeconds: 12000
+          maxTimeBetweenOutput: 1200
+          userMessageOnFailure: "Failed to copy qtbase/doc/config to documentation directory."
+        - type: ExecuteCommand
+          command: "cp -r {{.BuildDir}}/qtbase/doc/global {{.BuildDir}}/doc"
+          maxTimeInSeconds: 12000
+          maxTimeBetweenOutput: 1200
+          userMessageOnFailure: "Failed to copy qtbase/doc/global to documentation directory."
+        - type: UploadArtifact
+          archiveDirectory: '{{.BuildDir}}/doc'
+          transferType: UploadModuleDocumentation
+          maxTimeInSeconds: 1800
+          maxTimeBetweenOutput: 1800
+      enable_if:
+        condition: property
+        property: features
+        contains_value: "Documentation"
+
   Test:
     - type: EnvironmentVariable
       variableName: Dummy

coin/platform_configs/cmake_platforms.yaml

@@ -3,85 +3,106 @@ Include: [
     cmake_platforms_qemu.yaml,
     cmake_platforms_target_android_host_linux.yaml,
     cmake_platforms_target_android_host_macos.yaml,
-    cmake_platforms_target_android_host_windows.yaml
+    cmake_platforms_target_android_host_windows.yaml,
+    cmake_platforms_wasm.yaml,
+    macos.yaml
     ]
 Configurations:
 -
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Sccache', 'Insignificant']
+    Features: ['Sccache']
-    Configure arguments: '-DBUILD_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'
+    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', 'DisableTests']
+    Configure arguments: '-DFEATURE_developer_build=ON -DINPUT_opengl=no -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Environment variables: [
+        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Compiler: 'GCC'
+    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']
+    Features: ['Sccache']
-    Configure arguments: '-DBUILD_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'
+    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'
+    Id: 'OpenSUSE-15.3-host'
+    Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache']
-    Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY'
     Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
     Template: 'qtci-linux-SLES-15_SP2-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache', 'DisableTests']
-    Configure arguments: '-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 -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
-    Id: 'macos-10.14-host'
+    Template: 'qtci-windows-10-x86_64-52'
-    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}}/..'
-    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'
-    Environment variables: [
-        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-        ]
--
-    Template: 'qtci-windows-10-x86_64-51'
     Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache']
+    Features: ['Packaging', 'Sccache', "DebugAndRelease"]
-    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DBUILD_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'
+    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: [
         'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+        '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'
+    Id: 'Windows10-MSVC2019-x64-host'
+    Template: 'qtci-windows-10-x86_64-52'
     Compiler: 'MSVC2019'
-    Features: ['Insignificant', 'Sccache']
+    Features: ['Sccache', "DebugAndRelease"]
-    Configure arguments: '-G"Ninja Multi-Config" -DBUILD_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'
+    Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: [
         'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
-    Id: 'RHEL-7.6-host'
+    Template: 'qtci-windows-10-x86_64-52'
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
+    Compiler: 'MSVC2019'
+    Target arch: 'arm64'
+    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging']
+    Platform dependency: 'Windows10-MSVC2019-x64-host'
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Id: 'RHEL-8.2-host'
+    Template: 'qtci-linux-RHEL-8.2-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_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY'
-    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
--
-    Id: 'CentOS-8.1-host'
-    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'Insignificant']
-    Configure arguments: '-DBUILD_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_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']
 -
@@ -90,14 +111,67 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-10.14-host'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-    Features: ['Packaging', 'Sccache']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
-    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DBUILD_WITH_PCH=OFF', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
+    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
 -
     Id: 'Windows10-Mingw8-x64-host'
-    Template: 'qtci-windows-10-x86_64-51'
+    Template: 'qtci-windows-10-x86_64-52'
     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}}\..'
+    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}}'
+    ]
+-
+    Id: 'Windows10-LLVM-x64-host'
+    Template: 'qtci-windows-10-x86_64-52'
+    Compiler: 'Clang'
+    Features: ['Sccache']
+    Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
+    Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'LLVM_INSTALL_DIR=C:\llvm-mingw']
+-
+    Template: 'qtci-windows-10-x86_64-52'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
+    Features: ['Sccache']
+    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: ['Path={{.Env.MINGW810}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache','LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Target os: 'QNX_710'
+    Target arch: 'x86_64'
+    Compiler: 'GCC'
+    Target compiler: 'QCC'
+    Platform dependency: 'Ubuntu-20.04-host'
+    Features: ['Sccache', 'DisableTests']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Target os: 'QNX_710'
+    Target arch: 'arm64'
+    Compiler: 'GCC'
+    Target compiler: 'QCC'
+    Platform dependency: 'Ubuntu-20.04-host'
+    Features: ['Sccache', 'DisableTests']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Target os: 'QNX_710'
+    Target arch: 'armv7'
+    Compiler: 'GCC'
+    Target compiler: 'QCC'
+    Platform dependency: 'Ubuntu-20.04-host'
+    Features: ['Sccache', 'DisableTests']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']

coin/platform_configs/cmake_platforms_qemu.yaml

@@ -6,14 +6,13 @@ Configurations:
     Target arch: 'armv7'
     Compiler: 'GCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'Insignificant']
+    Features: ['Sccache']
     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=ON -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
-
+        'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
-        'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../../environment-setup-armv7at2hf-neon-poky-linux-gnueabi',
+        "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
-        "QT_CMAKE_DIR=/opt/cmake-3.18.3/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',
+        'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
         'QT_QUICK_BACKEND=software',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TARGET_TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
@@ -23,14 +22,13 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'GCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'Insignificant']
+    Features: ['Sccache']
     Environment variables: [
-
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
-        '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',
+        'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
-        'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/../../environment-setup-aarch64-poky-linux',
+        "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
-        "QT_CMAKE_DIR=/opt/cmake-3.18.3/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',
+        'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
         'QT_QUICK_BACKEND=software',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TARGET_TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
@@ -40,12 +38,13 @@ Configurations:
     Target arch: 'mips64'
     Compiler: 'GCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache', 'Insignificant', 'DisableTests']
+    Features: ['Sccache', '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_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
-        'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/../../environment-setup-mips64r2-poky-linux',
+        'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
-        "QT_CMAKE_DIR=/opt/cmake-3.18.3/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
         'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
+        'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
         'QT_QUICK_BACKEND=software',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TARGET_TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']

coin/platform_configs/cmake_platforms_static_tests.yaml

@@ -0,0 +1,28 @@
+Version: 2
+Configurations:
+-
+    Template: 'qtci-linux-SLES-15_SP2-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Sccache', 'MinimalStaticTests']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Template: 'qtci-windows-10-x86_64-52'
+    Compiler: 'MSVC2019'
+    Features: ['Sccache', 'MinimalStaticTests']
+    Configure arguments: '-G"Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_SHARED_LIBS=OFF -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -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-macos-11.0-x86_64-102'
+    Compiler: 'Clang'
+    Features: ['Sccache', 'MinimalStaticTests']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DFEATURE_framework=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'
+    ]

coin/platform_configs/cmake_platforms_target_android_host_linux.yaml

@@ -1,46 +1,46 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
+    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'arm64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'CentOS-8.1-host'
+    Platform dependency: 'RHEL-8.2-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-CentOS-8.1-x86_64-50'
+    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'armv7'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'CentOS-8.1-host'
+    Platform dependency: 'RHEL-8.2-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-CentOS-8.1-x86_64-50'
+    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'CentOS-8.1-host'
+    Platform dependency: 'RHEL-8.2-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-CentOS-8.1-x86_64-50'
+    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'CentOS-8.1-host'
+    Platform dependency: 'RHEL-8.2-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

@@ -6,10 +6,10 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-10.14-host'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
     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'
@@ -17,10 +17,10 @@ Configurations:
     Target arch: 'armv7'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-10.14-host'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
     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'
@@ -28,10 +28,10 @@ Configurations:
     Target arch: 'x86'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-10.14-host'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
     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'
@@ -39,8 +39,8 @@ Configurations:
     Target arch: 'x86_64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-10.14-host'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
     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

@@ -1,7 +1,7 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-windows-10-x86_64-51'
+    Template: 'qtci-windows-10-x86_64-52'
     Target os: 'Android_ANY'
     Target arch: 'arm64'
     Compiler: 'Mingw'
@@ -10,10 +10,10 @@ 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'
+    Template: 'qtci-windows-10-x86_64-52'
     Target os: 'Android_ANY'
     Target arch: 'armv7'
     Compiler: 'Mingw'
@@ -22,10 +22,10 @@ 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'
+    Template: 'qtci-windows-10-x86_64-52'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'Mingw'
@@ -34,10 +34,10 @@ 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'
+    Template: 'qtci-windows-10-x86_64-52'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'Mingw'
@@ -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/cmake_platforms_wasm.yaml

@@ -0,0 +1,35 @@
+Version: 2
+Configurations:
+-
+    Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
+    Target os: 'WebAssembly'
+    Compiler: 'GCC'
+    Platform dependency: 'OpenSUSE-15.3-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
+        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Template: 'qtci-windows-10-x86_64-52'
+    Target os: 'WebAssembly'
+    Compiler: 'Mingw'
+    Target compiler: 'Clang'
+    Platform dependency: 'Windows10-Mingw8-x64-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW810}}\bin;{{.Env.Path}}',
+        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
+        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -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 -DFEATURE_pkg_config=OFF']
+-
+    Template: 'qtci-macos-10.14-x86_64'
+    Target os: 'WebAssembly'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Environment variables: [
+        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
+        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']

coin/platform_configs/default.yaml

@@ -1,105 +1,5 @@
 Version: 2
 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'
--
-    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'
--
-    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'
--
-    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'
--
-    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'
--
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
-    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'
--
-    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['UseLegacyInstructions', 'Insignificant']
-    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 -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'
--
-    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'
--
-    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'
--
-    Template: 'qtci-macos-10.14-x86_64'
-    Target os: 'Android_ANY'
-    Target arch: 'multi'
-    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'
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QEMU'
-    Target arch: 'armv7'
-    Compiler: 'GCC'
-    Features: ['UseLegacyInstructions', 'Insignificant']
-    Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors'
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QEMU'
-    Target arch: 'arm64'
-    Compiler: 'GCC'
-    Features: ['UseLegacyInstructions', 'Insignificant']
-    Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors'
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QEMU'
-    Target arch: 'mips64'
-    Compiler: 'GCC'
-    Features: ['DisableTests', 'UseLegacyInstructions']
-    Environment variables: ['QT_QUICK_BACKEND=software']
-    Configure arguments: '-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: '-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'
 -
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'

coin/platform_configs/flashing-wizard.yaml

@@ -2,21 +2,26 @@ Version: 2
 Module only: True
 Configurations:
     -
-        Template: 'qtci-windows-10-x86_64-51'
+        Template: 'qtci-windows-10-x86_64-52'
         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'
+        Template: 'qtci-windows-10-x86_64-52'
         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-CentOS-8.1-x86_64-50'
+        Template: 'qtci-linux-RHEL-8.2-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 -openssl -qt-harfbuzz 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-18.04-x86_64-50'
+        Compiler: 'GCC'
+        Features: ['Packaging', 'UseLegacyInstructions']
+        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
     -
         Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
         Compiler: 'GCC'

coin/platform_configs/integrity.yaml

@@ -0,0 +1,17 @@
+Version: 2
+Configurations:
+    -
+      Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+      Compiler: 'GCC'
+      Target os: 'INTEGRITY'
+      Platform dependency: 'Ubuntu-20.04-host'
+      Features: ['Sccache', 'DisableTests']
+      Environment variables: [
+          'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_HOST_PATH=/home/qt/work/install -DQT_BUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DQT_QMAKE_TARGET_MKSPEC=devices/integrity-armv8-SA8155P -DINPUT_harfbuzz=no -DFEATURE_library=OFF -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DFEATURE_printdialog=OFF --debug-trycompile -DFEATURE_quick3d_assimp=OFF -DFEATURE_dbus=OFF -GNinja -DUNIX=ON -DFEATURE_gtk3=OFF -DFEATURE_glib=OFF -DFEATURE_libudev=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_sql_mysql=OFF -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64',
+          'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
+          'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel',
+          'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',
+          'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public',
+          'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/',
+          'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH',
+          'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_system_webp=OFF']

coin/platform_configs/ios-tests.yaml

@@ -0,0 +1,12 @@
+Version: 2
+Configurations:
+-
+    Id: "ios-tests-target"
+    Template: 'qtci-macos-10.14-x86_64'
+    Target os: 'IOS_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests']
+    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']

coin/platform_configs/macos-developer-build-tests.yaml

@@ -0,0 +1,24 @@
+Version: 2
+Configurations:
+
+    # These developer-build tests are only run for qtbase and qtdeclarative
+    # See macos.yaml for arm64 developer-build tests, run for all modules.
+
+    -
+        Id: 'macos-10.14-x86_64-developer-build-tests'
+        Template: 'qtci-macos-10.14-x86_64'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
+    -
+        Id: 'macos-10.15-x86_64-developer-build-tests'
+        Template: 'qtci-macos-10.15-x86_64-102'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
+    -
+        Id: 'macos-11-x86_64-developer-build-tests'
+        Template: 'qtci-macos-11.0-x86_64-102'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly']
+        Platform dependency: 'macos-latest-xcode-x86_64-developer-build'

coin/platform_configs/macos.yaml

@@ -0,0 +1,69 @@
+Version: 2
+Configurations:
+    # Build with latest Xcode
+    -
+        # This is a universal build containing both x86_64 and arm64 architectures
+        Id: 'macos-latest-xcode-universal-packaging-build'
+        Template: 'qtci-macos-11.0-x86_64-102'
+        Compiler: 'Clang'
+        Target arch: 'x86_64-arm64'
+        Features: ['Packaging', 'Sccache', 'DoNotRunTests']
+        Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -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 -DFEATURE_gds=OFF',
+            'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+            ]
+
+    # Then run tests on all supported deployment targets
+    -
+        Id: 'macos-10.14-x86_64-tests'
+        Template: 'qtci-macos-10.14-x86_64'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    -
+        Id: 'macos-10.15-x86_64-tests'
+        Template: 'qtci-macos-10.15-x86_64-102'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    -
+        Id: 'macos-11-x86_64-tests'
+        Template: 'qtci-macos-11.0-x86_64-102'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    -
+        Id: 'macos-11-arm64-tests'
+        Template: 'qtci-macos-11.0-arm64'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'TestOnly', 'Packaging']
+        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+
+    # Build x86_64 developer-builds for all modules, but only run tests for qtbase and declarative.
+    # See macos-developer-build-tests.yaml for the tests
+    -
+        Id: 'macos-latest-xcode-x86_64-developer-build'
+        Template: 'qtci-macos-11.0-x86_64-102'
+        Compiler: 'Clang'
+        Features: ['Sccache', 'DoNotRunTests']
+        Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=ON -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'
+            ]
+
+    # Build arm64 developer-builds for all modules, and run their tests. This ensures that we have full
+    # arm64 build and test coverage, regardless of possible issues with the universal build.
+    -
+        Id: 'macos-latest-xcode-arm64-developer-build'
+        Template: 'qtci-macos-11.0-arm64'
+        Compiler: 'Clang'
+        Features: ['DoNotRunTests']
+        Configure arguments: '-DFEATURE_developer_build=ON -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..'
+    -
+        Id: 'macos-11-arm64-developer-build-tests'
+        Template: 'qtci-macos-11.0-arm64'
+        Compiler: 'Clang'
+        Features: ['TestOnly']
+        Platform dependency: 'macos-latest-xcode-arm64-developer-build'

coin/platform_configs/pyside-setup.yaml

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

coin/platform_configs/qdb.yaml

@@ -1,28 +1,30 @@
 Version: 2
-Module only: True
 Configurations:
-    -
+-
-        Template: 'qtci-windows-10-x86_64-51'
+    Template: 'qtci-windows-10-x86_64-52'
-        Compiler: 'MSVC2015'
+    Compiler: 'MSVC2019'
-        Target arch: 'x86'
+    Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
-        Features: ['Packaging', 'UseLegacyInstructions']
+    Configure arguments: '-G"Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_SHARED_LIBS=OFF -DFEATURE_icu=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-        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%'
+    Environment variables: [
-    -
+        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        Template: 'qtci-windows-10-x86_64-51'
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        Compiler: 'MSVC2015'
+        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
-        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%'
+-
-    -
+    Id: 'RHEL-8.2-host'
-        Template: 'qtci-linux-CentOS-8.1-x86_64-50'
+    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
-        Compiler: 'GCC'
+    Compiler: 'GCC'
-        Features: ['Packaging', 'UseLegacyInstructions']
+    Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
-        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 -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -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 -DFEATURE_icu=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',
-        Template: 'qtci-macos-10.13-x86_64-2'
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-        Compiler: 'Clang'
+-
-        Features: ['Packaging']
+    Id: 'macOS-11.0'
-        Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'
+    Template: 'qtci-macos-11.0-x86_64-102'
-    -
+    Compiler: 'Clang'
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
-        Compiler: 'GCC'
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DFEATURE_icu=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_framework=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
-        Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
+    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/qt-creator.yaml

@@ -0,0 +1,33 @@
+Version: 2
+Module only: True
+Configurations:
+-
+    Template: 'qtci-windows-10-x86_64-52'
+    Compiler: 'MSVC2019'
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
+    Configure arguments: ''
+    Environment variables: []
+    Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
+-
+    Template: 'qtci-windows-10-x86-4'
+    Compiler: 'MSVC2019'
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
+    Configure arguments: ''
+    Environment variables: []
+    Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'x86']
+-
+    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'Sccache', 'DisableTests']
+    Configure arguments: ''
+    Environment variables: []
+-
+    Template: 'qtci-macos-10.14-x86_64'
+    Compiler: 'Clang'
+    Features: ['Packaging', 'DisableTests', 'Sccache', 'DebugAndRelease']
+    Configure arguments: ''
+    Environment variables: []
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'LicenseCheck']

coin/platform_configs/qtbase.yaml

@@ -1,23 +1,20 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml,
+    cmake_platforms_static_tests.yaml,
+    macos-developer-build-tests.yaml,
+    integrity.yaml,
+    ios-tests.yaml
+]
 Configurations:
 -
-    Template: 'qtci-linux-openSUSE-15.1-x86_64'
+    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
-    Target os: 'WebAssembly'
+    Target os: 'Android_ANY'
+    Target arch: 'x86'
     Compiler: 'GCC'
-    Features: ['DisableTests', 'UseLegacyInstructions']
+    Target compiler: 'Clang'
-    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'
+    Platform dependency: 'RHEL-8.2-host'
--
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun']
-    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'
--
-    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'
     Environment variables: [
-        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        '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',
-        'TEST_CONFIGURE_ARGS=-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/qtdatavis3d.yaml

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

coin/platform_configs/qtdeclarative.yaml

@@ -1,17 +1,8 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
-Configurations:
+    cmake_platforms.yaml,
--
+    macos-developer-build-tests.yaml,
-    Template: 'qtci-macos-10.14-x86_64'
+    cmake_platforms_static_tests.yaml,
-    Compiler: 'Clang'
+    integrity.yaml
-    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'
+Configurations: []
--
-    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'
-    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/qtdeviceutilities.yaml

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

coin/platform_configs/qtdltlogging.yaml

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

coin/platform_configs/qtimageformats.yaml

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

coin/platform_configs/qtinterfaceframework.yaml

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

coin/platform_configs/qtivi.yaml

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

coin/platform_configs/qtlocation.yaml

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

coin/platform_configs/qtlottie.yaml

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

coin/platform_configs/qtmultimedia.yaml

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

coin/platform_configs/qtsaferenderer.yaml

@@ -1,19 +1,24 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-windows-10-x86_64-51'
+    Template: 'qtci-windows-10-x86_64-52'
     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'
+    Template: 'qtci-windows-10-x86_64-52'
     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-CentOS-8.1-x86_64-50'
+    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
     Compiler: 'GCC'
     Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'
+-
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan'

coin/platform_configs/qtscxml.yaml

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

coin/platform_configs/qtsdk.yaml

@@ -1,15 +1,6 @@
--
+Version: 2
-    Template: 'qtci-windows-10-x86-4'
+Include: [
-    Compiler: 'MSVC2019'
+    cmake_platforms.yaml,
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -opengl dynamic -nomake examples -nomake tests'
+    qt-creator.yaml
-    Features: ['UseLegacyInstructions']
+    ]
--
+Configurations: []
-    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'
-    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'

coin/platform_configs/qtsensors.yaml

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

coin/platform_configs/qtserialbus.yaml

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

coin/platform_configs/qtserialport.yaml

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

coin/platform_configs/qtshadertools.yaml

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

coin/platform_configs/qtspeech.yaml

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

coin/platform_configs/qtsvg.yaml

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

coin/platform_configs/qtwebchannel.yaml

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

coin/platform_configs/qtwebengine.yaml

@@ -1,65 +1,6 @@
 Version: 2
-Module only: True
+Include: [
-Configurations:
+    cmake_platforms.yaml,
--
+    macos-developer-build-tests.yaml
-    Template: 'qtci-windows-10-x86_64-51'
+]
-    Compiler: 'MSVC2019'
+Configurations: []
-    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'
--
-    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'
--
-    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'
--
-    Template: 'qtci-linux-SLES-15-x86_64'
-    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'
--
-    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 -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'
--
-    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'
--
-    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'
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QEMU'
-    Target arch: 'armv7'
-    Compiler: 'GCC'
-    Features: ['UseLegacyInstructions', 'Insignificant']
-    Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors'
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Target os: 'QEMU'
-    Target arch: 'arm64'
-    Compiler: 'GCC'
-    Features: ['UseLegacyInstructions', 'Insignificant']
-    Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors'
--
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    Compiler: 'GCC'
-    Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

coin/platform_configs/qtwebkit.yaml

@@ -1,8 +1,8 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-windows-10-x86_64-51'
+    Template: 'qtci-windows-10-x86_64-52'
     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/qtwebview.yaml

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

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-20.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['TestOnly', 'LicenseCheck']
+

coin/platform_configs/tqtc-qmlcachegenplus.yaml

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

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

@@ -1,28 +0,0 @@
-Version: 2
-Module only: True
-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'
-    -
-        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'
-    -
-        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 -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'
-    -
-        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-        Compiler: 'GCC'
-        Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

coin/platform_configs/tqtc-qt-rta.yaml

@@ -1,11 +1,3 @@
 Version: 2
-Configurations:
+Include: [cmake_platforms.yaml]
--   Template: 'qtci-windows-8.1-x86_64'
+Configurations: []
-    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'
--
-    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'
-    Features: ['UseLegacyInstructions']

coin/pre-provisioning/qtci-linux-CentOS-8.3-x86_64/README_MANUAL_INSTALLATIONS

@@ -0,0 +1,50 @@
+### CENTOS 8.3 ###
+Hard Disk: 500G
+Network: CI
+Video Card: Total Video Memory: 64MB
+Boot options/Firmware: BIOS
+
+Language: English (United States)
+Time & Date: Etc/Coordinated Universal Time
+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: UTC
+       * run "sudo timedatectl set-timezone Etc/UTC"
+    * Users: Automatic login on
+
+# Add user to sudoers
+Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
+
+Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub
+sudo grub2-mkconfig -o /etc/grub2.cfg
+sudo grub2-mkconfig -o /boot/grub2/grub.cfg
+
+# Add support for virtio driver
+su
+echo "add_drivers+=\"virtio-blk\"" >> /etc/dracut.conf.d/virtio.conf
+dracut -f
+
+# Fetch and run coin-setup
+Download http://coin/coin/binary/linux_amd64/coin-setup
+run './coin-setup'
+
+Reboot
+

coin/pre-provisioning/qtci-linux-RHEL-8.2-x86_64/README_MANUAL_INSTALLATIONS

@@ -1,11 +1,11 @@
-### CENTOS 8.1 ###
+### RHEL 8.2 ###
 Hard Disk: 500G
 Network: CI
 Video Card: Total Video Memory: 64MB
 Boot options/Firmware: BIOS
 
 Language: English (United States)
-Time & Date: Europe/Helsinki
+Time & Date: Etc/Coordinated Universal Time
 Software Selection: Server with GUI
 Network & Host..: Connect
 
@@ -14,7 +14,6 @@ Typing:English (US)
 Privacy: Location Services: OFF
 Connect Your Online Accounts: Skip
 
-
 # Configure Settings
  Notifications:
     * Notification Popups: OFF
@@ -26,20 +25,24 @@ Connect Your Online Accounts: Skip
  Devices:
     * Displays: Resolution 1280 x 800
  Details:
-    * Time Zone: GMT
+    * Time Zone: UTC
+       * run "sudo timedatectl set-timezone Etc/UTC"
     * 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
+sudo grub2-mkconfig -o /etc/grub2.cfg
-grub2-mkconfig -o /boot/grub2/grub.cfg
+sudo grub2-mkconfig -o /boot/grub2/grub.cfg
+
+# Add support for virtio driver
+su
+echo "add_drivers+=\"virtio-blk\"" >> /etc/dracut.conf.d/virtio.conf
+dracut -f
+
+# Fetch and run coin-setup
+Download http://coin/coin/binary/linux_amd64/coin-setup
+run './coin-setup'
 
 Reboot
-

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

@@ -0,0 +1,7 @@
+Add accessibility settings:
+/Volumes/Macintosh\ HD/usr/bin/sqlite3 "/Volumes/Macintosh HD/Library/Application Support/com.apple.TCC/TCC.db" <<"EOF"
+insert into access (service,client,client_type,allowed,prompt_count,indirect_object_identifier,flags,last_modified) values ("kTCCServiceAccessibility","com.froglogic.squish.ide.product",0,1,1,"UNSEEN",0,1612871478)
+
+insert into access (service,client,client_type,allowed,prompt_count,indirect_object_identifier,flags,last_modified) values ("kTCCServiceAccessibility","/Users/qt/bootstrap-agent",1,1,1,"UNSEEN",0,1612871478);
+EOF
+

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

@@ -0,0 +1,8 @@
+Add accessibility settings:
+/Volumes/Macintosh\ HD/usr/bin/sqlite3 "/Volumes/Macintosh HD/Library/Application Support/com.apple.TCC/TCC.db" <<"EOF"{{insert into access (service,client,client_type,auth_value,auth_reason,auth_version,indirect_object_identifier_type,indirect_object_code_identity,last_modified) values }}
+('kTCCServiceAccessibility','com.froglogic.squish.ide.product',0,2,4,1,0,0,1612867994);
+
+{{insert into access (service,client,client_type,auth_value,auth_reason,auth_version,indirect_object_identifier_type,indirect_object_code_identity,last_modified) values }}
+('kTCCServiceAccessibility','/Library/Java/JavaVirtualMachines/jdk1.8.0_102.jdk/Contents/Home/jre/bin/java',1,2,4,1,0,0,1612867994);
+
+EOF

coin/pre-provisioning/qtci-windows-10-x86_64/README_MANUAL_INSTALLATIONS

@@ -1,12 +1,5 @@
 # List about manual pre-installations to Tier1 image:
 
-Virtual Hardware:
-CPU: 4
-Memory: 8 GB
-Hard Disk: 550 GB
-CI_NW
-Video Card - total memory: 32MB
-
 VM Options:
 Boot options/Firmware: BIOS
 
@@ -18,6 +11,14 @@ Windows 10 Enterprise
 Region: Finland
 Keyboard layout: United Kingdom
 
+* Don't use online speech recognition
+* Let Microsoft and apps use your location: no
+* Find my devicer: no
+* Send diagnostic data to Microsoft: Send required diagnostic data
+* Imporve inking & typing: no
+* Get tailored expreriences with diagnostic data: no
+* Let apps use advertising ID: no
+
 * VMware tools (complete) installed
 * Resolution set to 1280x800
 * Coin-setup:
@@ -45,12 +46,7 @@ Keyboard layout: United Kingdom
 * (Restart Windows)
 * Google Chrome installed for RTA
 * Virus & threat protection settings:
-   - Real-time protection -> off
+   * Check that there's no active antivirus providers
-   - Cloud-delivered protection -> off
+* From 'Region Settings'
-   - Automatic sample submission -> off
+   * Set Regional format: English (United States)
-   - Tamper protection -> off
-* Virus & threat protection notifications:
-   - Get informational notifications -> off
-   - Account protection notifications -> off
 * Activate Windows
-

coin/pre-provisioning/qtci-windows-10-x86_64/disable-windefender.ps1

@@ -1,6 +1,6 @@
 ###########################################################################
 ##
-## Copyright (C) 2019 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.
@@ -44,18 +44,6 @@
 Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F"
 Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableRoutinelyTakingAction /T REG_dWORD /D 1 /F"
 
-# 'Windows Defender Cache Maintenance' - "Periodic maintenance task."
-DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance"
-
-# 'Windows Defender Cleanup' - "Periodic cleanup task."
-DisableSchedulerTask "Windows Defender\Windows Defender Cleanup"
-
-# 'Windows Defender Scheduled Scan' - "Periodic scan task."
-DisableSchedulerTask "Windows Defender\Windows Defender Scheduled Scan"
-
-# 'Windows Defender Verification' - "Periodic verification task."
-DisableSchedulerTask "Windows Defender\Windows Defender Verification"
-
 # Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports."
 DisableSchedulerTask "Windows Error Reporting\QueueReporting"
 

coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1

@@ -1,52 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2018 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# Visual Studio $version was installed manually using $installer.
-$version = "2015 update 3"
-$version_number ="14.0.25420.1"
-$installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978.exe"
-
-# default plus following components were selected:
-# * Visual C++
-#   - Common Tools for Visual C++ 2015
-# * Universal Windows App Development Tools
-#   - Tools (1.4.1) and Windows SDK (10.0.14393)
-#   - Windows 10 SDK (10.0.10586)
-#   - Windows 10 SDK (10.0.10240)
-# * Common Tools
-#   -Visual Studio Extensibility Tools Update 3
-
-# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer
-$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe"
-
-echo "Visual Studio = $version version $version_number" >> ~\versions.txt

coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.txt

@@ -0,0 +1,18 @@
+# Visual Studio $version was installed manually using $installer.
+$version = "2015 update 3"
+$version_number ="14.0.25420.1"
+$installer = "en_visual_studio_professional_2015_with_update_3_x86_x64_web_installer_8922978.exe"
+
+# default plus following components were selected:
+# * Programming Languages
+#    * Visual C++
+#       - Common Tools for Visual C++ 2015
+# * Universal Windows App Development Tools
+#   - Tools (1.4.1) and Windows SDK (10.0.14393)
+#   - Windows 10 SDK (10.0.10586)
+#   - Windows 10 SDK (10.0.10240)
+# * Common Tools
+#   -Visual Studio Extensibility Tools Update 3
+
+# NOTE! Windows SDK 10.0.14393 installation failed through visual studio installer so it was installed using $sdk_installer
+$sdk_installer = "http://ci-files01-hki.intra.qt.io/input/windows/sdksetup.exe"

coin/pre-provisioning/qtci-windows-10-x86_64/msvc2019.txt

@@ -2,13 +2,13 @@
 
 $version = "2019"
 # Current version was manually upgraded from the installer
-$version_number = "16.6.2"
+$version_number = "16.8.1"
 $installer = "http://ci-files01-hki.ci.local/input/windows/vs_professional__505064367.1547034421.exe"
 
 MSVC 2019 build tools (default installation, no additional selections).
     * Install after MSVC2019 is installed!
     * Installer: "http://ci-files01-hki.intra.qt.io/input/windows/vs_buildtools__251503345.1575372514.exe"
-    * Version: 16.6.2
+    * Version: 16.8.1
 
 Installed MSVC-2019 Components:
 
@@ -38,10 +38,10 @@ Text Template Transformation
 C# and Visual Basic Roslyn compilers
 C++ 2019 Redistributable Update
 C++ Cmake tools for Windows
-C++/CLI support for v142 build tools /14.26)
+C++/CLI support for v142 build tools /14.28)
 MSBuild
 MSVC v142 - VS 2019 C++ ARM build tools (v14.20)
-MSVC v142 - VS 2019 C++ ARM build tools (v14.26)
+MSVC v142 - VS 2019 C++ ARM build tools (v14.28)
 MSVC v142 - VS 2019 C++ ARM64 build tools (v14.20)
 MSVC v142 - VS 2019 C++ ARM64 build tools (v14.26)
 MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20)
@@ -57,7 +57,7 @@ Razor Language Services
 Graphics debugger and GPU profiler for DirectX
 Image and 3D model editors
 C++ ATL for latest v142 build tools (x86 & x64)
-TypeScript 3.8 SDK
+TypeScript 4.0 SDK
 Windows 10 SDK (10.0.16299.0)
 Windows 10 SDK (10.0.17134.0)
 Windows 10 SDK (10.0.17763.0)

coin/pre-provisioning/qtci-windows-10-x86_64/virtio.txt

@@ -4,18 +4,22 @@ Our vanilla images are pre-installed in VMware where we have networking availabl
 use the VMware installed vmxnet3 NIC to fetch VirtIO drivers, install them, and only then switch
 to using the VirtIO NIC in KVM.
 
-* Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/stable-virtio/virtio-win-0.1.171.iso
+NOTE! Install these Virtio drivers in Opennebula when using Windows 10 20H2
-* Mount virtio-win-0.1.171.iso by double clicking it.
+* Download https://fedorapeople.org/groups/virt/virtio-win/direct-downloads/archive-virtio/virtio-win-0.1.185-2/virtio-win-0.1.185.iso
+    cache: http://ci-files01-hki.ci.local/input/windows/virtio/virtio-win-0.1.185.iso
+* Mount virtio-win-0.1.185.iso by double clicking it.
 * Right click 'E:\NetKVM\w10\amd64\netkvm.inf' and select Install
 * Right click 'E:\Balloon\w10\amd64\balloon.inf' and select Install
-
 * Right click 'E:\vioscsi\w10\amd64\vioscsi.inf' and select Install
+* Right click 'E:\vioserial\w10\amd64\vioser.inf' and select Install
+* Navigate to E:\guest-agent directory and double click qemu-ga-x86_64
 
 Because vioscsi does not install the entries in windows registry before we actually
 have a VirtIO device installed, and we can't boot with a VirtIO device before
 the driver is installed, we have to blindly install the registry entries:
 
 * Download https://bugreports.qt.io/secure/attachment/95685/95685_vioscsi.reg
+    cache: http://ci-files01-hki.intra.qt.io/input/windows/virtio/vioscsi.reg
 
 However, we've seen that the Owner in the registry can be wrong. This entry
 sets it to oem11.inf, but we've seen it be oem10.inf in one case and it has

coin/provisioning/common/linux/android_linux.sh

@@ -53,13 +53,13 @@ basePath="http://ci-files01-hki.intra.qt.io/input/android"
 
 toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
-ndkVersion="r21d"
+ndkVersion="r22b"
 ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
-sdkBuildToolsVersion="28.0.3"
+sdkBuildToolsVersion="30.0.3"
-sdkApiLevel="android-28"
+sdkApiLevel="android-30"
 
 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
-ndkSha1="bcf4023eb8cb6976a4c7cff0a8a8f145f162bf4d"
+ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc"
 
 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"

coin/provisioning/common/linux/cmake_linux.sh

@@ -42,13 +42,13 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-majorminorversion="3.18"
+majorminorversion="3.21"
-version="3.18.3"
+version="3.21.1"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz"
+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"
+AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz"
-SHA1="6e5bb13e07616e8fa28ec22e8e8dd2396510f10c"
+SHA1="591e3b0729ae07c37c1fa3c6adde7cc21387059d"
 targetFolder="/opt/cmake-$version"
-appPrefix="cmake-$version-Linux-x86_64"
+appPrefix="cmake-$version-linux-x86_64"
 
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
 

coin/provisioning/common/linux/gcc.sh

@@ -1,9 +1,8 @@
-
 #!/usr/bin/env bash
 
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -58,7 +57,7 @@ function InstallGCC() {
     suffixVersion=$(echo "$version" | cut -d "." -f1,2)
     sourceFile="gcc-$version.tar.xz"
     cachedUrl="http://ci-files01-hki.intra.qt.io/input/gcc/$sourceFile"
-    officialUrl="ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/gcc.gnu.org/pub/gcc/releases/gcc-$version/$sourceFile"
+    officialUrl="https://gcc.gnu.org/pub/gcc/releases/gcc-$version/gcc-$version.tar.xz"
 
     targetFile="$tmpFolder/$sourceFile"
     buildFolder="$HOME/gcc_build"

coin/provisioning/common/linux/integrity.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,26 +33,28 @@
 ##
 #############################################################################
 
-# This script installs INTEGRITY
+# This script installs needed toolchains for INTEGRITY
 
 # shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="11.4.4"
+urlToolchainEs7="http://ci-files01-hki.ci.local/input/integrity/integrity_toolchain_es7_patched.zip"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz"
+urlToolchainAddons="http://ci-files01-hki.ci.local/input/integrity/integrity_toolchain_addons.zip"
-AltUrl="$PrimaryUrl" # we lack an external source for this
+SHA1_toolchainEs7="e890fe332a81f8345fed3dff89b30019d9989765"
-SHA1="4afa3c15e13c91734951b73f6b21388294c5d794"
+SHA1_toolchainAddons="1eb838edca4edaa3d9076b5ce4aea6409ffaa022"
-targetFolder="/opt/ghs"
+targetFolder="$HOME"
 appPrefix=""
 
-InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
+echo "Install Integrity toolchain es7"
+InstallFromCompressedFileFromURL "$urlToolchainEs7" "$urlToolchainEs7" "$SHA1_toolchainEs7" "$targetFolder" "$appPrefix"
 
-SetEnvVar "INTEGRITY_BSP" "platform-cortex-a9"
+echo "Install Integrity toochain addons"
-SetEnvVar "INTEGRITY_PATH" "$targetFolder/comp_201654"
+DownloadURL "$urlToolchainAddons" "$urlToolchainAddons" "$SHA1_toolchainAddons" "/tmp/integrity_toolchain_addons.zip"
-SetEnvVar "INTEGRITY_DIR" "$targetFolder/int1144"
+unzip "/tmp/integrity_toolchain_addons.zip" -d "/tmp"
-SetEnvVar "INTEGRITY_GL_INC_DIR" "\$INTEGRITY_DIR/INTEGRITY-include/Vivante/sdk/inc"
+mv /tmp/toolchain/* $targetFolder/toolchain
-SetEnvVar "INTEGRITY_GL_LIB_DIR" "\$INTEGRITY_DIR/libs/Vivante"
+mv $targetFolder/toolchain $targetFolder/integrity_toolchain
-
+sudo rm -fr /tmp/toolchain
-echo "INTEGRITY = $version" >> ~/versions.txt

coin/provisioning/common/linux/openssl_for_android_linux.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,14 +33,18 @@
 ##
 #############################################################################
 
-# This script install OpenSSL from sources.
+# This script install prebuilt OpenSSL which was built against Android NDK 21.
-# Requires GCC and Perl to be in PATH.
+# OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories
+
 set -ex
 # shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
+version="1.1.1k"
+: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 21
+# Source built requires GCC and Perl to be in PATH.
 exports_file="/tmp/export.sh"
 # source previously made environmental variables.
 if uname -a |grep -q "Ubuntu"; then
@@ -53,11 +57,10 @@ else
     rm -rf "$exports_file"
 fi
 
-version="1.1.1g"
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
-sha="b213a293f2127ec3e323fb3cfc0c9807664fd997"
+sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
 opensslHome="${HOME}/openssl/android/openssl-${version}"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 mkdir -p "${HOME}/openssl/android/"
@@ -67,7 +70,14 @@ TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin
 cd "$opensslHome"
 PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
 PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
+'
+prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21.tar.gz"
+targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
+sha="8c4db1eb8460d749c998a0e033b3939123cbc5ac"
+DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
+tar -xzf "$targetFile" -C "${HOME}"
 
+opensslHome="${HOME}/openssl/android/openssl-${version}"
 SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
 
 echo "OpenSSL for Android = $version" >> ~/versions.txt

coin/provisioning/common/linux/qnx_710.sh

@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -35,22 +35,55 @@
 
 # This script installs QNX 7.
 
+set -ex
+
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+DownloadAndExtract () {
+    url=$1
+    sha=$2
+    file=$3
+    folder=$4
+
+    DownloadURL "$url" "$url" "$sha" "$file"
+    sudo tar -C $folder -Jxf $file
+
+    rm -rf $file
+}
+
 targetFolder="/opt/"
-sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
+folderName="qnx710"
-folderName="qnx700"
+targetPath="$targetFolder$folderName"
 
-sudo mkdir -p "$targetFolder"
+if [ ! -d "$targetFolder" ]; then
+    mkdir -p $targetFolder
+fi
 
-echo "Extracting QNX 7"
+# QNX SDP
-sudo tar -C "$targetFolder" -Jxf $sourceFile
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx710-20201027-linux.tar.xz"
+targetFile="qnx710.tar.xz"
+sha1="fa9eb0f4247504a546cb014784646847eb6c8114"
+DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
 
-sudo chown -R qt:wheel "$targetFolder"/"$folderName"
+# Toolchain files
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx-toolchains.tar.xz"
+targetFile="qnx-toolchains.tar.xz"
+sha1="d8a97605d80a2296f98caba3854557ca0dd5d7d3"
+DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetPath"
 
-# Verify that we have last file in zip
+sudo chown -R qt:users "$targetPath"
-if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
+
-    exit 1
+# Verify that we have last files in tars
+if [ ! -f $targetPath/qnxsdp-env.sh ] || [ ! -f $targetPath/qnx-toolchain-x8664.cmake ]
+then
+    echo "QNX toolchain installation failed!"
+    exit -1
 fi
 
 # Set env variables
-echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc
+SetEnvVar "QNX_710" "$targetPath"
-echo "QNX SDP = 7.0.0" >> ~/versions.txt
+
+echo "QNX SDP = 7.1.0" >> ~/versions.txt

coin/provisioning/common/linux/sccache.sh

@@ -38,6 +38,6 @@ set -ex
 source "${BASH_SOURCE%/*}/../unix/sccache.sh"
 
 targetArch=x86_64-unknown-linux-musl
-targetVersion=0.2.13-alpha-0
+targetVersion=0.2.14
-sha1=0cb28f7408e5246bc71132f27d86301c30e16c74
+sha1=281680c0fc2c09173e94d12ba45d9f1b8e62e5b3
 installSccache "$targetArch" "$targetVersion" "$sha1"

coin/provisioning/common/macos/cmake.sh

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

coin/provisioning/common/macos/disable-notifications_and_warnings.sh

@@ -4,4 +4,4 @@ echo "Unload notificationcenterui.plist"
 launchctl unload -w /System/Library/LaunchAgents/com.apple.notificationcenterui.plist
 
 echo "Remove 32-bit warnings"
-rm ~/Library/Preferences/com.apple.coreservices.uiagent.plist
+rm -f ~/Library/Preferences/com.apple.coreservices.uiagent.plist

coin/provisioning/common/macos/disable_net_lso.sh

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

coin/provisioning/common/macos/disable_spotlight.sh

@@ -35,4 +35,8 @@
 
 # Disable spotlight and and stop indexing
 sudo mdutil -a -i off
-sudo defaults write /.Spotlight-V100/VolumeConfiguration Exclusions -array "/Volumes"
+sudo mdutil -a -i off /
+# Disable spotlight indexing /Volumes
+sudo mdutil -i off /Volumes
+# Erase spotlight index
+sudo mdutil -E /

coin/provisioning/common/macos/install_xcode.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,6 +33,9 @@
 ##
 #############################################################################
 
+# shellcheck source=./../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+
 # This script installs Xcode
 # Prerequisites: Have Xcode prefetched to local cache as xz compressed.
 # This can be achieved by fetching Xcode_8.xip from Apple Store.
@@ -51,6 +54,13 @@ function InstallXCode() {
     echo "Uncompressing and installing '$sourceFile'"
     if [[ $sourceFile =~ tar ]]; then
         cd /Applications/ && sudo tar -zxf "$sourceFile"
+    elif [[ $sourceFile =~ "xip" ]]; then
+        if [[ $sourceFile =~ "http" ]]; then
+            Download $sourceFile /Applications/Xcode_$version.xip
+            cd /Applications/ && xip -x "Xcode_$version.xip"
+        else
+            cd /Applications/ && xip -x "$sourceFile"
+        fi
     else
         xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)
     fi

coin/provisioning/common/macos/java.sh

@@ -45,10 +45,11 @@ url=ci-files01-hki.intra.qt.io:/hdd/www/input/mac
 # url_alt=http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-macosx-x64.dmg
 
 echo "Mounting $targetFile"
-sudo mount "$url" /Volumes
+sudo mkdir -p /Volumes/files
+sudo mount -o locallocks "$url" /Volumes/files
 
-sudo cp "/Volumes/$targetFile" /tmp
+sudo cp "/Volumes/files/$targetFile" /tmp
-sudo umount /Volumes
+sudo umount /Volumes/files
 sudo hdiutil attach "/tmp/$targetFile"
 
 echo Installing JDK

coin/provisioning/common/macos/macos-version.sh

@@ -44,8 +44,6 @@ sw_vers >> ~/versions.txt
 echo "***** All installed packages *****" >> ~/versions.txt
 echo "***** HomeBrew *****" >> ~/versions.txt
 brew list --versions >> ~/versions.txt
-echo "***** HomeBrew Casks*****" >> ~/versions.txt
-brew cask list --versions >> ~/versions.txt
 echo "***** Apple's installer *****" >> ~/versions.txt
 pkgutil --pkgs >> ~/versions.txt
 echo "*********************************************" >> ~/versions.txt

coin/provisioning/common/macos/makeuniversal.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2021 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# Copies or lipos files from the given DESTDIR dirs to the respective install dir
+
+set -e
+
+for dir in "$@"; do
+    echo "Processing files in $dir ..."
+    pushd $dir >/dev/null
+    find . -type f | while read f; do
+        dst="${f:1}"
+        dstdir=$(dirname $dst)
+        mkdir -p $dstdir
+        if [[ ! -f $dst ]]; then
+            echo "Copying $dir/$f to $dst"
+            cp -c $f $dst
+        elif lipo -info $f >/dev/null 2>&1; then
+            echo "Lipoing $dir/$f into $dst"
+            lipo -create -output $dst $dst $f
+        elif ! diff $f $dst; then
+            echo "Error: File $f in $dir doesn't match destination $dst"
+            exit 1
+        fi
+    done
+    popd >/dev/null
+done

coin/provisioning/common/macos/ninja.sh

@@ -38,10 +38,10 @@
 # shellcheck source=./../unix/InstallFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 
-version="1.10.1"
+version="1.10.2"
 internalUrl="http://ci-files01-hki.ci.local/input/mac/ninja-mac_v${version}.zip"
 externalUrl="https://github.com/ninja-build/ninja/releases/download/v${version}/ninja-mac.zip"
-SHA1="de7c594e3bf76f7c86b9d6874d49c8824b2a76e1"
+SHA1="95d0ca5e7c67ab7181c87e6a6ec59d11b1ff2d30"
 DestDir="/usr/local/bin/"
 
 InstallFromCompressedFileFromURL "$internalUrl" "$externalUrl" "$SHA1" "$DestDir" ""

coin/provisioning/common/macos/nodejs.sh

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

coin/provisioning/common/macos/pip.sh

@@ -1,11 +1,18 @@
 #!/usr/bin/env bash
 
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+
 function InstallPip {
 
     python=$1
 
     # Will install pip utility for python
-    curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+    if [[ $python == "python2.7" ]]; then
+        DownloadURL "http://ci-files01-hki.intra.qt.io/input/mac/python27/get-pip.py" "https://bootstrap.pypa.io/2.7/get-pip.py" "c4c5f74586cffe49804f167d95d1710b9750ddf0"
+    else
+        DownloadURL "http://ci-files01-hki.intra.qt.io/input/mac/get-pip.py" "https://bootstrap.pypa.io/get-pip.py" "209ddf0bb8d1cf06a1f17dd9f21970c76b3d2be2"
+    fi
     sudo "$python" get-pip.py
     rm get-pip.py
 }

coin/provisioning/common/macos/sccache.sh

@@ -38,6 +38,6 @@ set -ex
 source "${BASH_SOURCE%/*}/../unix/sccache.sh"
 
 targetArch=x86_64-apple-darwin
-targetVersion=0.2.13-alpha-0
+targetVersion=0.2.14
-sha1=8fe82ddc05a25debc314ea1a8cda665cddb90f72
+sha1=764bc1664c0ff616d9980a6d127175d0a2041781
 installSccache "$targetArch" "$targetVersion" "$sha1"

coin/provisioning/common/macos/screenresolution.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.
@@ -33,25 +33,42 @@
 ##
 #############################################################################
 
-# This script installs QNX 7.
+# Install screenresolution and set correct resolution at boot
 
-targetFolder="/opt/"
+brew install screenresolution
-sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
-folderName="qnx700"
 
-sudo mkdir -p "$targetFolder"
+sudo tee -a /usr/local/bin/set_resolution.sh <<"EOF"
+#!/bin/bash
+sleep 20
+/usr/local/bin/screenresolution set 1280x800x32@0
+EOF
 
-echo "Extracting QNX 7"
-sudo tar -C "$targetFolder" -Jxf $sourceFile
 
-sudo chown -R qt:wheel "$targetFolder"/"$folderName"
+sudo chmod a+x /usr/local/bin/set_resolution.sh
 
-# Verify that we have last file in zip
-if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
-    exit 1
-fi
 
-# Set env variables
+sudo tee -a ~/Library/LaunchAgents/screenresolution.plist <<"EOF"
-echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc
+<?xml version="1.0" encoding="UTF-8"?>
-echo "QNX SDP = 7.0.0" >> ~/versions.txt
+<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>Label</key>
+        <string>org.qt.io.screenresolution</string>
+        <key>ProgramArguments</key>
+        <array>
+            <string>/usr/local/bin/set_resolution.sh</string>
+        </array>
+        <key>RunAtLoad</key>
+        <true/>
+        <key>KeepAlive</key>
+        <false/>
+        <key>LaunchOnlyOnce</key>
+        <true/>
+        <key>StandardErrorPath</key>
+        <string>/tmp/screenresolution.err</string>
+        <key>StandardOutPath</key>
+        <string>/tmp/screenresolution.out</string>
+    </dict>
+</plist>
+EOF
 

coin/provisioning/common/macos/set-locale.sh

@@ -39,3 +39,10 @@ set -ex
 
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 SetEnvVar "LANG" "en_US.UTF-8"
+
+# The following settings match the "United States" region default
+defaults write -globalDomain AppleLocale "en_US"
+defaults write -globalDomain AppleLanguages "(en)"
+defaults write -globalDomain AppleMeasurementUnits "Inches"
+defaults write -globalDomain AppleTemperatureUnit "Fahrenheit"
+defaults write -globalDomain AppleMetricUnits -bool false

coin/provisioning/common/macos/telegraf-coin.conf

@@ -54,4 +54,4 @@
 # Monitor I/O latency
 [[inputs.exec]]
   data_format = "influx"
-  commands = [ "/usr/bin/telegraf-ioping.sh /" ]
+  commands = [ "/usr/local/bin/telegraf-ioping.sh /" ]

coin/provisioning/common/macos/telegraf-ioping.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+# Measure I/O latency once, return data in InfluxDB format
+#
+# Run one ioping command for read, and one for write.
+# Each one sends 3 requests and reports the minimum time, in nanoseconds.
+# (Because of limitations of ioping, we can't just send one request and get
+#  the number back in the batch format. Additionally, the number seems to be
+#  fluctuating quite a bit so taking the smallest number out of 3 requests is
+#  stabilising it a bit.)
+
+
+set -e
+
+[ x"$1" = x ] && echo "$0 takes a path as a first argument" && exit 1
+
+# Try to run in high priority to avoid slow-downs because of
+# factors other than I/O.
+renice  -n -10 -p $$  >/dev/null 2>&1 ||  true
+
+
+rlatency="$(/usr/local/bin/ioping -B -k -c 3 -i 0.1     "$1" | cut -d " " -f 5)"
+wlatency="$(/usr/local/bin/ioping -B -k -c 3 -i 0.1 -W  "$1" | cut -d " " -f 5)"
+
+printf "ioping,path=$1 read_latency_ns=%u,write_latency_ns=%u\n"  \
+       $rlatency  $wlatency

coin/provisioning/common/macos/telegraf_install.sh

@@ -0,0 +1,99 @@
+#!/bin/sh
+
+#############################################################################
+##
+## Copyright (C) 2019 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+
+# This script installs telegraf and ioping and our script telegraf-ioping.sh
+# to the /usr/bin directory.
+#
+# The reasons we don't install to /usr/local/bin are:
+# 1. On SLES and RHEL, the PATH of sudo (secure_path setting in /etc/sudoers)
+#    does not include /usr/local/bin.
+# 2. On macOS /usr/local/bin does not even exist early in provisioning.
+
+
+######################## BOILERPLATE ###########################
+set -e
+
+
+PROVISIONING_DIR="$(dirname "$0")/../../"
+. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
+
+. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh
+
+is_script_executed telegraf_install.sh  \
+    || fatal "Script telegraf_install.sh should be executed, not sourced"
+
+################################################################
+
+
+[ "$PROVISIONING_OS" = linux ]  \
+    && ioping_sha256=259abf04bcb84f4126ff97c04b6651e1cf5ea6d8a9ff364c769a26c95b6eeb44  \
+    || ioping_sha256=55de6a2f1a5343e0ce8df31d82d47a9e79c7e612edbc6dfb39b5fc6fb358b2e3
+DownloadURL "http://ci-files01-hki.intra.qt.io/input/ioping/ioping.${PROVISIONING_OS}-${PROVISIONING_ARCH}"  \
+    ''  "$ioping_sha256"  ioping
+/usr/bin/sudo mkdir -p /usr/local/bin/
+$CMD_INSTALL -m 755 ./ioping /usr/local/bin/
+rm -f ioping
+
+# 2. Install custom ioping monitoring script
+$CMD_INSTALL -m 755  "$PROVISIONING_DIR"/common/macos/telegraf-ioping.sh  /usr/local/bin/
+
+# 3. Download and install telegraf
+
+[ x"$PROVISIONING_OS"   = xmacos ] && os=darwin || os=linux
+[ x"$PROVISIONING_ARCH" = xx86   ] && arch=i386 || arch=amd64
+package_filename=telegraf-1.12.6_${os}_${arch}.tar.gz
+package_sha256_list="$PROVISIONING_DIR"/common/shared/telegraf/telegraf_packages.sha256.txt
+package_sha256=$(sed -n "s/.*$package_filename *//p" "$package_sha256_list")
+
+DownloadURL  \
+    http://ci-files01-hki.intra.qt.io/input/telegraf/"$package_filename"  \
+    https://dl.influxdata.com/telegraf/releases/"$package_filename"  \
+    "$package_sha256"  \
+    telegraf.tar.gz
+
+tar -xzf ./telegraf.tar.gz -C /tmp
+telegraf_binary=$(find /tmp/telegraf* -name telegraf -type f | grep /bin/ | head -1)
+$CMD_INSTALL -m 755  "$telegraf_binary"  /usr/local/bin/
+rm -rf /tmp/telegraf*
+
+# 4. Edit config file with passwords
+"$PROVISIONING_DIR"/common/unix/telegraf_password.sh
+
+# 5. Start telegraf in background (-b) and with retaining the environment (-E)
+#    in order to report as hostname = $COIN_UNIQUE_JOB_ID.
+/usr/bin/sudo -b -E telegraf --config /etc/telegraf-coin.conf >/dev/null 2>&1
+
+echo DONE: "Installed and started telegraf: $package_filename"

coin/provisioning/common/unix/SetEnvVar.sh

@@ -47,5 +47,6 @@ function SetEnvVar {
         echo "export $name=$path" >> ~/.profile
     else
         echo "export $name=$path" >> ~/.bashrc
+        echo "export $name=$path" >> ~/.zshrc
     fi
 }

coin/provisioning/common/unix/emsdk.sh

@@ -39,34 +39,36 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
 
-version="1.39.8"
+version="2.0.14"
+versionTag="fc5562126762ab26c4757147a3b4c24e85a7289e"
+versionNode="v14.15.5"
 urlCache="http://ci-files01-hki.intra.qt.io/input/emsdk"
 targetFolder="/opt/emsdk"
 
 # cross-platform emscripten SDK
 urlEmscriptenExternal="https://github.com/emscripten-core/emscripten/archive/$version.tar.gz"
 urlEmscriptenCache="$urlCache/emscripten.$version.tar.gz"
-sha1Emscripten="a593ea3b4ab7e3d57e1232b19a903ccf8f137d2f"
+sha1Emscripten="5fbdca8ed238b90ab8c3656831fcc5eb1ce08c58"
 
 # platform-specific toolchain and node binaries. urls obtained from "emsdk install"
 if uname -a |grep -q Darwin; then
-    urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/mac/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2"
+    urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/mac/$versionTag/wasm-binaries.tbz2"
     urlWasmBinariesCache="$urlCache/macos/wasm-binaries.$version.tbz2"
-    sha1WasmBinaries="aedb30fb07d565c35305af0920ab072ae743895d"
+    sha1WasmBinaries="86dc16b299543cf593abc6f0137f8d0d723baddb"
 
-    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-darwin-x64.tar.gz"
+    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-$versionNode-darwin-x64.tar.gz"
-    urlNodeBinariesCache="$urlCache/mac/node-v12.9.1-darwin-x64.tar.gz"
+    urlNodeBinariesCache="$urlCache/mac/node-$versionNode-darwin-x64.tar.gz"
-    sha1NodeBinaries="f5976321ded091e70358e406b223f6fd64e35a43"
+    sha1NodeBinaries="6db16d024ea9e5f2ebdd0c1ef07ea67c2004ce93"
-    pathNodeExecutable='node-v12.9.1-darwin-x64/bin/node'
+    pathNodeExecutable="node-$versionNode-darwin-x64/bin/node"
 else
-    urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2"
+    urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/$versionTag/wasm-binaries.tbz2"
     urlWasmBinariesCache="$urlCache/linux/wasm-binaries.$version.tbz2"
-    sha1WasmBinaries="eb7fc94aa79a6e215272e2586173515aa37c3141"
+    sha1WasmBinaries="9724185c06c461edec3495e37e034066479b9ccf"
 
-    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-linux-x64.tar.xz"
+    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-$versionNode-linux-x64.tar.xz"
-    urlNodeBinariesCache="$urlCache/linux/node-v12.9.1-linux-x64.tar.xz"
+    urlNodeBinariesCache="$urlCache/linux/node-$versionNode-linux-x64.tar.xz"
-    sha1NodeBinaries="cde96023b468d593c50de27470dd714c8cfda9aa"
+    sha1NodeBinaries="ca7ce363ceaf71b65e85243a71252c20cfd97982"
-    pathNodeExecutable='node-v12.9.1-linux-x64/bin/node'
+    pathNodeExecutable="node-$versionNode-linux-x64/bin/node"
 fi
 
 sudo mkdir "$targetFolder"
@@ -79,15 +81,17 @@ sudo chmod -R a+rwx "$targetFolder"
 
 echo "Writing $targetFolder/.emscripten"
 cat <<EOM >"$targetFolder/.emscripten"
-EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version'
+emsdk_path = '$targetFolder'
-LLVM_ROOT='$targetFolder/install/bin'
+EMSCRIPTEN_ROOT = emsdk_path + '/emscripten-$version'
-BINARYEN_ROOT='$targetFolder/install'
+LLVM_ROOT = emsdk_path + '/install/bin'
-NODE_JS='$targetFolder/$pathNodeExecutable'
+BINARYEN_ROOT = emsdk_path + '/install'
+NODE_JS = emsdk_path + '/$pathNodeExecutable'
 TEMP_DIR = '/tmp'
 EOM
 
 SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-$version/\""
 SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version"
-SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"
+SetEnvVar "EMSDK" "$targetFolder"
+SetEnvVar "EMSDK_NODE" "$targetFolder/$pathNodeExecutable"
 
 echo "Emsdk = $version" >> ~/versions.txt

coin/provisioning/common/unix/install-conan.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+# This script will install Conan
+# Note! Python3 is required for Conan installation
+
+os="$1"
+
+# Install Conan to Python user install directory (typically ~./local/)
+pip3 install conan --user
+
+SetEnvVar "CONAN_REVISIONS_ENABLED" "1"
+
+if [ "$os" == "linux" ]; then
+    SetEnvVar "PATH" "/home/qt/.local/bin:\$PATH"
+elif [ "$os" == "macos" ]; then
+    SetEnvVar "PATH" "/Users/qt/Library/Python/3.7/bin:\$PATH"
+fi

coin/provisioning/common/unix/install-openssl.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -42,16 +42,16 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-version="1.1.1g"
+version="1.1.1k"
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
 cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
 targetFile="/tmp/openssl-$version.tar.gz"
-sha="b213a293f2127ec3e323fb3cfc0c9807664fd997"
+sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
 opensslHome="${HOME}/openssl-${version}"
 opensslSource="${opensslHome}-src"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
-tar -xzf "$targetFile" -C "$HOME"
+mkdir -p "$opensslSource"
-mv "$opensslHome" "$opensslSource"
+tar -xzf "$targetFile" --strip 1 -C "$opensslSource"
 cd "$opensslSource"
 pwd
 
@@ -65,18 +65,55 @@ if [[ "$os" == "linux" ]]; then
         echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bashrc
     fi
 
-elif [ "$os" == "macos" ]; then
+elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
     # Below target location has been hard coded into Coin.
     # QTQAINFRA-1195
-    openssl_install_dir=/usr/local/openssl-$version
+    echo "prefix=$prefix"
-    opensslTargetLocation="/usr/local/opt/openssl"
+    if [[ -z "$prefix" ]]; then
-    sudo ./Configure --prefix=$openssl_install_dir shared no-ssl3-method enable-ec_nistp_64_gcc_128 darwin64-x86_64-cc "-Wa,--noexecstack"
+        prefix="/usr/local"
-    echo "Running 'make' for OpenSSL"
+    fi
-    # shellcheck disable=SC2024
+    openssl_install_dir="$prefix/openssl-$version"
-    sudo make --silent > /tmp/openssl_make.log 2>&1
+    opensslTargetLocation="$prefix/opt/openssl"
-    echo "Running 'make install' for OpenSSL"
+
-    # shellcheck disable=SC2024
+    commonFlags="no-tests shared no-ssl3-method enable-ec_nistp_64_gcc_128 -Wa,--noexecstack"
-    sudo make --silent install > /tmp/openssl_make_install.log 2>&1
+
+    export MACOSX_DEPLOYMENT_TARGET=10.14
+
+    opensslBuild="${opensslHome}-build"
+    opensslDestdir="${opensslHome}-destdir"
+    mkdir -p $opensslBuild
+
+    if [ "$os" == "macos-universal" ]; then
+        archs="x86_64 arm64"
+    else
+        archs="$(uname -m)"
+    fi
+
+    for arch in $archs; do
+        cd $opensslBuild
+        echo "Configuring OpenSSL for $arch"
+        mkdir -p $arch && cd $arch
+        $opensslSource/Configure --prefix=$openssl_install_dir $commonFlags darwin64-$arch-cc
+
+        echo "Building OpenSSL for $arch in $PWD"
+        make >> /tmp/openssl_make.log 2>&1
+
+        echo "Installing OpenSSL for $arch"
+        if [ "$os" == "macos-universal" ]; then
+            destdir="$opensslDestdir/$arch"
+        else
+            destdir=""
+        fi
+        # shellcheck disable=SC2024
+        sudo make install_sw install_ssldirs DESTDIR=$destdir >> /tmp/openssl_make_install.log 2>&1
+    done
+
+    if [ "$os" == "macos-universal" ]; then
+        echo "Making universal OpenSSL package"
+        # shellcheck disable=SC2024
+        sudo rm -Rf "$openssl_install_dir"
+        sudo ${BASH_SOURCE%/*}/../macos/makeuniversal.sh "$opensslDestdir/x86_64" $opensslDestdir/arm64
+    fi
 
     path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/')
     sudo mkdir -p "$path"

coin/provisioning/common/unix/libclang-v100-dyn.sh

@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
+# The Clang library (C-bindings), version 3.9 or higher is required for building.
+
+# This same script is used to provision libclang to Linux and macOS.
+# In case of Linux, we expect to get the values as args
+set -e
+
+# shellcheck source=./check_and_set_proxy.sh
+source "${BASH_SOURCE%/*}/check_and_set_proxy.sh"
+# shellcheck source=./SetEnvVar.sh
+source "${BASH_SOURCE%/*}/SetEnvVar.sh"
+# shellcheck source=./DownloadURL.sh
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+
+libclang_version=10.0
+
+if uname -a |grep -q Darwin; then
+    version=$libclang_version
+    url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-mac.7z"
+    sha1="0fe1fa50b1b469d2c05acc3a3468bc93a66f1e5a"
+    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/dynamic/libclang-release_${version//\./}-based-mac.7z"
+elif test -f /etc/redhat-release || /etc/centos-release; then
+    version=$libclang_version
+    url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
+    sha1="1d2e265502fc0832a854f989d757105833fbd179"
+    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/dynamic/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
+else
+    version=$libclang_version
+    url="https://download.qt.io/development_releases/prebuilt/libclang/dynamic/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
+    sha1="c1580acb3a82e193acf86f18afb52427c5e67de8"
+    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
+fi
+
+zip="/tmp/libclang.7z"
+destination="/usr/local/libclang-dynlibs-$version"
+
+DownloadURL $url_cached $url $sha1 $zip
+if command -v 7zr &> /dev/null; then
+    sudo 7zr x $zip -o/usr/local/
+else
+    sudo 7z x $zip -o/usr/local/
+fi
+sudo mv /usr/local/libclang "$destination"
+rm -rf $zip
+
+
+echo "export LLVM_DYNAMIC_LIBS_100=$destination" >> ~/.bash_profile
+echo "libClang for QtForPython= $version" >> ~/versions.txt

coin/provisioning/common/unix/libclang.sh

@@ -47,23 +47,23 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
 
-libclang_version=10.0
+libclang_version=12.0
 
 if uname -a |grep -q Darwin; then
     version=$libclang_version
     url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-mac.7z"
     url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-mac.7z"
-    sha1="6e019c428511e74c5d46d0ddca79d8e804b67f8a"
+    sha1="bb9223450c1c36ee37d8c91e876dba82db117a7a"
-elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat"; then
+elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat" | grep -v "8" ; 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="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-CentOS8.3-gcc9.2-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"
+    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-CentOS8.3-gcc9.2-x86_64.7z"
-    sha1="16fcb99c139ee613ccc46683fa842a5187457f35"
+    sha1="d02e4dd30fe3f810c3a0cdcbed5870dec56ed91b"
 else
     version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
-    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
+    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
-    sha1="08f352d411e4b47c2a259c3b120d7cb2db01e41d"
+    sha1="81b3e640befa23b5cdebd59e206dc79e4de20ba3"
 fi
 
 zip="/tmp/libclang.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/unix/squishInstall.sh

@@ -41,19 +41,20 @@ set -ex
 # This script will fetch and extract pre-buildt squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)
 
-version="6.6.1"
+version="6.7-20210615-1349"
-qtBranch="515x"
+qtBranch="61x"
 installFolder="/opt"
 squishFolder="$installFolder/squish"
 preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable"
-licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/.squish-3-license"
+licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/515x/.squish-3-license"
 licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a"
 if uname -a |grep -q Darwin; then
-     compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz"
+    version="6.7-20210301-1401"
-     sha1="9fff9a7cb037214d21f47f2cc53747885fd1f2ae"
+    compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz"
+    sha1="15f7f8e9944fdc36b9b6e37576d6ca96713a8ac5"
 else
      compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz"
-     sha1="3a50052caafa3ca583b7edf754227999d7185ffa"
+     sha1="e32e5db1713e3050c3cdce696d7509c468afc7d3"
 fi
 
 mountFolder="/tmp/squish"
@@ -77,7 +78,11 @@ fi
 targetFileMount="$mountFolder"/"$compressedFolder"
 
 echo "Mounting $preBuildCacheUrl to $mountFolder"
-sudo mount "$preBuildCacheUrl" "$mountFolder"
+if uname -a |grep -q Darwin; then
+   sudo mount -o locallocks "$preBuildCacheUrl" "$mountFolder"
+else
+   sudo mount "$preBuildCacheUrl" "$mountFolder"
+fi
 echo "Create $installFolder if needed"
 if [ !  -d "$installFolder" ]; then
     sudo mkdir "$installFolder"
@@ -96,7 +101,8 @@ sudo mv "$installFolder/rta_squish_$version" "$squishFolder"
 if uname -a |grep -q "Ubuntu"; then
     if [ ! -e "/usr/lib/tcl8.6" ]; then
         sudo mkdir /usr/lib/tcl8.6
-        sudo cp "$squishFolder/squish_for_qt/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
+        #this needs to be copied only to squish_for_qt6
+        sudo cp "$squishFolder/squish_for_qt6/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
     fi
 fi
 
@@ -108,18 +114,27 @@ sudo chown qt:$usersGroup "$HOME/.squish-3-license"
 
 echo "Set commands for environment variables in .bashrc"
 if uname -a |grep -q "Ubuntu"; then
-    echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.profile
+    echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.profile
-    echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.profile
+    echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.profile
 else
-    echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc
+    echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.bashrc
-    echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc
+    echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.bashrc
 fi
 
-echo "Verifying Squish"
+echo "Verifying Squish, available installations:"
-if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
+ls -la $squishFolder
-    echo "Squish for Qt installation tested successfully"
+
+if "$squishFolder/squish_for_qt5/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
+  echo "Squish for Qt5 installation tested successfully"
 else
-    echo "Squish for Qt test failed! Package wasn't installed correctly."
+  echo "Squish for Qt5 test failed! Package wasn't installed correctly."
-    exit 1
+  exit 1
+fi
+if "$squishFolder/squish_for_qt6/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
+  echo "Squish for Qt6 installation tested successfully"
+else
+  echo "Squish for Qt6 test failed! Package wasn't installed correctly."
+  exit 1
 fi
 
+

coin/provisioning/common/windows/3dstudio_3rdparty.ps1

@@ -7,6 +7,6 @@ $url = "http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win
 Download $url $url $zip
 Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1"
 Extract-7Zip $zip C:\Utils\Qt3DStudio3rdparty
-Remove-Item -Path $zip
+Remove "$zip"
 
 Set-EnvironmentVariable "QT3DSTUDIO_3RDPARTY_DIR" "C:/Utils/Qt3DStudio3rdparty"