Update submodules on '6.0' in qt/qt5

Change-Id: Id99bb94b0342a4755ba27637fd47c810ce117318
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 = 6.2.2
+	branch = 6.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 6.2.2
+	branch = 6.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
-	recommends = qtimageformats qtshadertools qtsvg
+	recommends = qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 6.2.2
+	branch = 6.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 6.2.2
+	branch = dev
-	status = addon
+	status = ignore
 [submodule "qtmultimedia"]
-	depends = qtbase qtshadertools
+	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 6.2.2
+	branch = dev
-	status = addon
+	status = ignore
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 6.2.2
+	branch = 6.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 6.2.2
+	branch = dev
 	status = ignore
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 6.2.2
+	branch = 6.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative qttools
-	recommends = qtmultimedia
+	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 6.2.2
+	branch = 6.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -72,26 +72,19 @@
 	status = essential
 	priority = 50
 [submodule "qtlocation"]
-	depends = qtbase qtpositioning
+	depends = qtbase
-	recommends = qtdeclarative
+	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 6.2.2
+	branch = dev
 	status = ignore
-[submodule "qtpositioning"]
-	depends = qtbase
-	recommends = qtdeclarative qtserialport
-	path = qtpositioning
-	url = ../qtpositioning.git
-	branch = 6.2.2
-	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 6.2.2
+	branch = dev
-	status = addon
+	status = ignore
 [submodule "qtsystems"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -114,186 +107,237 @@
 	status = ignore
 [submodule "qtconnectivity"]
 	depends = qtbase
-	recommends = qtdeclarative
+	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 6.2.2
+	branch = dev
-	status = addon
+	status = ignore
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 6.2.2
+	branch = 6.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = 6.2.2
+	branch = 6.0
-	status = addon
+	status = additionalLibrary
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 6.2.2
+	branch = 6.0
-	status = addon
+	status = additionalLibrary
+[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 = 6.2.2
+	branch = dev
-	status = addon
+	status = ignore
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 6.2.2
+	branch = dev
-	status = addon
+	status = ignore
+[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 = 6.2.2
+	branch = dev
-	status = addon
+	status = ignore
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 6.2.2
+	branch = dev
-	status = addon
+	status = ignore
 [submodule "qtwebengine"]
 	depends = qtdeclarative
-	recommends = qtwebchannel qttools qtpositioning
+	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 6.2.2
+	branch = dev
-	status = addon
+	status = ignore
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 6.2.2
+	branch = dev
 	status = ignore
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 6.2.2
+	branch = dev
-	status = addon
+	status = ignore
+[submodule "qtquickcontrols2"]
+	depends = qtdeclarative
+	recommends = qtimageformats qtgraphicaleffects
+	path = qtquickcontrols2
+	url = ../qtquickcontrols2.git
+	branch = 6.0
+	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 = 6.2.2
+	branch = dev
-	status = addon
+	status = ignore
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 6.2.2
+	branch = dev
-	status = addon
+	status = ignore
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia
+	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 6.2.2
+	branch = dev
-	status = addon
+	status = ignore
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 6.2.2
+	branch = dev
 	status = ignore
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 6.2.2
+	branch = dev
-	status = addon
+	status = ignore
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 6.2.2
+	branch = dev
 	status = ignore
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 6.2.2
+	branch = 6.0
-	status = addon
+	status = additionalLibrary
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 6.2.2
+	branch = dev
-	status = addon
+	status = ignore
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 6.2.2
+	branch = dev
 	status = ignore
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = 6.2.2
+	branch = dev
-	status = addon
+	status = ignore
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = 6.2.2
+	branch = 6.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
-	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = 6.2.2
+	branch = 6.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = 6.2.2
+	branch = 6.0
 	status = addon
 [submodule "qt5compat"]
-	depends = qtbase qtdeclarative
+	depends = qtbase
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = 6.2.2
+	branch = 6.0
 	status = deprecated
 [submodule "qtcoap"]
-	depends = qtbase
+	depends = qtbase qttools
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = 6.2.2
+	branch = 6.0
-	status = addon
+	status = additionalLibrary
 [submodule "qtmqtt"]
-	depends = qtbase qtdeclarative
+	depends = qtbase qtdeclarative qttools
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = 6.2.2
+	branch = 6.0
-	status = addon
+	status = additionalLibrary
 [submodule "qtopcua"]
-	depends = qtbase qtdeclarative
+	depends = qtbase qtdeclarative qtquickcontrols2 qttools
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = 6.2.2
+	branch = 6.0
-	status = addon
+	status = additionalLibrary

CMakeLists.txt

@@ -1,13 +1,11 @@
-# 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 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
+include("${__qt6_qtbase_src_path}/.cmake.conf")
-# before the toolchain file is loaded.
+include("${__qt6_qtbase_src_path}/cmake/QtCMakeVersionHelpers.cmake")
+qt_internal_check_for_suitable_cmake_version()
+qt_internal_get_computed_minimum_cmake_version(__qt_minimum_cmake_version)
+cmake_minimum_required(VERSION ${__qt_minimum_cmake_version})
+
 include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")
 
 project(Qt
@@ -40,57 +38,37 @@ endif()
 set(QT_SUPERBUILD TRUE)
 
 # Get submodule list if not already defined
-if(NOT QT_BUILD_SUBMODULES)
+if (NOT BUILD_SUBMODULES)
-    if(DEFINED ENV{QT_BUILD_SUBMODULES})
+    qt_internal_find_modules(BUILD_SUBMODULES)
-        set(QT_BUILD_SUBMODULES "$ENV{QT_BUILD_SUBMODULES}")
-    else()
-        qt_internal_find_modules(QT_BUILD_SUBMODULES)
-    endif()
 endif()
-set(QT_BUILD_SUBMODULES "${QT_BUILD_SUBMODULES}" CACHE STRING "Submodules to build")
 
 set(qt_module_dependency_map_prefix "__qt_module_dependencies_")
-qt_internal_sort_module_dependencies("${QT_BUILD_SUBMODULES}" QT_BUILD_SUBMODULES
+qt_internal_sort_module_dependencies("${BUILD_SUBMODULES}" BUILD_SUBMODULES
                                      "${qt_module_dependency_map_prefix}")
 
-foreach(module IN LISTS QT_BUILD_SUBMODULES)
+foreach(module IN LISTS BUILD_SUBMODULES)
     # Check for unmet dependencies
     if(NOT DEFINED BUILD_${module} OR BUILD_${module})
-        message(NOTICE "Checking dependencies of '${module}'")
+        message(NOTICE "Check dependencies of '${module}'")
-        get_property(required_deps GLOBAL PROPERTY QT_REQUIRED_DEPS_FOR_${module})
         foreach(dep IN LISTS "${qt_module_dependency_map_prefix}${module}")
             if (dep STREQUAL "qtbase")
                 # 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")
-                set(error_reason "${dep}'s CMakeLists.txt couldn't be found")
+                message(FATAL_ERROR "Module '${module}' depends on '${dep}', but ${dep}'s \
-            elseif(DEFINED BUILD_${dep} AND NOT BUILD_${dep})
+                CMakeLists.txt couldn't be found.\nNote: Use '-skip ${module}' to exclude it \
-                set(error_reason "building '${dep}' was explicitly disabled")
+                from build.\n")
             endif()
-
+            if(DEFINED BUILD_${dep} AND NOT BUILD_${dep})
-            if(NOT error_reason STREQUAL "")
+                message(FATAL_ERROR "Module '${module}' depends on '${dep}', but '${dep}' \
-                if(required)
+                will not be built.\nNote: Use '-skip ${module}' to exclude it from build.\n")
-                    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()
         endforeach()
     endif()
 endforeach()
 
-foreach(module IN LISTS QT_BUILD_SUBMODULES)
+foreach(module IN LISTS BUILD_SUBMODULES)
     message(NOTICE "Configuring '${module}'")
     ecm_optional_add_subdirectory("${module}")
 

README

@@ -0,0 +1,134 @@
+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

@@ -1,131 +0,0 @@
-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/QtTopLevelHelpers.cmake

@@ -17,34 +17,24 @@ endfunction()
 # 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}")
+        if(line STREQUAL "dependencies:")
-            # Found a repo entry or end of file. Add the last seen dependency.
+            set(found_dependencies 1)
-            if(NOT dependency STREQUAL "")
+        elseif(found_dependencies)
-                if(revision STREQUAL "")
+            if(line MATCHES "^    ref: (.*)$")
+                set(revision "${CMAKE_MATCH_1}")
+                list(APPEND dependencies ${dependency}/${revision})
+                set(dependency "")
+            elseif (line MATCHES "^  (.*):$")
+                if(dependency)
                     message(FATAL_ERROR "Format error in ${depends_file} - ${dependency} does not specify revision!")
                 endif()
-                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}")
@@ -76,16 +66,10 @@ function(qt_internal_add_module_dependencies module ordered out_ordered out_has_
     endif()
     set(modules_dependencies "")
     foreach(dependency IN LISTS dependencies)
-        if(dependency MATCHES "(.*)/([^/]+)/([^/]+)")
+        string(FIND "${dependency}" "/" splitindex REVERSE)
-            set(dependency "${CMAKE_MATCH_1}")
+        string(SUBSTRING "${dependency}" ${splitindex} -1 revision)
-            set(revision "${CMAKE_MATCH_2}")
+        string(SUBSTRING "${revision}" 1 -1 revision)
-            set(required "${CMAKE_MATCH_3}")
+        string(SUBSTRING "${dependency}" 0 ${splitindex} dependency)
-            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)
@@ -124,9 +108,8 @@ function(qt_internal_sort_module_dependencies modules out_all_ordered dependenci
                 "${${module_dependencies_list_var_name}}" PARENT_SCOPE)
         if(NOT module_depends)
             list(APPEND no_dependencies "${module}")
-        else()
-            set(ordered "${out_ordered}")
         endif()
+        set(ordered "${out_ordered}")
     endforeach()
     if (no_dependencies)
         list(APPEND ordered "${no_dependencies}")
@@ -148,15 +131,6 @@ function(qt_internal_checkout module revision)
         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()

cmake/TopologicalSort.cmake

@@ -0,0 +1,148 @@
+##############################################################################
+# @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

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,14 @@
+{
+    "Id": "cmake_topological_sort",
+    "Name": "CMake Topological Sort",
+    "QDocModule": "qt",
+    "QtParts": ["tools"],
+    "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

@@ -24,27 +24,19 @@ instructions:
     - 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"
+          command: "{{.Env.ENV_PREFIX}} cmake --build . --target qttools/all --parallel -v"
           maxTimeInSeconds: 12000
           maxTimeBetweenOutput: 1200
           userMessageOnFailure: >
             Failed to build sources.
         - type: ExecuteCommand
-          command: "{{.Env.ENV_PREFIX}} cmake --build . --target docs -v"
+          command: "{{.Env.ENV_PREFIX}} cmake --build . --target generate_docs -v"
           maxTimeInSeconds: 12000
           maxTimeBetweenOutput: 1200
           userMessageOnFailure: >
             Failed to generate docs.
-        - type: ExecuteCommand
+        - type: MakeDirectory
-          command: "cp -r {{.BuildDir}}/qtbase/doc/config {{.BuildDir}}/doc"
+          directory: "{{.BuildDir}}/qtbase/doc/global"
-          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

coin/platform_configs/cmake_platforms.yaml

@@ -1,12 +1,9 @@
 Version: 2
 Include: [
     cmake_platforms_qemu.yaml,
-    cmake_platforms_qemu_qnx710.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:
 -
@@ -24,14 +21,6 @@ Configurations:
     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'
@@ -48,27 +37,57 @@ Configurations:
     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: 'OpenSUSE-15.3-host'
+    Template: 'qtci-linux-openSUSE-15.1-x86_64'
-    Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
     Compiler: 'GCC'
     Features: ['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'
+    Template: 'qtci-linux-SLES-15_SP2-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_SP3-x86_64-51'
     Compiler: 'GCC'
     Features: ['Sccache', 'DisableTests']
     Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Id: 'macos-10.14-host'
+    Template: 'qtci-macos-10.14-x86_64'
+    Compiler: 'Clang'
+    Features: ['Packaging', 'Sccache']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=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 -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Environment variables: [
+        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+        ]
+-
+    Id: 'macos-10.15-host'
+    Template: 'qtci-macos-10.15-x86_64-100'
+    Compiler: 'Clang'
+    Features: ['Packaging', 'Sccache']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode12.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -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.15-x86_64-100'
+    Compiler: 'Clang'
+    Features: ['Sccache']
+    Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode12.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.1.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -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-52'
     Compiler: 'MSVC2019'
@@ -80,7 +99,6 @@ Configurations:
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
     ]
 -
-    Id: 'Windows10-MSVC2019-x64-host'
     Template: 'qtci-windows-10-x86_64-52'
     Compiler: 'MSVC2019'
     Features: ['Sccache', "DebugAndRelease"]
@@ -89,21 +107,8 @@ Configurations:
         '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'
+    Id: 'CentOS-8.1-host'
-    Compiler: 'MSVC2019'
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
-    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 -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
-        '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',
-        'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
-        'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
-        'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}']
--
-    Id: 'RHEL-8.2-host'
-    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
     Compiler: 'GCC'
     Features: ['Packaging', 'Sccache']
     Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY'
@@ -115,8 +120,8 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-10.14-host'
-    Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
+    Features: ['Packaging', 'Sccache', 'DebugAndRelease']
     Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
 -
     Id: 'Windows10-Mingw8-x64-host'
@@ -131,30 +136,10 @@ Configurations:
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
     ]
 -
-    Id: 'Windows10-Mingw11-x64-host'
     Template: 'qtci-windows-10-x86_64-52'
     Compiler: 'Mingw'
-    Features: ['Packaging', 'Sccache']
+    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
-    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.MINGW1120}}\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:\MINGW1120\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.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=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','LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']

coin/platform_configs/cmake_platforms_qemu.yaml

@@ -6,13 +6,13 @@ Configurations:
     Target arch: 'armv7'
     Compiler: 'GCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache']
+    Features: ['Sccache', 'DisableTests']
     Environment variables: [
-        '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',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi-;DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
-        'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_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.19.2/bin",
         'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
-        'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
+        'GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
         'QT_QUICK_BACKEND=software',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TARGET_TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
@@ -22,13 +22,13 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'GCC'
     Platform dependency: 'Ubuntu-20.04-host'
-    Features: ['Sccache']
+    Features: ['Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.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=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-;DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
-        'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_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.19.2/bin",
         'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
-        'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
+        'GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
         'QT_QUICK_BACKEND=software',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TARGET_TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
@@ -40,11 +40,10 @@ Configurations:
     Platform dependency: 'Ubuntu-20.04-host'
     Features: ['Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_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',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux-;DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
-        'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
+        'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/../../environment-setup-mips64r2-poky-linux',
-        "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.19.2/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_qemu_qnx710.yaml

@@ -1,39 +0,0 @@
-Version: 2
-Configurations:
--
-    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: ['InsignificantTests']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
-        'QT_CMAKE_DIR=/opt/cmake-3.21.1/bin',
-        "TESTARGS='{{.Env.QNX_QEMU_SSH}} LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen'",
-        "TESTRUNNER='python3 {{.SourceDir}}/coin_qnx_qemu_runner.py'",
-        "COIN_CTEST_RESULTSDIR=/home/qt/work",
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
--
-    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: ['DisableTests']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
--
-    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: ['DisableTests']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake',
-        'NON_QTBASE_TARGET_CONFIGURE_ARGS=']

coin/platform_configs/cmake_platforms_static_tests.yaml

@@ -1,28 +0,0 @@
-Version: 2
-Configurations:
--
-    Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
-    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-RHEL-8.2-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'arm64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.2-host'
+    Platform dependency: 'CentOS-8.1-host'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
-    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'armv7'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.2-host'
+    Platform dependency: 'CentOS-8.1-host'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
-    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.2-host'
+    Platform dependency: 'CentOS-8.1-host'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
-    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86_64'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.2-host'
+    Platform dependency: 'CentOS-8.1-host'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -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-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-10.14-host'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -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-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-10.14-host'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -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-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-10.14-host'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -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-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-10.14-host'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']

coin/platform_configs/cmake_platforms_target_android_host_windows.yaml

@@ -10,19 +10,7 @@ Configurations:
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
         'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -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-52'
-    Target os: 'Android_ANY'
-    Target arch: 'arm64'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'Windows10-Mingw11-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests']
-    Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -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'
@@ -34,19 +22,7 @@ Configurations:
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
         'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -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-52'
-    Target os: 'Android_ANY'
-    Target arch: 'armv7'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'Windows10-Mingw11-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests']
-    Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -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'
@@ -58,19 +34,7 @@ Configurations:
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
         'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -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-52'
-    Target os: 'Android_ANY'
-    Target arch: 'x86'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'Windows10-Mingw11-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests']
-    Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -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'
@@ -82,17 +46,5 @@ Configurations:
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
         'Path={{.Env.MINGW810}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -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']
--
-    Template: 'qtci-windows-10-x86_64-52'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'Windows10-Mingw11-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests']
-    Environment variables: [
-        'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF -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

@@ -1,47 +0,0 @@
-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=Release -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=Release -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-windows-10-x86_64-52'
-    Target os: 'WebAssembly'
-    Compiler: 'Mingw'
-    Target compiler: 'Clang'
-    Platform dependency: 'Windows10-Mingw11-x64-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests']
-    Environment variables: [
-        'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
-        'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
-        'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release -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=Release -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,5 +1,88 @@
 Version: 2
 Configurations:
+-
+    Template: 'qtci-windows-10-x86_64-52'
+    Compiler: 'MSVC2019'
+    Features: ['UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -headersclean -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -qt-zlib'
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl'
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['UseLegacyInstructions', 'DisableTests']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl'
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-warnings-are-errors -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl'
+-
+    Template: 'qtci-linux-openSUSE-15.1-x86_64'
+    Target os: 'WebAssembly'
+    Compiler: 'GCC'
+    Features: ['DisableTests', 'UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten'
+-
+    Template: 'qtci-linux-SLES-15_SP2-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['DisableTests', 'UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl'
+-
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -headersclean -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -openssl -qt-pcre -qt-harfbuzz -R . QMAKE_LFLAGS_APP+=-s'
+-
+    Template: 'qtci-macos-10.14-x86_64'
+    Compiler: 'Clang'
+    Features: ['UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -headersclean -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include'
+-
+    Template: 'qtci-macos-10.14-x86_64'
+    Compiler: 'Clang'
+    Features: ['DisableTests', 'UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
+-
+    Template: 'qtci-macos-10.14-x86_64'
+    Target os: 'IOS_ANY'
+    Target arch: 'multi'
+    Compiler: 'Clang'
+    Features: ['DisableTests', 'UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang'
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Target os: 'QEMU'
+    Target arch: 'armv7'
+    Compiler: 'GCC'
+    Features: ['UseLegacyInstructions', 'DisableTests']
+    Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors'
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Target os: 'QEMU'
+    Target arch: 'arm64'
+    Compiler: 'GCC'
+    Features: ['UseLegacyInstructions', 'DisableTests']
+    Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors'
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Target os: 'QEMU'
+    Target arch: 'mips64'
+    Compiler: 'GCC'
+    Features: ['DisableTests', 'UseLegacyInstructions']
+    Environment variables: ['QT_QUICK_BACKEND=software']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64r2-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64r2-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-feature-forkfd_pidfd -no-warnings-are-errors'
+-
+    Template: 'qtci-windows-10-x86_64-52'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
+    Features: ['DisableTests', 'UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
 -
     Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
     Compiler: 'GCC'

coin/platform_configs/flashing-wizard.yaml

@@ -13,12 +13,7 @@ Configurations:
         Features: ['Packaging', 'UseLegacyInstructions']
         Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
     -
-        Template: 'qtci-linux-RHEL-8.2-x86_64-50'
+        Template: 'qtci-linux-CentOS-8.1-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-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'

coin/platform_configs/integrity.yaml

@@ -1,17 +0,0 @@
-Version: 2
-Configurations:
-    -
-      Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-      Compiler: 'GCC'
-      Target os: 'INTEGRITY'
-      Platform dependency: 'Ubuntu-20.04-host'
-      Features: ['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

@@ -1,12 +0,0 @@
-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

@@ -1,24 +0,0 @@
-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

@@ -1,87 +0,0 @@
-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', 'WarningsAreErrors']
-        Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -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'
-    -
-        Id: 'macos-12-arm64-tests'
-        Template: 'qtci-macos-12-arm64'
-        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly', 'Packaging', 'InsignificantTests']
-        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', 'WarningsAreErrors']
-        Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=ON -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', 'WarningsAreErrors']
-        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-12-xcode-arm64-developer-build'
-        Template: 'qtci-macos-12-arm64'
-        Compiler: 'Clang'
-        Features: ['DoNotRunTests', 'WarningsAreErrors']
-        Configure arguments: '-DFEATURE_developer_build=ON -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON'
-    -
-        Id: 'macos-11-arm64-developer-build-tests'
-        Template: 'qtci-macos-11.0-arm64'
-        Compiler: 'Clang'
-        Features: ['TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-developer-build'
-    -
-        Id: 'macos-12-arm64-developer-build-tests'
-        Template: 'qtci-macos-12-arm64'
-        Compiler: 'Clang'
-        Features: ['TestOnly', 'InsignificantTests']
-        Platform dependency: 'macos-12-xcode-arm64-developer-build'

coin/platform_configs/pyside-setup.yaml

@@ -3,7 +3,7 @@ Module only: True
 Include: [cmake_platforms.yaml]
 Configurations:
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Compiler: 'GCC'
     Features: ['TestOnly', 'LicenseCheck']
 

coin/platform_configs/qdb.yaml

@@ -1,30 +1,28 @@
 Version: 2
+Module only: True
 Configurations:
--
+    -
-    Template: 'qtci-windows-10-x86_64-52'
+        Template: 'qtci-windows-10-x86_64-52'
-    Compiler: 'MSVC2019'
+        Compiler: 'MSVC2015'
-    Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
+        Target arch: 'x86'
-    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'
+        Features: ['Packaging', 'UseLegacyInstructions']
-    Environment variables: [
+        Configure arguments: '-qmake -opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86%'
-        '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'
-        'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
+        Compiler: 'MSVC2015'
-    ]
+        Features: ['Packaging', 'UseLegacyInstructions']
--
+        Configure arguments: '-qmake -opensource -confirm-license -nomake tests -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -opengl dynamic -static -no-icu -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64%'
-    Id: 'RHEL-8.2-host'
+    -
-    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
+        Template: 'qtci-linux-CentOS-8.1-x86_64-50'
-    Compiler: 'GCC'
+        Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
+        Features: ['Packaging', 'UseLegacyInstructions']
-    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'
+        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'
-    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.13-x86_64-2'
--
+        Compiler: 'Clang'
-    Id: 'macOS-11.0'
+        Features: ['Packaging']
-    Template: 'qtci-macos-11.0-x86_64-102'
+        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'
-    Compiler: 'Clang'
+    -
-    Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
+        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
-    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'
+        Compiler: 'GCC'
-    Environment variables: [
+        Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
-        '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

@@ -1,33 +0,0 @@
-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,20 +1,34 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    cmake_platforms_static_tests.yaml,
-    macos-developer-build-tests.yaml,
-    integrity.yaml,
-    ios-tests.yaml
-]
 Configurations:
 -
-    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
+    Template: 'qtci-linux-openSUSE-15.1-x86_64'
+    Target os: 'WebAssembly'
+    Compiler: 'GCC'
+    Features: ['DisableTests', 'UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-pch -no-feature-thread -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -xplatform wasm-emscripten'
+-
+    Template: 'qtci-macos-10.14-x86_64'
+    Compiler: 'Clang'
+    Features: ['UseLegacyInstructions']
+    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include'
+-
+    Template: 'qtci-macos-10.14-x86_64'
+    Compiler: 'Clang'
+    Features: ['Sccache']
+    Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Environment variables: [
+        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+        ]
+-
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
     Target os: 'Android_ANY'
     Target arch: 'x86'
     Compiler: 'GCC'
     Target compiler: 'Clang'
-    Platform dependency: 'RHEL-8.2-host'
+    Platform dependency: 'CentOS-8.1-host'
     Features: ['Packaging', 'Sccache', 'AndroidTestRun']
     Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -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',
         'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']

coin/platform_configs/qtdatavis3d.yaml

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

coin/platform_configs/qtdeclarative.yaml

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

coin/platform_configs/qtdeviceutilities.yaml

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

coin/platform_configs/qtdltlogging.yaml

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

coin/platform_configs/qtimageformats.yaml

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

coin/platform_configs/qtinterfaceframework.yaml

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

coin/platform_configs/qtivi.yaml

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

coin/platform_configs/qtlocation.yaml

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

coin/platform_configs/qtlottie.yaml

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

coin/platform_configs/qtmultimedia.yaml

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

coin/platform_configs/qtpositioning.yaml

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

coin/platform_configs/qtsaferenderer.yaml

@@ -3,7 +3,7 @@ Configurations:
 -
     Template: 'qtci-windows-10-x86_64-52'
     Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
+    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
     Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++'
     Features: ['UseLegacyInstructions']
 -
@@ -13,18 +13,7 @@ Configurations:
     Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
     Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
 -
-    Template: 'qtci-windows-10-x86_64-52'
+    Template: 'qtci-linux-CentOS-8.1-x86_64-50'
-    Compiler: 'Mingw'
-    Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH']
-    Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions']
-    Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++'
--
-    Template: 'qtci-linux-RHEL-8.2-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'
--
-    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

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

coin/platform_configs/qtsdk.yaml

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

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

coin/platform_configs/qtserialbus.yaml

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

coin/platform_configs/qtserialport.yaml

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

coin/platform_configs/qtshadertools.yaml

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

coin/platform_configs/qtspeech.yaml

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

coin/platform_configs/qtsvg.yaml

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

coin/platform_configs/qtwebchannel.yaml

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

coin/platform_configs/qtwebengine.yaml

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

coin/platform_configs/qtwebkit.yaml

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

coin/platform_configs/qtwebview.yaml

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

coin/platform_configs/tqtc-pyside-setup.yaml

@@ -3,7 +3,7 @@ Module only: True
 Include: [cmake_platforms.yaml]
 Configurations:
 -
-    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
     Compiler: 'GCC'
     Features: ['TestOnly', 'LicenseCheck']
 

coin/platform_configs/tqtc-qmlcompilerplus.yaml

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

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

@@ -0,0 +1,28 @@
+Version: 2
+Module only: True
+Configurations:
+    -
+        Template: 'qtci-windows-10-x86_64-52'
+        Compiler: 'MSVC2019'
+        Features: ['Packaging', 'UseLegacyInstructions']
+        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
+    -
+        Template: 'qtci-windows-10-x86_64-52'
+        Compiler: 'MSVC2019'
+        Target arch: 'x86'
+        Features: ['Packaging', 'UseLegacyInstructions']
+        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
+    -
+        Template: 'qtci-linux-CentOS-8.1-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-macos-10.13-x86_64-2'
+        Compiler: 'Clang'
+        Features: ['Packaging', 'UseLegacyInstructions']
+        Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include -static -no-icu'
+    -
+        Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+        Compiler: 'GCC'
+        Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

coin/platform_configs/tqtc-qt-rta.yaml

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

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

@@ -1,11 +1,11 @@
-### RHEL 8.2 ###
+### CENTOS 8.1 ###
 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
+Time & Date: Europe/Helsinki
 Software Selection: Server with GUI
 Network & Host..: Connect
 
@@ -14,6 +14,7 @@ Typing:English (US)
 Privacy: Location Services: OFF
 Connect Your Online Accounts: Skip
 
+
 # Configure Settings
  Notifications:
     * Notification Popups: OFF
@@ -25,24 +26,20 @@ Connect Your Online Accounts: Skip
  Devices:
     * Displays: Resolution 1280 x 800
  Details:
-    * Time Zone: UTC
+    * Time Zone: GMT
-       * 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
+Download http://coin/coin/binary/linux_386/coin-setup
-run './coin-setup'
+
+run 'sudo ./coin-setup'
+
+Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub
+grub2-mkconfig -o /etc/grub2.cfg
+grub2-mkconfig -o /boot/grub2/grub.cfg
 
 Reboot
+

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

@@ -1,50 +0,0 @@
-### 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-SLES-15_SP2-x86_64/README_MANUAL_INSTALLATIONS

@@ -1,4 +1,4 @@
-### SUSE Linux Enterprise Desktop 15 SP3 ###
+### SUSE Linux Enterprise Desktop 15 SP2 ###
 
 Language: English (US)
 Keyboard Layout: English (US)
@@ -7,13 +7,9 @@ Available Extensions and Modules:
    Basesystem Module
    Desktop Applications Module
    Python 2 Module
-   Server Applications Module
 
 Gnome Desktop (X11)
 
-Enable SSH service
-Disable Firewall
-
 Resolution 1280x800
 
 # Settings
@@ -45,12 +41,7 @@ org.freedesktop.login1.power-off                        yes
 org.freedesktop.login1.power-off-ignore-inhibit         yes
 org.freedesktop.login1.power-off-multiple-sessions      yes
 
-sudo /sbin/set_polkit_default_privs
-
-# Set how DHClient creates CID for compatibility with older DHCP servers
-sudo sed -i 's/DHCLIENT_CREATE_CID=""/DHCLIENT_CREATE_CID="rfc2132"/' /etc/sysconfig/network/dhcp
-
 # Register product
 # Add 'Available Extensions and Modules'
-* Basesystem Module 15 SP3 x86_64
+* Basesystem Module 15 SP2 x86_64
-* Server Applications Module 15 SP3 x86_64
+* Server Applications Module 15 SP2 x86_64

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

@@ -1,7 +0,0 @@
-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

@@ -1,8 +0,0 @@
-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/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="r22b"
+ndkVersion="r21d"
 ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
-sdkBuildToolsVersion="31.0.0"
+sdkBuildToolsVersion="29.0.3"
-sdkApiLevel="android-31"
+sdkApiLevel="android-29"
 
 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
-ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc"
+ndkSha1="bcf4023eb8cb6976a4c7cff0a8a8f145f162bf4d"
 
 toolsTargetFile="/tmp/$toolsFile"
 toolsSourceFile="$basePath/$toolsFile"
@@ -109,7 +109,8 @@ fi
 echo "Checking the contents of Android SDK..."
 ls -l "$sdkTargetFolder"
 
-SetEnvVar "ANDROID_SDK_ROOT" "$sdkTargetFolder"
+SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
+SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
 SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion"
 SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
 SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"

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.21"
+majorminorversion="3.19"
-version="3.21.1"
+version="3.19.2"
-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="591e3b0729ae07c37c1fa3c6adde7cc21387059d"
+SHA1="61c79765a5a8a44a6b94d1c87c489500f170c1c9"
 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/cmake_toolchain_files/integrity_toolchain.cmake

@@ -1,96 +0,0 @@
-#generic
-set(CMAKE_SYSTEM_NAME Integrity)
-set(CMAKE_SYSTEM_PROCESSOR arm)
-set(CMAKE_CROSSCOMPILING True)
-
-set(TARGET_ROOT_PATH "/home/qt/integrity_toolchain/hlos_dev_boot")
-set(CMAKE_BUILD_TYPE "Release")
-
-set(CMAKE_C_COMPILER cxintarm64)
-set(CMAKE_CXX_COMPILER cxintarm64)
-set(CMAKE_ASM_COMPILER cxintarm64)
-
-set(EGL_FOUND True)
-set(UNIX True)
-
-set (CMAKE_C_COMPILE_FEATURES c_std_99)
-set (CMAKE_CXX_COMPILE_FEATURES
-cxx_alias_templates
-cxx_alignas
-cxx_alignof
-cxx_attributes
-cxx_auto_type
-cxx_constexp
-cxx_decltype
-cxx_delegating_constructors
-cxx_explicit_conversions
-cxx_extern_templates
-cxx_inheriting_constructors
-cxx_lambdas
-cxx_noexcept
-cxx_nonstatic_member_init
-cxx_nullptr
-cxx_override
-cxx_range_for
-cxx_raw_string_literals
-cxx_reference_qualified_functions
-cxx_rvalue_references
-cxx_static_assert
-cxx_std_17
-cxx_thread_local
-cxx_unicode_literals
-cxx_uniform_initialization
-cxx_unrestricted_unions
-cxx_variadic_macros
-cxx_variadic_templates)
-
-if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM)
-    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-endif()
-if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY)
-    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-endif()
-if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE)
-    set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-endif()
-if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE)
-    set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-endif()
-
-set(CMAKE_FIND_ROOT_PATH ${TARGET_ROOT_PATH})
-
-#base
-set(CMAKE_C_FLAGS  "-bsp $ENV{INTEGRITY_BSP} -os_dir $ENV{INTEGRITY_DIR} -non_shared -startfile_dir=$ENV{INTEGRITY_DIR}/libs/$ENV{INTEGRITY_BSP}/$ENV{INTEGRITY_BUILD_TARGET} --rtos_library_directory=libs/$ENV{INTEGRITY_BSP}/$ENV{INTEGRITY_BUILD_TARGET} --rtos_library_directory=libs/arm64/$ENV{INTEGRITY_BUILD_TARGET} -bigswitch -DINTEGRITY -llibivfs.a -llibposix.a -llibpaged_alloc.a -llibnet.a -llibsocket.a")
-
-set(CMAKE_C_FLAGS_DEBUG "-g -Omaxdebug")
-set(CMAKE_C_FLAGS_RELEASE "-Ospeed -Olink -Omax")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --signed_fields --diag_suppress=1,82,228,236,381,611,961,997,1795,1931,1974,3148 --c++17 --thread_local_storage --exceptions --defer_parse_function_templates")
-
-set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} --signed_fields --no_implicit_include --link_once_templates -non_shared --new_outside_of_constructor -I $ENV{QC_MULTIMEDIA_INC_DIR}")
-set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -L${TARGET_ROOT_PATH} -L${TARGET_ROOT_PATH}/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics -L${TARGET_ROOT_PATH}/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base -L${TARGET_ROOT_PATH}/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt -L${TARGET_ROOT_PATH}/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform -L${TARGET_ROOT_PATH}/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display/ --commons")
-
-set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
-set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-set(BUILD_SHARED_LIBS OFF)
-set(CMAKE_EXE_LINKER_FLAGS "")
-
-set(QT_CFLAGS_OPTIMIZE_FULL "-Ospeed -olink -Omax")
-
-set(GLSLANG_OSDEP_PATH ../3rdparty/glslang/glslang/OSDependent/Unix)
-
-#set(QT_DEBUG_OPTIMIZATION_FLAGS "1")
-#set (QT_CMAKE_DEBUG_EXTEND_TARGET "1")
-
-set(EGL_INCLUDE_DIR $ENV{GL_INC_DIR})
-
-set(PKG_EGL_LIBRARY_DIRS ${TARGET_ROOT_PATH})
-set(EGL_LIBRARY ${TARGET_ROOT_PATH}/../libeglmegapack.a)
-
-#set(EGL_LIBRARY libESXEGL_Adreno.a libadreno_utils.a libESXGLESv2_Adreno.a libadreno_utils.a libGSLUser.a libOSUser.a libpanel.a libivfs.a libposix.a libpmem.a libtzbsp.a libpaged_alloc.a libglnext-llvm.a libopenwfd.a libplanedef.a liblogger.a libnet.a libsocket.a librfs_client.a libshm_client.a libmmosalrfs.a libmmosalfile.a libOSAbstraction.a)
-
-set(GLESv2_LIBRARY ${EGL_LIBRARY})
-set(GLESv2_INCLUDE_DIR $ENV{GL_INC_DIR})
-set(OPENGL_INCLUDE_DIR $ENV{GL_INC_DIR})

coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake

@@ -1,25 +0,0 @@
-set(CMAKE_SYSTEM_NAME QNX)
-
-if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM)
-    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-endif()
-if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY)
-    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-endif()
-if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE)
-    set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-endif()
-if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE)
-    set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-endif()
-
-set(CMAKE_FIND_ROOT_PATH $ENV{QNX_TARGET}/target/qnx7/)
-
-set(_qnx_toolchain_arch gcc_ntoaarch64le)
-
-set(CMAKE_C_COMPILER qcc)
-set(CMAKE_C_COMPILER_TARGET ${_qnx_toolchain_arch})
-set(CMAKE_CXX_COMPILER q++)
-set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch})
-
-set(CMAKE_SYSROOT $ENV{QNX_TARGET})

coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-armv7le.cmake

@@ -1,25 +0,0 @@
-set(CMAKE_SYSTEM_NAME QNX)
-
-if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM)
-    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-endif()
-if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY)
-    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-endif()
-if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE)
-    set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-endif()
-if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE)
-    set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-endif()
-
-set(CMAKE_FIND_ROOT_PATH $ENV{QNX_TARGET}/target/qnx7/)
-
-set(_qnx_toolchain_arch gcc_ntoarmv7le)
-
-set(CMAKE_C_COMPILER qcc)
-set(CMAKE_C_COMPILER_TARGET ${_qnx_toolchain_arch})
-set(CMAKE_CXX_COMPILER q++)
-set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch})
-
-set(CMAKE_SYSROOT $ENV{QNX_TARGET})

coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-x8664.cmake

@@ -1,25 +0,0 @@
-set(CMAKE_SYSTEM_NAME QNX)
-
-if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM)
-    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-endif()
-if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_LIBRARY)
-    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-endif()
-if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PACKAGE)
-    set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-endif()
-if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_INCLUDE)
-    set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-endif()
-
-set(CMAKE_FIND_ROOT_PATH $ENV{QNX_TARGET}/target/qnx7/)
-
-set(_qnx_toolchain_arch gcc_ntox86_64)
-
-set(CMAKE_C_COMPILER qcc)
-set(CMAKE_C_COMPILER_TARGET ${_qnx_toolchain_arch})
-set(CMAKE_CXX_COMPILER q++)
-set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch})
-
-set(CMAKE_SYSROOT $ENV{QNX_TARGET})

coin/provisioning/common/linux/gcc.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 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.
@@ -57,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="https://gcc.gnu.org/pub/gcc/releases/gcc-$version/gcc-$version.tar.xz"
+    officialUrl="ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/gcc.gnu.org/pub/gcc/releases/gcc-$version/$sourceFile"
 
     targetFile="$tmpFolder/$sourceFile"
     buildFolder="$HOME/gcc_build"

coin/provisioning/common/linux/integrity.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,31 +33,26 @@
 ##
 #############################################################################
 
-# This script installs needed toolchains for INTEGRITY
+# This script installs 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"
 
-urlToolchainEs7="http://ci-files01-hki.intra.qt.io/input/integrity/integrity_toolchain_es7_25102021.zip"
+version="11.4.4"
-urlLibeglmegapack="http://ci-files01-hki.intra.qt.io/input/integrity/integrity_libeglmegapack.zip"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz"
-SHA1_toolchainEs7="13f634213187d94f70d184c6af38eb38f0bf44f0"
+AltUrl="$PrimaryUrl" # we lack an external source for this
-SHA1_Libeglmegapack="7f8ca64132eaea66202ea8db7f71f3300aab0777"
+SHA1="4afa3c15e13c91734951b73f6b21388294c5d794"
-targetFolder="$HOME"
+targetFolder="/opt/ghs"
 appPrefix=""
 
-toolchain_file="${BASH_SOURCE%/*}/cmake_toolchain_files/integrity_toolchain.cmake"
+InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
 
-echo "Install Integrity toolchain es7"
+SetEnvVar "INTEGRITY_BSP" "platform-cortex-a9"
-InstallFromCompressedFileFromURL "$urlToolchainEs7" "$urlToolchainEs7" "$SHA1_toolchainEs7" "$targetFolder" "$appPrefix"
+SetEnvVar "INTEGRITY_PATH" "$targetFolder/comp_201654"
+SetEnvVar "INTEGRITY_DIR" "$targetFolder/int1144"
+SetEnvVar "INTEGRITY_GL_INC_DIR" "\$INTEGRITY_DIR/INTEGRITY-include/Vivante/sdk/inc"
+SetEnvVar "INTEGRITY_GL_LIB_DIR" "\$INTEGRITY_DIR/libs/Vivante"
 
-echo "Install Integrity toolchain addons"
+echo "INTEGRITY = $version" >> ~/versions.txt
-DownloadURL "$urlLibeglmegapack" "$urlLibeglmegapack" "$SHA1_Libeglmegapack" "/tmp/integrity_libeglmegapack.zip"
-unzip "/tmp/integrity_libeglmegapack.zip" -d "/tmp"
-mv /tmp/toolchain/* $targetFolder/toolchain
-mv $targetFolder/toolchain $targetFolder/integrity_toolchain
-cp $toolchain_file "$targetFolder/integrity_toolchain/toolchain.cmake"
-sudo rm -fr /tmp/toolchain

coin/provisioning/common/linux/openssl_for_android_linux.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,9 +33,8 @@
 ##
 #############################################################################
 
-# This script install prebuilt OpenSSL which was built against Android NDK 21.
+# This script install OpenSSL from sources.
-# OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories
+# Requires GCC and Perl to be in PATH.
-
 set -ex
 # shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
@@ -43,8 +42,6 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.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
@@ -65,28 +62,12 @@ opensslHome="${HOME}/openssl/android/openssl-${version}"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
 mkdir -p "${HOME}/openssl/android/"
 tar -xzf "$targetFile" -C "${HOME}/openssl/android/"
-if uname -a |grep -q "Darwin"; then
+
-    TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64/bin
+TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin
-else
-    TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin
-fi
 cd "$opensslHome"
 PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
 PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
-'
 
-if uname -a |grep -q "Darwin"; then
-    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21_darwin.tar.gz"
-    sha="6e3e48441ff58596f25bc27fdc05ae43e5a7581d"
-else
-    prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21.tar.gz"
-    sha="8c4db1eb8460d749c998a0e033b3939123cbc5ac"
-fi
-targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
-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_660.sh

@@ -33,7 +33,34 @@
 ##
 #############################################################################
 
+# This script installs QNX 6.6.0.
+
 set -ex
 
-# shellcheck source=../common/linux/disable_selinux.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-source "${BASH_SOURCE%/*}/../common/linux/disable_selinux.sh"
+
+targetFolder="/opt/"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660-patch4687-linux.tar.gz"
+sha1="ffcf91489699c42ce9c1d74941f1829531752bbe"
+folderName="qnx660"
+targetFile="qnx660.tar.gz"
+wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
+echo "$sha1  $targetFile" | sha1sum --check
+if [ ! -d "$targetFolder" ]; then
+    mkdir -p $targetFolder
+fi
+sudo tar -C $targetFolder -xzf $targetFile
+sudo chown -R qt:users "$targetFolder"/"$folderName"
+
+# Verify that we have last file in tar
+if [ ! -f $targetFolder/$folderName/qnx660-env.sh ]; then
+    echo "Installation failed!"
+    exit -1
+fi
+
+rm -rf $targetFile
+
+# Set env variables
+SetEnvVar "QNX_660" "$targetFolder$folderName"
+
+echo "QNX SDP = 6.6.0" >> ~/versions.txt

coin/provisioning/common/linux/qnx_700.sh

@@ -33,7 +33,35 @@
 ##
 #############################################################################
 
+# This script installs QNX 7.
+
 set -ex
 
-# shellcheck source=../common/linux/integrity.sh
+# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/linux/integrity.sh"
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+targetFolder="/opt/"
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-linux.tar.xz"
+sha1="9fb115b2c84b8e7b6016a51cc421a763bda298a1"
+folderName="qnx700"
+targetFile="qnx700.tar.xz"
+wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
+echo "$sha1  $targetFile" | sha1sum --check
+if [ ! -d "$targetFolder" ]; then
+    mkdir -p $targetFolder
+fi
+sudo tar -C $targetFolder -Jxf $targetFile
+sudo chown -R qt:users "$targetFolder"/"$folderName"
+
+# Verify that we have last file in tar
+if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
+    echo "Installation failed!"
+    exit -1
+fi
+
+rm -rf $targetFile
+
+# Set env variables
+SetEnvVar "QNX_700" "$targetFolder$folderName"
+
+echo "QNX SDP = 7.0.0" >> ~/versions.txt

coin/provisioning/common/linux/qnx_710.sh

@@ -1,103 +0,0 @@
-#!/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$
-##
-#############################################################################
-
-# 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
-}
-
-aarch64le_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake"
-armv7le_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-armv7le.cmake"
-x8664_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-x8664.cmake"
-QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/"
-
-targetFolder="/opt/"
-folderName="qnx710"
-targetPath="$targetFolder$folderName"
-qemuTargetPath="$HOME/QNX"
-qemuIpAddress="172.31.1.10"
-qemuNetwork="172.31.1.1"
-qemuSSHuser="root"
-qemuSSHurl="$qemuSSHuser@$qemuIpAddress"
-qemuLDpath="/proc/boot:/system/lib:/system/lib/dll:/home/qt/work/install/target/lib"
-
-if [ ! -d "$targetFolder" ]; then
-    mkdir -p $targetFolder
-fi
-
-# QNX SDP
-sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx710-20210929-linux.tar.xz"
-targetFile="qnx710.tar.xz"
-sha1="60f4a681f31fa7f10792db4c889c8f0b43aa1ad4"
-DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
-
-sudo cp $aarch64le_toolchain $targetPath
-sudo cp $armv7le_toolchain $targetPath
-sudo cp $x8664_toolchain $targetPath
-cp -R $QNX_qemu_bld_files_dir $qemuTargetPath
-
-sudo chown -R qt:users "$targetPath"
-
-# 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
-SetEnvVar "QNX_710" "$targetPath"
-SetEnvVar "QNX_QEMU" "$qemuTargetPath"
-SetEnvVar "QNX_QEMU_IPADDR" "$qemuIpAddress"
-SetEnvVar "QNX_QEMU_SSH" "$qemuSSHurl"
-SetEnvVar "QNX_QEMU_LD_LIBRARY_PATH" "$qemuLDpath"
-
-echo "QNX SDP = 7.1.0" >> ~/versions.txt

coin/provisioning/common/linux/qnx_qemu_build_files/local/opt_scripts/opt_nfs_qt

@@ -1,46 +0,0 @@
-#!/bin/bash
-
-function brief()
-{
-    echo "--nfs=[<mount>|no]"
-}
-
-function help()
-{
-    brief
-    cat <<EOF
-    If yes, the given nfs share "<mount>" will be mounted at <mount>
-
-    The default is no.
-EOF
-}
-
-function validate() {
-    exit 0
-}
-
-function configure()
-{
-    if [ "$OPT_NFS_QT" != no ]; then
-        cat >output/option_files/post_start.opt_nfs <<EOF
-
-echo "---> Starting NFS"
-STARTU_P(fs_nfs3_t,__FS_NFS3_ID__) fs-nfs3 172.31.1.1:$OPT_NFS_QT $OPT_NFS_QT
-EOF
-    fi
-
-    exit 0
-}
-
-case "$1" in
-    brief)
-        brief;;
-    help)
-        help;;
-    validate)
-        validate;;
-    configure)
-        configure;;
-    default)
-        echo no;;
-esac

coin/provisioning/common/linux/qnx_qemu_build_files/local/options

@@ -1,88 +0,0 @@
-OPT_ABLELOCK='no'
-DEF_OPT_ABLELOCK='no'
-OPT_ARCH='x86_64'
-DEF_OPT_ARCH='x86_64'
-OPT_ASLR='yes'
-DEF_OPT_ASLR='yes'
-OPT_CERTICOM='no'
-DEF_OPT_CERTICOM='no'
-OPT_CRYPTODEV='no'
-DEF_OPT_CRYPTODEV='no'
-OPT_DATA_INODES='3000'
-DEF_OPT_DATA_INODES='3000'
-OPT_DATA_SIZE='60'
-DEF_OPT_DATA_SIZE='60'
-OPT_EXTRA_DIRS='none'
-DEF_OPT_EXTRA_DIRS='none'
-OPT_GRAPHICS='no'
-DEF_OPT_GRAPHICS='no'
-OPT_GUEST='none'
-DEF_OPT_GUEST='none'
-OPT_HOSTNAME='qnx_QEMU_CI'
-DEF_OPT_HOSTNAME='noname'
-OPT_IP='172.31.1.69'
-DEF_OPT_IP='dhcp'
-OPT_MACADDR='52:54:00:f1:c4:92'
-DEF_OPT_MACADDR='generate'
-OPT_NFS='no'
-DEF_OPT_NFS='no'
-OPT_NFS_QT='/home/qt/work'
-DEF_OPT_NFS_QT='/home/qt/work'
-OPT_PATHTRUST='no'
-DEF_OPT_PATHTRUST='no'
-OPT_PERL='no'
-DEF_OPT_PERL='no'
-OPT_POLICY='none'
-DEF_OPT_POLICY='none'
-OPT_PYTHON='no'
-DEF_OPT_PYTHON='no'
-OPT_QAUDIT='no'
-DEF_OPT_QAUDIT='no'
-OPT_QFIM='no'
-DEF_OPT_QFIM='no'
-OPT_QTD='no'
-DEF_OPT_QTD='no'
-OPT_QVM='no'
-DEF_OPT_QVM='no'
-OPT_REPOS='$QNX_STAGE_nto:$QNX_TARGET'
-DEF_OPT_REPOS='$QNX_STAGE_nto:$QNX_TARGET'
-OPT_ROOT='no'
-DEF_OPT_ROOT='no'
-OPT_SAFE='no'
-DEF_OPT_SAFE='no'
-OPT_SECPOL='no'
-DEF_OPT_SECPOL='no'
-OPT_SECURE_DATA='no'
-DEF_OPT_SECURE_DATA='no'
-OPT_SECURE_PROCFS='yes'
-DEF_OPT_SECURE_PROCFS='yes'
-OPT_SLM='no'
-DEF_OPT_SLM='no'
-OPT_SSHD_PREGEN='yes'
-DEF_OPT_SSHD_PREGEN='yes'
-OPT_SSH_IDENT='prompt'
-DEF_OPT_SSH_IDENT='prompt'
-OPT_SYS_INODES='1000'
-DEF_OPT_SYS_INODES='1000'
-OPT_SYS_SIZE='20'
-DEF_OPT_SYS_SIZE='20'
-OPT_TCG='no'
-DEF_OPT_TCG='no'
-OPT_TELNET='no'
-DEF_OPT_TELNET='no'
-OPT_TOMCRYPT='no'
-DEF_OPT_TOMCRYPT='no'
-OPT_TOYBOX='no'
-DEF_OPT_TOYBOX='no'
-OPT_TYPE='qemu'
-DEF_OPT_TYPE='qemu'
-OPT_TZ='UTC0'
-DEF_OPT_TZ='UTC0'
-OPT_UNION='yes'
-DEF_OPT_UNION='yes'
-OPT_USB='no'
-DEF_OPT_USB='no'
-OPT_VALGRIND='no'
-DEF_OPT_VALGRIND='no'
-OPT_ZONEINFO='no'
-DEF_OPT_ZONEINFO='no'

coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/data_files.custom

@@ -1,10 +0,0 @@
-# local/snippets/data_files.custom
-# Placeholder for local list of files to add to data partition
-
-home/root/.ssh/environment = {
-TERM=qansi
-PATH=__IFS_PATH__:/system/xbin
-#LD_LIBRARY_PATH=__PROC_LIB__:/home/qt/work/install/target/lib
-#QSG_RHI_BACKEND=software
-#QT_QPA_PLATFORM=offscreen
-}

coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/passwd_file.builtin

@@ -1,3 +0,0 @@
-root:x:0:0:Superuser:/data/home/root:/bin/sh
-sshd:x:15:6:sshd:/data/var/chroot/sshd:/bin/false
-qnxuser:x:__QNXUSER_UID__:__QNXUSER_GID__:User9:/data/home/qnxuser:/bin/sh

coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/shadow_file.builtin

@@ -1,2 +0,0 @@
-root::1475759054:0:0
-qnxuser:@S@f0J4xZibUbKllVqPMzetauCHLRi+9C8wTsxYXE5r7Pfhda5FI7zkObEmKogy01pAX5f/1niG2S2eLXbLs3xoww==@YjBmOTQwNzZiNzYwMzY3N2RkMGQ1NTZmNzA5MDFhMWY=:1476890273:0:0

coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/system_files.custom

@@ -1,29 +0,0 @@
-# local/snippets/system_files.custom
-# Placeholder for local list of files to add to system partition
-
-[perms=444] etc/ssh/sshd_config={
-HostKey /data/var/ssh/ssh_host_rsa_key
-HostKey /data/var/ssh/ssh_host_ed25519_key
-AuthorizedKeysFile .ssh/authorized_keys
-PermitUserEnvironment yes
-AuthenticationMethods none
-PermitEmptyPasswords yes
-PermitRootLogin yes
-PidFile none
-Subsystem sftp /system/xbin/sftp-server
-}
-
-# libraries Qt requires
-lib/libicuuc.so.67=usr/lib/libicuuc.so.67
-lib/libicudata.so.67=usr/lib/libicudata.so.67
-lib/libicui18n.so.67=usr/lib/libicui18n.so.67
-lib/libGLESv2.so.1=usr/lib/libGLESv2.so.1
-lib/libEGL.so.1=usr/lib/libEGL.so.1
-lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1
-lib/libz.so.2=usr/lib/libz.so.2
-lib/libxml2.so.2=usr/lib/libxml2.so.2
-lib/libfreetype.so.1=usr/lib/libfreetype.so.1
-lib/libpng16.so.16=usr/lib/libpng16.so.16
-lib/liblzma.so.5=usr/lib/liblzma.so.5
-lib/libbacktrace.so.1=usr/lib/libbacktrace.so.1
-lib/libm.so.3=lib/libm.so.3

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.14
+targetVersion=0.2.13-alpha-0
-sha1=281680c0fc2c09173e94d12ba45d9f1b8e62e5b3
+sha1=0cb28f7408e5246bc71132f27d86301c30e16c74
 installSccache "$targetArch" "$targetVersion" "$sha1"

coin/provisioning/common/macos/cmake.sh

@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
 # shellcheck source=../unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 
-majorminorversion="3.21"
+majorminorversion="3.19"
-version="3.21.1"
+version="3.19.2"
 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-macos-universal.tar.gz"
-SHA1="5845da632d0f073c7761df4e78efb4405e00ac5a"
+SHA1="753c72931e9c76c969255c197781635e7110e363"
 appPrefix="cmake-$version-macos-universal"
 
 InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"

coin/provisioning/common/macos/disable_net_lso.sh

@@ -1,64 +0,0 @@
-#!/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/java.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -38,27 +38,27 @@
 set -ex
 
 echo "Installing Java Development Kit"
-version=11.0.12
+
-targetFile=jdk-${version}_osx-x64_bin.dmg
+targetFile=jdk-8u102-macosx-x64.dmg
 
 url=ci-files01-hki.intra.qt.io:/hdd/www/input/mac
-# url_alt=https://www.oracle.com/java/technologies/downloads/#java11-linux
+# url_alt=http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-macosx-x64.dmg
 
 echo "Mounting $targetFile"
 sudo mkdir -p /Volumes/files
-sudo mount -o locallocks "$url" /Volumes/files
+sudo mount "$url" /Volumes/files
 
 sudo cp "/Volumes/files/$targetFile" /tmp
 sudo umount /Volumes/files
 sudo hdiutil attach "/tmp/$targetFile"
 
 echo Installing JDK
-cd /Volumes/JDK\ ${version} && sudo installer -package JDK\ ${version}.pkg -target /
+cd /Volumes/JDK\ 8\ Update\ 102/ && sudo installer -package JDK\ 8\ Update\ 102.pkg -target /
 
 echo "Unmounting $targetFile"
-sudo hdiutil unmount /Volumes/JDK\ ${version} -force
+sudo hdiutil unmount /Volumes/JDK\ 8\ Update\ 102/ -force
 
 echo "Disable auto update"
 sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false
 
-echo "JDK Version = ${version}" >> ~/versions.txt
+echo "JDK Version = 8 update 102" >> ~/versions.txt

coin/provisioning/common/macos/makeuniversal.sh

@@ -1,59 +0,0 @@
-#!/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

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2021 The Qt Company Ltd.
+## Copyright (C) 2020 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -38,10 +38,10 @@
 # shellcheck source=./../unix/InstallFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
 
-version="1.10.2"
+version="1.10.1"
-internalUrl="http://ci-files01-hki.intra.qt.io/input/mac/ninja-mac_v${version}.zip"
+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="95d0ca5e7c67ab7181c87e6a6ec59d11b1ff2d30"
+SHA1="de7c594e3bf76f7c86b9d6874d49c8824b2a76e1"
 DestDir="/usr/local/bin/"
 
 InstallFromCompressedFileFromURL "$internalUrl" "$externalUrl" "$SHA1" "$DestDir" ""

coin/provisioning/common/macos/nodejs.sh

@@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 # This script will install Nodejs
 
 version="14.16.1"
-urlCache="http://ci-files01-hki.intra.qt.io/input/nodejs/node-v$version.pkg"
+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"
 

coin/provisioning/common/macos/python3.sh

@@ -43,23 +43,23 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 # shellcheck source=./pip.sh
 source "${BASH_SOURCE%/*}/pip.sh"
 
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.9.6-macos11.pkg"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.7.4-macosx10.9.pkg"
-AltUrl="https://www.python.org/ftp/python/3.9.6/python-3.9.6-macos11.pkg"
+AltUrl="https://www.python.org/ftp/python/3.7.4/python-3.7.4-macosx10.9.pkg"
-SHA1="2af5277c2e197719eb4b820430dee5d89e2577b6"
+SHA1="ef8a6b1abba6a6e8553916a881af440705653fa8"
 DestDir="/"
 
 InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
 
-InstallPip python3.9
+InstallPip python3.7
 
-/Library/Frameworks/Python.framework/Versions/3.9/bin/pip3 install virtualenv wheel
+/Library/Frameworks/Python.framework/Versions/3.7/bin/pip3 install virtualenv wheel
 
-SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin"
+SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.7/bin"
-SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin"
+SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.7/bin"
 
 # Install all needed packages in a special wheel cache directory
-/Library/Frameworks/Python.framework/Versions/3.9/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt
+/Library/Frameworks/Python.framework/Versions/3.7/bin/pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../shared/requirements.txt
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
 
-echo "python3 = 3.9.6" >> ~/versions.txt
+echo "python3 = 3.7.4" >> ~/versions.txt
 

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.14
+targetVersion=0.2.13-alpha-0
-sha1=764bc1664c0ff616d9980a6d127175d0a2041781
+sha1=8fe82ddc05a25debc314ea1a8cda665cddb90f72
 installSccache "$targetArch" "$targetVersion" "$sha1"

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

@@ -39,10 +39,3 @@ 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/shared/requirements.txt

@@ -3,17 +3,17 @@
 # Then all the packages. Duplicates are wanted as every module should install
 # all packages it needs and shouldn't depend on a package from another module
 #
-# qtinterfaceframework
+# qtivi
-antlr4-python3-runtime==4.9.2
+antlr4-python3-runtime==4.7.1
 argh==0.26.2
-click==8.0.1
+click==6.7
-coloredlogs==15.0.1
+coloredlogs==10.0
-humanfriendly==10.0
+humanfriendly==4.15.1
-Jinja2==3.0.1
+Jinja2==2.10.3
-MarkupSafe==2.0.1
+MarkupSafe==1.0
-path.py==12.5.0
+path.py==11.0.1
 pathtools==0.1.2
-PyYAML==5.4.1
+PyYAML==5.1
-six==1.16.0
+six==1.11.0
-typing==3.7.4
+typing==3.6.4
-watchdog==2.1.5
+watchdog==0.8.3

coin/provisioning/common/unix/SetEnvVar.sh

@@ -47,6 +47,5 @@ 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,36 +39,34 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
 
-version="2.0.14"
+version="1.39.8"
-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="5fbdca8ed238b90ab8c3656831fcc5eb1ce08c58"
+sha1Emscripten="a593ea3b4ab7e3d57e1232b19a903ccf8f137d2f"
 
 # 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/$versionTag/wasm-binaries.tbz2"
+    urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/mac/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2"
     urlWasmBinariesCache="$urlCache/macos/wasm-binaries.$version.tbz2"
-    sha1WasmBinaries="86dc16b299543cf593abc6f0137f8d0d723baddb"
+    sha1WasmBinaries="aedb30fb07d565c35305af0920ab072ae743895d"
 
-    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-$versionNode-darwin-x64.tar.gz"
+    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-darwin-x64.tar.gz"
-    urlNodeBinariesCache="$urlCache/mac/node-$versionNode-darwin-x64.tar.gz"
+    urlNodeBinariesCache="$urlCache/mac/node-v12.9.1-darwin-x64.tar.gz"
-    sha1NodeBinaries="6db16d024ea9e5f2ebdd0c1ef07ea67c2004ce93"
+    sha1NodeBinaries="f5976321ded091e70358e406b223f6fd64e35a43"
-    pathNodeExecutable="node-$versionNode-darwin-x64/bin/node"
+    pathNodeExecutable='node-v12.9.1-darwin-x64/bin/node'
 else
-    urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/$versionTag/wasm-binaries.tbz2"
+    urlWasmBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.tbz2"
     urlWasmBinariesCache="$urlCache/linux/wasm-binaries.$version.tbz2"
-    sha1WasmBinaries="9724185c06c461edec3495e37e034066479b9ccf"
+    sha1WasmBinaries="eb7fc94aa79a6e215272e2586173515aa37c3141"
 
-    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-$versionNode-linux-x64.tar.xz"
+    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-linux-x64.tar.xz"
-    urlNodeBinariesCache="$urlCache/linux/node-$versionNode-linux-x64.tar.xz"
+    urlNodeBinariesCache="$urlCache/linux/node-v12.9.1-linux-x64.tar.xz"
-    sha1NodeBinaries="ca7ce363ceaf71b65e85243a71252c20cfd97982"
+    sha1NodeBinaries="cde96023b468d593c50de27470dd714c8cfda9aa"
-    pathNodeExecutable="node-$versionNode-linux-x64/bin/node"
+    pathNodeExecutable='node-v12.9.1-linux-x64/bin/node'
 fi
 
 sudo mkdir "$targetFolder"
@@ -81,17 +79,15 @@ sudo chmod -R a+rwx "$targetFolder"
 
 echo "Writing $targetFolder/.emscripten"
 cat <<EOM >"$targetFolder/.emscripten"
-emsdk_path = '$targetFolder'
+EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version'
-EMSCRIPTEN_ROOT = emsdk_path + '/emscripten-$version'
+LLVM_ROOT='$targetFolder/install/bin'
-LLVM_ROOT = emsdk_path + '/install/bin'
+BINARYEN_ROOT='$targetFolder/install'
-BINARYEN_ROOT = emsdk_path + '/install'
+NODE_JS='$targetFolder/$pathNodeExecutable'
-NODE_JS = emsdk_path + '/$pathNodeExecutable'
 TEMP_DIR = '/tmp'
 EOM
 
 SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-$version/\""
 SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version"
-SetEnvVar "EMSDK" "$targetFolder"
+SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"
-SetEnvVar "EMSDK_NODE" "$targetFolder/$pathNodeExecutable"
 
 echo "Emsdk = $version" >> ~/versions.txt

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

@@ -1,20 +0,0 @@
-#!/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

@@ -50,8 +50,8 @@ sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
 opensslHome="${HOME}/openssl-${version}"
 opensslSource="${opensslHome}-src"
 DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
-mkdir -p "$opensslSource"
+tar -xzf "$targetFile" -C "$HOME"
-tar -xzf "$targetFile" --strip 1 -C "$opensslSource"
+mv "$opensslHome" "$opensslSource"
 cd "$opensslSource"
 pwd
 
@@ -65,55 +65,18 @@ if [[ "$os" == "linux" ]]; then
         echo "export LD_LIBRARY_PATH=$opensslHome/lib:$LD_LIBRARY_PATH" >> ~/.bashrc
     fi
 
-elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
+elif [ "$os" == "macos" ]; then
     # Below target location has been hard coded into Coin.
     # QTQAINFRA-1195
-    echo "prefix=$prefix"
+    openssl_install_dir=/usr/local/openssl-$version
-    if [[ -z "$prefix" ]]; then
+    opensslTargetLocation="/usr/local/opt/openssl"
-        prefix="/usr/local"
+    sudo ./Configure --prefix=$openssl_install_dir shared no-ssl3-method enable-ec_nistp_64_gcc_128 darwin64-x86_64-cc "-Wa,--noexecstack"
-    fi
+    echo "Running 'make' for OpenSSL"
-    openssl_install_dir="$prefix/openssl-$version"
+    # shellcheck disable=SC2024
-    opensslTargetLocation="$prefix/opt/openssl"
+    sudo make --silent > /tmp/openssl_make.log 2>&1
-
+    echo "Running 'make install' for OpenSSL"
-    commonFlags="no-tests shared no-ssl3-method enable-ec_nistp_64_gcc_128 -Wa,--noexecstack"
+    # shellcheck disable=SC2024
-
+    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

@@ -78,6 +78,5 @@ 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,18 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
 
-libclang_version=12.0
+libclang_version=10.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="bb9223450c1c36ee37d8c91e876dba82db117a7a"
+    sha1="6e019c428511e74c5d46d0ddca79d8e804b67f8a"
-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-CentOS8.3-gcc9.2-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="d02e4dd30fe3f810c3a0cdcbed5870dec56ed91b"
 else
     version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu18.04-gcc9.2-x86_64.7z"
-    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-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"
-    sha1="81b3e640befa23b5cdebd59e206dc79e4de20ba3"
+    sha1="08f352d411e4b47c2a259c3b120d7cb2db01e41d"
 fi
 
 zip="/tmp/libclang.7z"

coin/provisioning/common/unix/squishInstall.sh

@@ -41,19 +41,23 @@ 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.7.1"
+version="6.7-20210318-1241"
-qtBranch="62x"
+qtBranch="60x"
 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/515x/.squish-3-license"
 licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a"
 if uname -a |grep -q Darwin; then
-    compressedFolder="prebuild-squish-$version-515x-macx86_64.tar.gz"
+    #macOS package had to redo, so it's having same filename but different location to
-    sha1="1526d4d57f8025f83aad836a43e8fa0317dbddc2"
+    #keep previous provisioning in working state
+    preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable/6.7_rerun"
+    version="6.7-20210301-1401"
+    compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz"
+    sha1="e82701ffc1eb465dce3163ce7eab9ccaedc568c1"
 else
      compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz"
-     sha1="d412c3389d95a65341b51d2e14cba47ce3b54a86"
+     sha1="80b3f36e760963a6989a49c79818bf8671d1932a"
 fi
 
 mountFolder="/tmp/squish"
@@ -77,11 +81,7 @@ fi
 targetFileMount="$mountFolder"/"$compressedFolder"
 
 echo "Mounting $preBuildCacheUrl to $mountFolder"
-if uname -a |grep -q Darwin; then
+sudo mount "$preBuildCacheUrl" "$mountFolder"
-   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,9 +96,6 @@ echo "Unmounting $mountFolder"
 sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder"
 
 sudo mv "$installFolder/rta_squish_$version" "$squishFolder"
-if uname -a |grep -q Darwin; then
-    sudo xattr -r -c "$squishFolder"
-fi
 
 if uname -a |grep -q "Ubuntu"; then
     if [ ! -e "/usr/lib/tcl8.6" ]; then

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 "$zip"
+Remove-Item -Path $zip
 
 Set-EnvironmentVariable "QT3DSTUDIO_3RDPARTY_DIR" "C:/Utils/Qt3DStudio3rdparty"