Update submodules on '6.1.2' in qt/qt5

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

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

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}")
-            # Found a repo entry or end of file. Add the last seen dependency.
-            if(NOT dependency STREQUAL "")
-                if(revision STREQUAL "")
+        if(line STREQUAL "dependencies:")
+            set(found_dependencies 1)
+        elseif(found_dependencies)
+            if(line MATCHES "^    ref: (.*)$")
+                set(revision "${CMAKE_MATCH_1}")
+                list(APPEND dependencies ${dependency}/${revision})
+                set(dependency "")
+            elseif (line MATCHES "^  (.*):$")
+                if(dependency)
                     message(FATAL_ERROR "Format error in ${depends_file} - ${dependency} does not specify revision!")
                 endif()
-                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 "(.*)/([^/]+)/([^/]+)")
-            set(dependency "${CMAKE_MATCH_1}")
-            set(revision "${CMAKE_MATCH_2}")
-            set(required "${CMAKE_MATCH_3}")
-            if(required)
-                set_property(GLOBAL APPEND PROPERTY QT_REQUIRED_DEPS_FOR_${module} ${dependency})
-            endif()
-        else()
-            message(FATAL_ERROR "Internal Error: wrong dependency format ${dependency}")
-        endif()
+        string(FIND "${dependency}" "/" splitindex REVERSE)
+        string(SUBSTRING "${dependency}" ${splitindex} -1 revision)
+        string(SUBSTRING "${revision}" 1 -1 revision)
+        string(SUBSTRING "${dependency}" 0 ${splitindex} dependency)
         list(APPEND modules_dependencies "${dependency}")
         list(FIND ordered "${dependency}" dindex)
         if (dindex EQUAL -1)

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/platform_configs/cmake_platforms.yaml

@@ -4,7 +4,6 @@ Include: [
     cmake_platforms_target_android_host_linux.yaml,
     cmake_platforms_target_android_host_macos.yaml,
     cmake_platforms_target_android_host_windows.yaml,
-    cmake_platforms_wasm.yaml,
     macos.yaml
     ]
 Configurations:
@@ -47,7 +46,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']
 -
-    Id: 'OpenSUSE-15.3-host'
     Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
     Compiler: 'GCC'
     Features: ['Sccache']
@@ -79,7 +77,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"]
@@ -88,18 +85,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'
-    Compiler: 'MSVC2019'
-    Target arch: 'arm64'
-    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging']
-    Platform dependency: 'Windows10-MSVC2019-x64-host'
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
-        'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
--
-    Id: 'RHEL-8.2-host'
-    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
+    Id: 'CentOS-8.3-host'
+    Template: 'qtci-linux-CentOS-8.3-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'
@@ -111,7 +98,7 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
     Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
     Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
 -

coin/platform_configs/cmake_platforms_qemu.yaml

@@ -10,7 +10,7 @@ Configurations:
     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',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
-        "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',
         'QT_QUICK_BACKEND=software',
@@ -26,7 +26,7 @@ Configurations:
     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',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
-        "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',
         'QT_QUICK_BACKEND=software',
@@ -42,7 +42,7 @@ Configurations:
     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',
         'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
-        "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',

coin/platform_configs/cmake_platforms_target_android_host_linux.yaml

@@ -1,45 +1,45 @@
 Version: 2
 Configurations:
 -
-    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.3-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.3-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_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.3-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.3-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_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.3-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.3-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_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.3-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.3-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_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',

coin/platform_configs/cmake_platforms_target_android_host_macos.yaml

@@ -6,7 +6,7 @@ Configurations:
     Target arch: 'arm64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_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',
@@ -17,7 +17,7 @@ Configurations:
     Target arch: 'armv7'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_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',
@@ -28,7 +28,7 @@ Configurations:
     Target arch: 'x86'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_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',
@@ -39,7 +39,7 @@ Configurations:
     Target arch: 'x86_64'
     Compiler: 'Clang'
     Target compiler: 'Clang'
-    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_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',

coin/platform_configs/cmake_platforms_wasm.yaml

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

coin/platform_configs/flashing-wizard.yaml

@@ -13,7 +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.3-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: ['Sccache', 'DisableTests']
-      Environment variables: [
-          'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_HOST_PATH=/home/qt/work/install -DQT_BUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DQT_QMAKE_TARGET_MKSPEC=devices/integrity-armv8-SA8155P -DINPUT_harfbuzz=no -DFEATURE_library=OFF -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DFEATURE_printdialog=OFF --debug-trycompile -DFEATURE_quick3d_assimp=OFF -DFEATURE_dbus=OFF -GNinja -DUNIX=ON -DFEATURE_gtk3=OFF -DFEATURE_glib=OFF -DFEATURE_libudev=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_sql_mysql=OFF -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64',
-          'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
-          'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel',
-          'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',
-          'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public',
-          'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/',
-          'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH',
-          'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_system_webp=OFF']

coin/platform_configs/ios-tests.yaml

@@ -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,9 +1,5 @@
 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'

coin/platform_configs/macos.yaml

@@ -2,15 +2,13 @@ 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'
+        Id: 'macos-latest-xcode-x86_64-packaging-build'
         Template: 'qtci-macos-11.0-x86_64-102'
         Compiler: 'Clang'
-        Target arch: 'x86_64-arm64'
         Features: ['Packaging', 'Sccache', 'DoNotRunTests']
-        Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..'
+        Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -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 -DFEATURE_gds=OFF',
+            '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'
             ]
 
@@ -20,50 +18,29 @@ Configurations:
         Template: 'qtci-macos-10.14-x86_64'
         Compiler: 'Clang'
         Features: ['Sccache', 'TestOnly', 'Packaging']
-        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+        Platform dependency: 'macos-latest-xcode-x86_64-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'
+        Platform dependency: 'macos-latest-xcode-x86_64-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'
+        Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
 
-    # Build x86_64 developer-builds for all modules, but only run tests for qtbase and declarative.
+    # Build developer builds for all modules, but only run tests for qtbase and declarative.
     # See macos-developer-build-tests.yaml for the tests
     -
         Id: 'macos-latest-xcode-x86_64-developer-build'
         Template: 'qtci-macos-11.0-x86_64-102'
         Compiler: 'Clang'
         Features: ['Sccache', 'DoNotRunTests']
-        Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+        Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace  -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR=/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'
             ]
-
-    # Build arm64 developer-builds for all modules, and run their tests. This ensures that we have full
-    # arm64 build and test coverage, regardless of possible issues with the universal build.
-    -
-        Id: 'macos-latest-xcode-arm64-developer-build'
-        Template: 'qtci-macos-11.0-arm64'
-        Compiler: 'Clang'
-        Features: ['DoNotRunTests']
-        Configure arguments: '-DFEATURE_developer_build=ON -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..'
-    -
-        Id: 'macos-11-arm64-developer-build-tests'
-        Template: 'qtci-macos-11.0-arm64'
-        Compiler: 'Clang'
-        Features: ['TestOnly']
-        Platform dependency: 'macos-latest-xcode-arm64-developer-build'

coin/platform_configs/qdb.yaml

@@ -3,28 +3,38 @@ Configurations:
 -
     Template: 'qtci-windows-10-x86_64-52'
     Compiler: 'MSVC2019'
-    Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
-    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', 'Sccache', "Static"]
+    Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo" -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DBUILD_SHARED_LIBS=OFF'
     Environment variables: [
         'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
     ]
 -
-    Id: 'RHEL-8.2-host'
-    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
+    Id: 'CentOS-8.3-host'
+    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
     Compiler: 'GCC'
-    Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
-    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'
+    Features: ['Packaging', 'Sccache', "Static"]
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY -DBUILD_SHARED_LIBS=OFF'
     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-11.0'
     Template: 'qtci-macos-11.0-x86_64-102'
     Compiler: 'Clang'
-    Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
-    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'
+    Target compiler: 'Clang'
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=OFF -DFEATURE_headersclean=ON -DFEATURE_framework=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DBUILD_SHARED_LIBS=OFF'
+    Features: ['Packaging', 'Sccache', "Static"]
+    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
+-
+    Id: 'Windows10-Mingw8-x64-host'
+    Template: 'qtci-windows-10-x86_64-52'
+    Compiler: 'Mingw'
+    Features: ['Packaging', 'Sccache', "Static"]
+    Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=OFF -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}}\.. -DBUILD_SHARED_LIBS=OFF'
     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'
+        '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/qt-creator.yaml

@@ -16,7 +16,7 @@ Configurations:
     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'
+    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
     Compiler: 'GCC'
     Features: ['Packaging', 'Sccache', 'DisableTests']
     Configure arguments: ''

coin/platform_configs/qtbase.yaml

@@ -2,18 +2,16 @@ Version: 2
 Include: [
     cmake_platforms.yaml,
     cmake_platforms_static_tests.yaml,
-    macos-developer-build-tests.yaml,
-    integrity.yaml,
-    ios-tests.yaml
+    macos-developer-build-tests.yaml
 ]
 Configurations:
 -
-    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.3-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.3-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_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',

coin/platform_configs/qtdeclarative.yaml

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

coin/platform_configs/qtimageformats.yaml

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

coin/platform_configs/qtivi.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/qtsaferenderer.yaml

@@ -13,7 +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-linux-RHEL-8.2-x86_64-50'
+    Template: 'qtci-linux-CentOS-8.3-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/qtsdk.yaml

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

coin/platform_configs/qtsensors.yaml

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

coin/platform_configs/qtshadertools.yaml

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

coin/platform_configs/qtsvg.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    integrity.yaml
-]
+Include: [cmake_platforms.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: [
-    cmake_platforms.yaml,
-    macos-developer-build-tests.yaml
-]
-Configurations: []
+Module only: True
+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', '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.3-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/qtwebview.yaml

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

coin/platform_configs/tqtc-qmlcachegenplus.yaml

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

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

@@ -1,48 +0,0 @@
-### RHEL 8.2 ###
-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/provisioning/common/linux/android_linux.sh

@@ -55,8 +55,8 @@ toolsVersion="2.1"
 toolsFile="commandlinetools-linux-6609375_latest.zip"
 ndkVersion="r22b"
 ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
-sdkBuildToolsVersion="30.0.3"
-sdkApiLevel="android-30"
+sdkBuildToolsVersion="29.0.3"
+sdkApiLevel="android-29"
 
 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
 ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc"

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"
-version="3.21.1"
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz"
-AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz"
-SHA1="591e3b0729ae07c37c1fa3c6adde7cc21387059d"
+majorminorversion="3.19"
+version="3.19.2"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz"
+AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz"
+SHA1="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/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,28 +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.ci.local/input/integrity/integrity_toolchain_es7_patched.zip"
-urlToolchainAddons="http://ci-files01-hki.ci.local/input/integrity/integrity_toolchain_addons.zip"
-SHA1_toolchainEs7="e890fe332a81f8345fed3dff89b30019d9989765"
-SHA1_toolchainAddons="1eb838edca4edaa3d9076b5ce4aea6409ffaa022"
-targetFolder="$HOME"
+version="11.4.4"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz"
+AltUrl="$PrimaryUrl" # we lack an external source for this
+SHA1="4afa3c15e13c91734951b73f6b21388294c5d794"
+targetFolder="/opt/ghs"
 appPrefix=""
 
-echo "Install Integrity toolchain es7"
-InstallFromCompressedFileFromURL "$urlToolchainEs7" "$urlToolchainEs7" "$SHA1_toolchainEs7" "$targetFolder" "$appPrefix"
+InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
 
-echo "Install Integrity toochain addons"
-DownloadURL "$urlToolchainAddons" "$urlToolchainAddons" "$SHA1_toolchainAddons" "/tmp/integrity_toolchain_addons.zip"
-unzip "/tmp/integrity_toolchain_addons.zip" -d "/tmp"
-mv /tmp/toolchain/* $targetFolder/toolchain
-mv $targetFolder/toolchain $targetFolder/integrity_toolchain
-sudo rm -fr /tmp/toolchain
+SetEnvVar "INTEGRITY_BSP" "platform-cortex-a9"
+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 "INTEGRITY = $version" >> ~/versions.txt

coin/provisioning/common/linux/openssl_for_android_linux.sh

@@ -71,9 +71,9 @@ cd "$opensslHome"
 PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
 PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
 '
-prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21.tar.gz"
+prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_g_for-android-ndk-21.tar.gz"
 targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
-sha="8c4db1eb8460d749c998a0e033b3939123cbc5ac"
+sha="2998e1a3bc9aa4bc7475d1be270db9f4109fca00"
 DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
 tar -xzf "$targetFile" -C "${HOME}"
 

coin/provisioning/common/linux/qnx_660.sh

@@ -33,7 +33,34 @@
 ##
 #############################################################################
 
+# This script installs QNX 6.6.0.
+
 set -ex
 
-# shellcheck source=../common/linux/integrity.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/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/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"
-version="3.21.1"
+majorminorversion="3.19"
+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/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

@@ -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.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/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"
-versionTag="fc5562126762ab26c4757147a3b4c24e85a7289e"
-versionNode="v14.15.5"
+version="1.39.8"
 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"
-    urlNodeBinariesCache="$urlCache/mac/node-$versionNode-darwin-x64.tar.gz"
-    sha1NodeBinaries="6db16d024ea9e5f2ebdd0c1ef07ea67c2004ce93"
-    pathNodeExecutable="node-$versionNode-darwin-x64/bin/node"
+    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-darwin-x64.tar.gz"
+    urlNodeBinariesCache="$urlCache/mac/node-v12.9.1-darwin-x64.tar.gz"
+    sha1NodeBinaries="f5976321ded091e70358e406b223f6fd64e35a43"
+    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"
-    urlNodeBinariesCache="$urlCache/linux/node-$versionNode-linux-x64.tar.xz"
-    sha1NodeBinaries="ca7ce363ceaf71b65e85243a71252c20cfd97982"
-    pathNodeExecutable="node-$versionNode-linux-x64/bin/node"
+    urlNodeBinariesExternal="https://storage.googleapis.com/webassembly/emscripten-releases-builds/deps/node-v12.9.1-linux-x64.tar.xz"
+    urlNodeBinariesCache="$urlCache/linux/node-v12.9.1-linux-x64.tar.xz"
+    sha1NodeBinaries="cde96023b468d593c50de27470dd714c8cfda9aa"
+    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 = emsdk_path + '/emscripten-$version'
-LLVM_ROOT = emsdk_path + '/install/bin'
-BINARYEN_ROOT = emsdk_path + '/install'
-NODE_JS = emsdk_path + '/$pathNodeExecutable'
+EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version'
+LLVM_ROOT='$targetFolder/install/bin'
+BINARYEN_ROOT='$targetFolder/install'
+NODE_JS='$targetFolder/$pathNodeExecutable'
 TEMP_DIR = '/tmp'
 EOM
 
 SetEnvVar "PATH" "\"\$PATH:$targetFolder/emscripten-$version/\""
 SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version"
-SetEnvVar "EMSDK" "$targetFolder"
-SetEnvVar "EMSDK_NODE" "$targetFolder/$pathNodeExecutable"
+SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten"
 
 echo "Emsdk = $version" >> ~/versions.txt

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" --strip 1 -C "$opensslSource"
+tar -xzf "$targetFile" -C "$HOME"
+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"
-    if [[ -z "$prefix" ]]; then
-        prefix="/usr/local"
-    fi
-    openssl_install_dir="$prefix/openssl-$version"
-    opensslTargetLocation="$prefix/opt/openssl"
-
-    commonFlags="no-tests shared no-ssl3-method enable-ec_nistp_64_gcc_128 -Wa,--noexecstack"
-
-    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
+    openssl_install_dir=/usr/local/openssl-$version
+    opensslTargetLocation="/usr/local/opt/openssl"
+    sudo ./Configure --prefix=$openssl_install_dir shared no-ssl3-method enable-ec_nistp_64_gcc_128 darwin64-x86_64-cc "-Wa,--noexecstack"
+    echo "Running 'make' for OpenSSL"
+    # shellcheck disable=SC2024
+    sudo make --silent > /tmp/openssl_make.log 2>&1
+    echo "Running 'make install' for OpenSSL"
+    # shellcheck disable=SC2024
+    sudo make --silent install > /tmp/openssl_make_install.log 2>&1
 
     path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/')
     sudo mkdir -p "$path"

coin/provisioning/common/unix/libclang.sh

@@ -47,23 +47,23 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
 # shellcheck source=./DownloadURL.sh
 source "${BASH_SOURCE%/*}/DownloadURL.sh"
 
-libclang_version=12.0
+libclang_version=11.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"
-elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat" | grep -v "8" ; then
+    sha1="2ea23914089df532385a527861feb010a867000b"
+elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat"; then
     version=$libclang_version
-    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-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"
+    url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
+    url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Rhel7.6-gcc5.3-x86_64.7z"
+    sha1="eeb9b9bed81308cc4c7a7ac177e15baec7214d5e"
 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_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
-    sha1="81b3e640befa23b5cdebd59e206dc79e4de20ba3"
+    sha1="57ebaac89bbe51a661f31a13c5e3829e34aa8b80"
 fi
 
 zip="/tmp/libclang.7z"

coin/provisioning/common/unix/squishInstall.sh

@@ -41,20 +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-20210615-1349"
-qtBranch="61x"
+version="6.7-20210318-1241"
+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
+    #macOS package had to redo, so it's having same filename but different location to
+    #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="15f7f8e9944fdc36b9b6e37576d6ca96713a8ac5"
+    sha1="e82701ffc1eb465dce3163ce7eab9ccaedc568c1"
 else
      compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz"
-     sha1="e32e5db1713e3050c3cdce696d7509c468afc7d3"
+     sha1="80b3f36e760963a6989a49c79818bf8671d1932a"
 fi
 
 mountFolder="/tmp/squish"

coin/provisioning/common/windows/android.ps1

@@ -51,8 +51,8 @@ $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
 $toolsVersion = "2.1"
 $toolsFile = "commandlinetools-win-6609375_latest.zip"
 $sdkApi = "ANDROID_API_VERSION"
-$sdkApiLevel = "android-30"
-$sdkBuildToolsVersion = "30.0.3"
+$sdkApiLevel = "android-29"
+$sdkBuildToolsVersion = "29.0.3"
 $toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
 $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
 $toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"

coin/provisioning/common/windows/cmake.ps1

@@ -33,21 +33,21 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-$majorminorversion = "3.21"
-$version = "3.21.1"
+$majorminorversion = "3.19"
+$version = "3.19.2"
 
-$zip = Get-DownloadLocation ("cmake-" + $version + "-windows-i386.zip")
-$officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-windows-i386.zip"
-$cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-windows-i386.zip"
+$zip = Get-DownloadLocation ("cmake-" + $version + "-win32-x86.zip")
+$officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip"
+$cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip"
 
 Write-Host "Removing old cmake"
 Remove "C:\CMake"
 
 Download $officialurl $cachedurl $zip
-Verify-Checksum $zip "7271b8c568f428af433f3aae80c292ef868993c5"
+Verify-Checksum $zip "5e42a287610a619c3a150376d9aaad31282cdcd4"
 
 Extract-7Zip $zip C:
-$defaultinstallfolder = "C:\cmake-" + $version + "-windows-i386"
+$defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"
 Rename-Item $defaultinstallfolder C:\CMake
 
 Add-Path "C:\CMake\bin"

coin/provisioning/common/windows/emsdk.ps1

@@ -35,9 +35,8 @@
 
 # This script will install emscripten needed by WebAssembly
 
-$version = "2.0.14"
-$versionTag="fc5562126762ab26c4757147a3b4c24e85a7289e"
-$versionNode = "14.15.5"
+$version = "1.39.8"
+$versionNode = "12.9.1"
 $versionWinPython = "3.7.4"
 $versionJre = "8_update_152"
 
@@ -49,13 +48,13 @@ $urlCache = "http://ci-files01-hki.intra.qt.io/input/emsdk"
 
 $urlEmscriptenCache="$urlCache/emscripten.$version.zip"
 
-$urlWasmBinariesExternal="$urlEmscripten/win/$versionTag/wasm-binaries.zip"
-$urlWasmBinariesCache="$urlCache/windows/wasm-binaries.$version.zip"
-$sha1WasmBinaries="a6f3f49df50fe7c8a0e61065b80fd885b8266bf3"
+$urlWasmBinariesExternal="$urlEmscripten/win/9e60f34accb4627d7358223862a7e74291886ab6/wasm-binaries.zip"
+$urlWasmBinariesCache="$urlCache\windows\wasm-binaries.$version.zip"
+$sha1WasmBinaries="E94DCA7BA0526F88EDDBE45A0A0F61778D173603"
 
 $urlOfficialNode = "$urlEmscripten/deps/node-v$versionNode-win-x64.zip"
 $urlCacheNode = "$urlCache/windows/node-v$versionNode-win-x64.zip"
-$sha1Node = "7df0af8aa3c128cff43d77dd6f3a163d405d0469"
+$sha1Node = "D064145694578D6617AA99C694772D21480B6B6D"
 
 $urlOfficialWinPython = "$urlEmscripten/deps/python-$versionWinPython-embed-amd64-patched.zip"
 $urlCacheWinPython = "$urlCache/windows/python-$versionWinPython-embed-amd64-patched.zip"
@@ -65,8 +64,12 @@ $urlOfficialProtableJre = "$urlEmscripten/deps/portable_jre_${versionJre}_64bit.
 $urlCacheProtableJre = "$urlCache/windows/portable_jre_${versionJre}_64bit.zip"
 $sha1ProtableJre = "6830524ec8b16742f956897abb6b6f5ef890a1c2"
 
+$urlOfficialEmscripten = "https://github.com/kripken/emscripten/archive/$version.zip"
+$urlCacheEmscripten = "$urlCache/windows/emscripten-$version.zip"
+$sha1Emscripten = "3721DC133824BA59CDBDFC93704D47CE265F2AFE"
+
 $installLocationEmsdk = "C:\\Utils\\emsdk"
-$temp = "C:\\Windows\\Temp"
+$temp = "C:\Windows\Temp"
 
 function Install {
 
@@ -90,28 +93,29 @@ Install $urlWasmBinariesExternal $urlWasmBinariesCache $sha1WasmBinaries "$temp\
 Install $urlOfficialNode $urlCacheNode $sha1Node "$temp\node-v$versionNode-win-x64.zip" "$installLocationEmsdk"
 Install $urlOfficialWinPython $urlCacheWinPython $sha1WinPython "$temp\python-$versionWinPython-embed-amd64-patched.zip" "$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched"
 Install $urlOfficialProtableJre $urlCacheProtableJre $sha1ProtableJre "$temp\portable_jre_$versionJre_64bit.zip" "$installLocationEmsdk"
+Install $urlOfficialEmscripten $urlCacheEmscripten $sha1Emscripten "$temp\emscripten-$version.zip" "$installLocationEmsdk"
 
-cd $installLocationEmsdk\emscripten-llvm-e$version\install\emscripten
-"emsdk_path = '$installLocationEmsdk'"| Out-File '.emscripten' -Append -Encoding ascii
-"LLVM_ROOT = emsdk_path + '/emscripten-llvm-e$version/install/bin'" | Out-File '.emscripten' -Append -Encoding ascii
-"BINARYEN_ROOT = emsdk_path + '/emscripten-llvm-e$version/install'" | Out-File '.emscripten' -Append -Encoding ascii
-"PYTHON = emsdk_path + '/python-$versionWinPython-embed-amd64-patched/python.exe'" | Out-File '.emscripten' -Append -Encoding ascii
-"NODE_JS = emsdk_path + '/node-v$versionNode-win-x64/bin/node.exe'" | Out-File '.emscripten' -Append -Encoding ascii
-"EMSCRIPTEN_ROOT = emsdk_path +'' " | Out-File '.emscripten' -Append -Encoding ascii
-"JAVA = emsdk_path + '/Java64'" | Out-File '.emscripten' -Append -Encoding ascii
-"TEMP_DIR = '/tmp'" | Out-File '.emscripten' -Append -Encoding ascii
-"COMPILER_ENGINE = NODE_JS" | Out-File '.emscripten' -Append -Encoding ascii
-"JS_ENGINES = [NODE_JS]" | Out-File '.emscripten' -Append -Encoding ascii
+cd $installLocationEmsdk
+"LLVM_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install\\bin'" | Out-File '.emscripten' -Encoding ASCII
+"BINARYEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install'" | Out-File '.emscripten' -Append -Encoding ASCII
+"PYTHON='$installLocationEmsdk\\python-$versionWinPython-embed-amd64-patched\\python.exe'" | Out-File '.emscripten' -Append -Encoding ASCII
+"NODE_JS='$installLocationEmsdk\\node-v$versionNode-win-x64\\bin\\node.exe'" | Out-File '.emscripten' -Append -Encoding ASCII
+"EMSCRIPTEN_ROOT='$installLocationEmsdk\\emscripten-llvm-e$version\\install\\emscripten'" | Out-File '.emscripten' -Append -Encoding ASCII
+"JAVA='$installLocationEmsdk\\Java64'" | Out-File '.emscripten' -Append -Encoding ASCII
+"TEMP_DIR = '/tmp'" | Out-File '.emscripten' -Append -Encoding ASCII
+"COMPILER_ENGINE = NODE_JS" | Out-File '.emscripten' -Append -Encoding ASCII
+"JS_ENGINES = [NODE_JS]" | Out-File '.emscripten' -Append -Encoding ASCII
 
-Set-EnvironmentVariable "EMSDK" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten"
-Set-EnvironmentVariable "EM_CONFIG" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten\.emscripten"
-Set-EnvironmentVariable "EMSDK_CACHE" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten\cache"
+Set-EnvironmentVariable "EMSDK" "$installLocationEmsdk"
+Set-EnvironmentVariable "EM_CONFIG" "$installLocationEmsdk\.emscripten"
+Set-EnvironmentVariable "EMSDK_LLVM_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\bin"
+Set-EnvironmentVariable "BINARYEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\"
 Set-EnvironmentVariable "EMSDK_NODE" "$installLocationEmsdk\node$versionNode-win-x64\bin\node.exe"
 Set-EnvironmentVariable "EMSDK_PYTHON" "$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched\python.exe"
 Set-EnvironmentVariable "EMSDK_JAVA_HOME" "$installLocationEmsdk\java64"
-Set-EnvironmentVariable "EMSDK_PATH" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten;$installLocationEmsdk\node$versionNode-win-x64\bin;$installLocationEmsdk\emscripten-llvm-e$version\install\bin;$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched;$installLocationEmsdk\java64\bin;$PATH"
-
-Add-Path "$env:EMSDK_PATH"
+Set-EnvironmentVariable "EMSCRIPTEN" "$installLocationEmsdk\emscripten-$version"
+Set-EnvironmentVariable "EMSCRIPTEN_ROOT" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten"
+Set-EnvironmentVariable "EMSDK_PATH" "$installLocationEmsdk\emscripten-llvm-e$version\install\emscripten;$installLocationEmsdk\node$versionNode-win-x64\bin;$installLocationEmsdk\emscripten-llvm-e$version\install\bin;$installLocationEmsdk\python-$versionWinPython-embed-amd64-patched;$installLocationEmsdk\java64\bin"
 
 Write-Output "emsdk = $version" >> ~/versions.txt
 Write-Output "emsdk llvm = $version" >> ~/versions.txt

coin/provisioning/common/windows/libclang.ps1

@@ -5,7 +5,7 @@ param(
 )
 . "$PSScriptRoot\helpers.ps1"
 
-$libclang_version="12.0"
+$libclang_version="11.0"
 Write-Output "libClang = $libclang_version" >> ~/versions.txt
 
 # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
@@ -39,7 +39,7 @@ $toolchainSuffix = ""
 
 if ( $toolchain -eq "vs2019" ) {
     if ( $archVer -eq 64 ) {
-        $sha1 = "44fabbd45b4b7e659c49347c156bae09d7aaffdc"
+        $sha1 = "ff0a30c881691068c14fbed9239b3583c8c45c6a"
     }
     else {
         $sha1 = ""
@@ -49,7 +49,7 @@ if ( $toolchain -eq "vs2019" ) {
 
 if ( $toolchain -eq "mingw" ) {
     if ( $archVer -eq 64 ) {
-        $sha1 = "9333170111aa90af6e1db824cd964dba227a4710"
+        $sha1 = "40141a788b1ccb615544e18da27cd95b4986217b"
     }
     else {
         $sha1 = ""
@@ -64,7 +64,7 @@ if ( $setDefault ) {
 }
 Set-EnvironmentVariable ("LLVM_INSTALL_DIR_${toolchainSuffix}") ($baseDestination + "-$archVer")
 
-if ( $libclang_version -eq "120" ) {
+if ( $libclang_version -eq "110" ) {
     # This is a hacked static build of libclang which requires special
     # handling on the qdoc side.
     Set-EnvironmentVariable "QDOC_USE_STATIC_LIBCLANG" "1"

coin/provisioning/common/windows/ninja.ps1

@@ -1,13 +1,13 @@
 . "$PSScriptRoot\helpers.ps1"
 
-$zip = Get-DownloadLocation "ninja-1.10.2-win-x86.zip"
+$zip = Get-DownloadLocation "ninja-1.6.0-win-x86.zip"
 
-Download http://master.qt.io/development_releases/prebuilt/ninja/v1.10.2/ninja-win-x86.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.10.2-win-really-x86.zip $zip
-Verify-Checksum $zip "1a22ee9269df8ed69c4600d7ee4ccd8841bb99ca"
+Download https://github.com/ninja-build/ninja/releases/download/v1.6.0/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.6.0-win-x86.zip $zip
+Verify-Checksum $zip "E01093F6533818425F8EFB0843CED7DCAABEA3B2"
 
 Extract-7Zip $zip C:\Utils\Ninja
 Remove "$zip"
 
 Add-Path "C:\Utils\Ninja"
 
-Write-Output "Ninja = 1.10.2" >> ~/versions.txt
+Write-Output "Ninja = 1.6.0" >> ~/versions.txt

coin/provisioning/common/windows/squishInstall.ps1

@@ -36,8 +36,8 @@
 # This script will pre-installed squish package for Windows.
 # Squish is need by Release Test Automation (RTA)
 
-$version = "6.7-20210614-1625"
-$qtBranch = "61x"
+$version = "6.7-20210319-0956"
+$qtBranch = "60x"
 $targetDir = "C:\Utils\squish"
 $squishPackage = "C:\Utils\rta_squish"
 $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable"
@@ -60,7 +60,7 @@ $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\Curren
 if ($OSVersion -eq "Windows 10 Enterprise") {
     $winVersion = "win10"
     if (Is64BitWinHost) {
-        $sha1 = "0ce4f94ebff488fedef29e9ed62b400a8b5014fb"
+        $sha1 = "61eca4950d24d9780e02cd4183c54009eda46114"
     }
 } else {
     $winVersion = "n/a"

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-disable-automounting.sh

@@ -1,45 +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$
-##
-#############################################################################
-
-set -ex
-
-sudo tee -a /etc/dconf/db/local.d/00-media-automount <<"EOF"
-[org/gnome/desktop/media-handling]
-automount=false
-automount-open=false
-EOF
-
-sudo dconf update
-

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-disable_net_lso.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-echo "ETHTOOL_OPTS='-K \${DEVICE} tso off'" | sudo tee -a /etc/sysconfig/network-scripts/ifcfg-Wired_connection_1

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-install_telegraf.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-"$(dirname "$0")"/../common/unix/telegraf_install.sh

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-remove_network_manager_secret_key.sh

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

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-remove_stable-privacy.sh

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

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-systemsetup.sh

@@ -1,61 +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$
-##
-#############################################################################
-
-set -ex
-
-BASEDIR=$(dirname "$0")
-# shellcheck source=../common/shared/network_test_server_ip.txt
-source "$BASEDIR/../common/shared/network_test_server_ip.txt"
-
-echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
-echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
-echo "Set DISPLAY"
-echo 'export DISPLAY=":0"' >> ~/.bashrc
-# for current session
-export DISPLAY=:0
-
-# Set timezone to UTC.
-sudo timedatectl set-timezone Etc/UTC
-# disable Automatic screen lock
-gsettings set org.gnome.desktop.screensaver lock-enabled false
-# disable blank screen power saving
-gsettings set org.gnome.desktop.session idle-delay 0
-
-# Set Wayland enable as false.
-echo "Setting Wayland enable as false"
-sudo sed -i 's/#WaylandEnable=false/WaylandEnable=false/g' /etc/gdm/custom.conf
-
-# Set system locale
-sudo localectl set-locale LANG=en_US.UTF-8

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/03-enable-repos.sh

@@ -1,55 +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$
-##
-#############################################################################
-
-set -ex
-
-echo "set WritePreparedUpdates=false" | sudo tee -a /etc/PackageKit/PackageKit.conf
-sudo systemctl stop packagekit
-sudo systemctl disable packagekit
-sudo yum -y remove PackageKit gnome-software
-
-sudo subscription-manager config --rhsm.manage_repos=1
-sudo subscription-manager refresh
-
-# sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms'
-sudo yum config-manager --enable 'codeready-builder-for-rhel-8-x86_64-rpms'
-sudo yum config-manager --enable 'rhel-8-for-x86_64-baseos-rpms'
-sudo yum config-manager --enable 'rhel-8-for-x86_64-appstream-rpms'
-# Epel is required for 'double-conversion-devel', 'libsqlite3x' and 'p7zip'
-sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
-
-sudo yum clean all
-# As well as this fetching the repository data, we also get a printout of the used repos
-sudo yum repolist

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/03-install-gcc-toolset.sh

@@ -1,40 +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$
-##
-#############################################################################
-
-set -ex
-
-sudo yum -y install gcc-toolset-10
-
-echo "source /opt/rh/gcc-toolset-10/enable" >> ~/.bashrc

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh

@@ -1,165 +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$
-##
-#############################################################################
-
-set -ex
-
-# Remove update notifications and packagekit running in the background
-sudo yum -y remove PackageKit gnome-software
-
-installPackages=()
-installPackages+=(git)
-installPackages+=(zlib-devel)
-installPackages+=(glib2-devel)
-installPackages+=(openssl-devel)
-installPackages+=(freetype-devel)
-installPackages+=(fontconfig-devel)
-# cmake build
-installPackages+=(ninja-build)
-installPackages+=(pcre2-devel)
-installPackages+=(double-conversion-devel)
-installPackages+=(zstd)
-# EGL support
-installPackages+=(mesa-libEGL-devel)
-installPackages+=(mesa-libGL-devel)
-installPackages+=(libxkbfile-devel)
-# Xinput2
-installPackages+=(libXi-devel)
-installPackages+=(mysql-server)
-installPackages+=(mysql)
-installPackages+=(mysql-devel)
-installPackages+=(postgresql-devel)
-installPackages+=(cups-devel)
-installPackages+=(dbus-devel)
-# gstreamer 1 for QtMultimedia
-# Note! gstreamer1-plugins-bad-free needs to be upgraded or it will conflicts with gstreamer1-plugins-base-devel
-installPackages+=(gstreamer1-plugins-bad-free)
-installPackages+=(gstreamer1-devel)
-installPackages+=(gstreamer1-plugins-base-devel)
-# gtk3 style for QtGui/QStyle
-installPackages+=(gtk3-devel)
-# libusb1 for tqtc-boot2qt/qdb
-installPackages+=(libusbx-devel)
-# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux
-installPackages+=(speech-dispatcher-devel)
-# Python 2 devel and pip. python-pip requires the EPEL repository to be added
-installPackages+=(python2-devel python2-pip)
-# Python 3 with python-devel, pip and virtualenv
-installPackages+=(python36)
-installPackages+=(python36-devel)
-# WebEngine
-installPackages+=(bison)
-installPackages+=(flex)
-installPackages+=(gperftools-libs)
-installPackages+=(gperf)
-installPackages+=(alsa-lib-devel)
-installPackages+=(pulseaudio-libs-devel)
-installPackages+=(libXtst-devel)
-installPackages+=(libxshmfence-devel)
-installPackages+=(nspr-devel)
-installPackages+=(nss-devel)
-# For Android builds
-installPackages+=(java-1.8.0-openjdk-devel)
-# For receiving shasum
-installPackages+=(perl-Digest-SHA)
-# INTEGRITY requirements
-installPackages+=(glibc.i686)
-# Enable Qt Bluetooth
-installPackages+=(bluez-libs-devel)
-# QtWebKit
-installPackages+=(libxml2-devel)
-installPackages+=(libxslt-devel)
-# For building Wayland from source
-installPackages+=(libffi-devel)
-# QtWayland
-installPackages+=(mesa-libwayland-egl)
-installPackages+=(mesa-libwayland-egl-devel)
-installPackages+=(libwayland-client)
-installPackages+=(libwayland-cursor)
-installPackages+=(libwayland-server)
-# Jenkins
-installPackages+=(chrpath)
-# libxkbcommon
-installPackages+=(libxkbcommon-devel)
-installPackages+=(libxkbcommon-x11-devel)
-# xcb-util-* libraries
-installPackages+=(xcb-util)
-installPackages+=(xcb-util-image-devel)
-installPackages+=(xcb-util-keysyms-devel)
-installPackages+=(xcb-util-wm-devel)
-installPackages+=(xcb-util-renderutil-devel)
-# ODBC support
-installPackages+=(unixODBC-devel)
-installPackages+=(unixODBC)
-# Vulkan support
-installPackages+=(vulkan-devel)
-installPackages+=(vulkan-tools)
-# Conan: For Python build
-installPackages+=(xz-devel)
-installPackages+=(zlib-devel)
-installPackages+=(libffi-devel)
-installPackages+=(libsqlite3x-devel)
-# Build.pl
-installPackages+=(perl-Data-Dumper)
-# In RedHat these come with Devtoolset
-installPackages+=(gcc)
-installPackages+=(gcc-c++)
-installPackages+=(make)
-# Open source VMware Tools
-installPackages+=(open-vm-tools)
-# Install all available locales (COIN-727)
-installPackages+=(langpacks-*)
-
-sudo yum -y install "${installPackages[@]}"
-
-sudo ln -s /usr/bin/python2 /usr/bin/python
-
-sudo yum -y install @nodejs
-
-# We shouldn't use yum to install virtualenv. The one found from package repo is not
-# working, but we can use installed pip
-sudo pip3 install --upgrade pip
-sudo pip3 install virtualenv wheel
-
-sudo /usr/bin/pip3 install wheel
-# Install all needed packages in a special wheel cache directory
-/usr/bin/pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt"
-
-# shellcheck source=../common/unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
-SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
-
-OpenSSLVersion="$(openssl version |cut -b 9-14)"
-echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
-

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-p7zip.sh

@@ -1,46 +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$
-##
-#############################################################################
-source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
-
-set -ex
-
-name="p7zip"
-version="7-11"
-sudo yum -y install "$name"
-
-# Link 7za to 7z so we can use existing installation scripts
-sudo ln -s /usr/bin/7za /usr/bin/7z
-
-echo "$name = $version" >> ~/versions.txt

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/05-libclang-v100-dyn.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-BASEDIR=$(dirname "$0")
-# shellcheck source=../common/unix/libclang-v100-dyn.sh
-"$BASEDIR/../common/unix/libclang-v100-dyn.sh"

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/05-libclang.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-set -ex
-
-BASEDIR=$(dirname "$0")
-# shellcheck source=../common/unix/libclang.sh
-"$BASEDIR/../common/unix/libclang.sh"

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/07-qnx_710.sh

@@ -1,39 +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$
-##
-#############################################################################
-
-set -ex
-
-# shellcheck source=../common/linux/qnx_700.sh
-source "${BASH_SOURCE%/*}/../common/linux/qnx_710.sh"

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/09-disable_selinux.sh

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

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/20-sccache.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-source "${BASH_SOURCE%/*}/../common/linux/sccache.sh"

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/22-mqtt_broker.sh

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

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/30-fbx.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/linux/fbx_linux.sh"

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/30-install-conan.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/install-conan.sh"

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/30-install_icu.sh

@@ -1,76 +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$
-##
-#############################################################################
-
-# shellcheck source=../common/unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
-
-set -ex
-
-# This script will install ICU
-
-icuVersion="56.1"
-icuLocation="/usr/lib64"
-sha1="6dd9ca6b185681a7ddc4bb94fd7fced27647a21c"
-baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z"
-baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64.7z"
-
-sha1Dev="bffde26cdea752bee0edd281820c57f1adac3864"
-develPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z"
-develPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel7.2-x64-devel.7z"
-
-echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
-
-targetFile=$(mktemp)
-DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile"
-sudo 7z x -y -o/usr/lib64 "$targetFile"
-sudo rm "$targetFile"
-
-echo "Installing custom ICU devel packages on RHEL"
-
-tempDir=$(mktemp -d)
-
-targetFile=$(mktemp)
-DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile"
-7z x -y -o"$tempDir" "$targetFile"
-
-sudo cp -a "$tempDir"/lib/* /usr/lib64
-sudo cp -a "$tempDir"/* /usr/
-
-sudo rm "$targetFile"
-sudo rm -fr "$tempDir"
-
-sudo /sbin/ldconfig
-
-echo "ICU = $icuVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/35-install-breakpad.sh

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

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/40-android_linux.sh

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

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/50-openssl_for_android_linux.sh

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

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/70-install_dwz.sh

@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2020 Konstantin Tokarev <annulen@yandex.ru>
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-set -ex
-
-sudo yum -y install elfutils-libelf-devel
-
-# shellcheck source=../common/linux/install_dwz.sh
-source "${BASH_SOURCE%/*}/../common/linux/install_dwz.sh"
-

coin/provisioning/qtci-linux-RHEL-8.2-x86_64/90-squish.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-BASEDIR=$(dirname "$0")
-"$BASEDIR/../common/unix/squishInstall.sh"
-

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

@@ -80,9 +80,9 @@ sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-dev
 sudo zypper -nq install libicu-devel libicu60_2
 
 # qtwebengine
-sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \
+sudo zypper -nq install alsa-devel dbus-1-devel \
          libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
-         mozilla-nspr-devel mozilla-nss-devel glproto-devel libxshmfence-devel
+         mozilla-nspr-devel mozilla-nss-devel
 
 # qtwebkit
 sudo zypper -nq install libxml2-devel libxslt-devel

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

@@ -55,9 +55,6 @@ function set_internal_repo {
     deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal-updates main restricted universe multiverse
     deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal-backports main restricted universe
     deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal-security main restricted universe multiverse
-    deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal main restricted
-    deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal-updates main restricted
-    deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal universe
 EOC
 }
 
@@ -86,11 +83,9 @@ installPackages+=(libdbus-1-dev)
 installPackages+=(libudev-dev)
 installPackages+=(libegl1-mesa-dev)
 installPackages+=(libfontconfig1-dev)
-installPackages+=(libgbm-dev)
-installPackages+=(libxkbfile-dev)
-installPackages+=(libxshmfence-dev)
 installPackages+=(libxss-dev)
-installPackages+=(nodejs-mozilla) # use nodejs-mozilla because nodejs is outdated
+installPackages+=(nodejs)
+# NOTE! Can't install nodejs-dev because libssl1.0-dev conflicts with libssl1.0-dev which is depandency of nodejs-dev.
 
 # Common event loop handling
 installPackages+=(libglib2.0-dev)
@@ -116,10 +111,6 @@ installPackages+=(libgstreamer1.0-dev)
 installPackages+=(libgstreamer-plugins-base1.0-dev)
 installPackages+=(libgstreamer-plugins-good1.0-dev)
 installPackages+=(libgstreamer-plugins-bad1.0-dev)
-installPackages+=(libgstreamer-gl1.0-0)
-installPackages+=(gir1.2-gst-plugins-base-1.0)
-installPackages+=(gir1.2-gst-plugins-bad-1.0)
-
 # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
 installPackages+=(g++-multilib)
 # python3 development package
@@ -135,11 +126,6 @@ installPackages+=(mesa-common-dev)
 installPackages+=(libgl1-mesa-glx)
 installPackages+=(libgl1-mesa-dev)
 installPackages+=(libegl1-mesa-dev)
-installPackages+=(libegl1)
-installPackages+=(libegl-mesa0)
-installPackages+=(libegl-dev)
-installPackages+=(libglvnd-dev)
-installPackages+=(libgles2-mesa-dev)
 installPackages+=(curl)
 installPackages+=(libicu-dev)
 installPackages+=(zlib1g-dev)
@@ -153,6 +139,7 @@ installPackages+=(libxcomposite-dev)
 installPackages+=(libxdamage-dev)
 installPackages+=(libxrandr-dev)
 installPackages+=(libfontconfig1-dev)
+installPackages+=(libxss-dev)
 installPackages+=(libsrtp2-dev)
 installPackages+=(libwebp-dev)
 installPackages+=(libjsoncpp-dev)
@@ -205,18 +192,6 @@ installPackages+=(diffstat)
 installPackages+=(binfmt-support)
 # Vulkan is needed for examples
 installPackages+=(libvulkan-dev)
-# Needed for qtdltlogging
-installPackages+=(libdlt-dev)
-# For integrity
-installPackages+=(libc6:i386)
-installPackages+=(libncurses5:i386)
-installPackages+=(libstdc++6:i386)
-installPackages+=(libx11-6:i386)
-installPackages+=(lib32z1)
-installPackages+=(linux-libc-dev:i386)
-installPackages+=(libxcursor1:i386)
-installPackages+=(libc6-dev-i386)
-sudo dpkg --add-architecture i386
 
 echo "Running update for apt"
 waitLoop
@@ -230,7 +205,6 @@ pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/sh
 
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
-SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"
 
 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-yocto.sh

@@ -42,16 +42,13 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
 # shellcheck source=../common/unix/SetEnvVar.sh
 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 
-primaryBaseUrlPath="http://ci-files01-hki.intra.qt.io/input/boot2qt/gatesgarth"
-altBaseUrlPath="http://download.qt.io/development_releases/prebuilt/boot2qt/gatesgarth"
-
 echo "Installing Yocto toolchain for 32-bit b2qt ARMV7..."
 
 versionARM="3.2"
-package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemuarm-abc23a6.sh"
-PrimaryUrl="$primaryBaseUrlPath/$package"
-AltUrl="$altBaseUrlPath/$package"
-SHA1="4d52038872f795fff3745c7cb5e1e89736122958"
+package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemuarm-7031f145.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/gatesgarth/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/gatesgarth/$package"
+SHA1="167071eb1a02fdffe1d12576dcad6497fc996776"
 yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh"
 yoctoLocationARMv7="/opt/b2qt/$versionARM"
 sysrootARMv7="armv7vet2hf-neon-poky-linux-gnueabi"
@@ -68,10 +65,10 @@ rm -rf "$yoctoInstaller"
 echo "Installing Yocto toolchain for 64-bit b2qt ARM64..."
 
 versionARM64="3.2"
-package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemuarm64-abc23a6.sh"
-PrimaryUrl="$primaryBaseUrlPath/$package"
-AltUrl="$altBaseUrlPath/$package"
-SHA1="7644f8ac883cd017a6abd4dafe7abfe21e922466"
+package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemuarm64-7031f145.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/gatesgarth/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/gatesgarth/$package"
+SHA1="518afdecc4e2883d4ba1f4c43a628ce06df4e39a"
 yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh"
 yoctoLocationARM64="/opt/b2qt/$versionARM64"
 sysrootARM64="cortexa57-poky-linux"
@@ -88,10 +85,10 @@ rm -rf "$yoctoInstaller"
 echo "Installing Yocto toolchain for 64-bit b2qt MIPS64..."
 
 versionMIPS64="3.2"
-package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemumips64-abc23a6.sh"
-PrimaryUrl="$primaryBaseUrlPath/$package"
-AltUrl="$altBaseUrlPath/$package"
-SHA1="7f3b84f68957c929deb031a53d55a5620b6cee5b"
+package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemumips64-7031f145.sh"
+PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/gatesgarth/$package"
+AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/gatesgarth/$package"
+SHA1="ba076bdc44d0fdce5d628f0d930943aa108d616d"
 yoctoInstaller="/tmp/yocto-toolchain-mips64.sh"
 yoctoLocationMIPS64="/opt/b2qt/$versionMIPS64"
 sysrootMIPS64="mips64r2-poky-linux"

coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/60-qnx660.sh

@@ -5,7 +5,7 @@
 ## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
-## This file is part of the provisioning scripts of the Qt Toolkit.
+## This file is part of the test suite of the Qt Toolkit.
 ##
 ## $QT_BEGIN_LICENSE:LGPL21$
 ## Commercial License Usage
@@ -35,6 +35,5 @@
 
 set -ex
 
-# shellcheck source=../common/unix/install_protobuff.sh
-source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh"
-
+# shellcheck source=../common/linux/qnx_660.sh
+source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh"

coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh

@@ -35,10 +35,9 @@ sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-dev
 sudo zypper -nq install libicu-devel
 
 # qtwebengine
-sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \
+sudo zypper -nq install alsa-devel dbus-1-devel \
          libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
-         mozilla-nspr-devel mozilla-nss-devel nodejs12 glproto-devel \
-         libxshmfence-devel libXdamage-devel
+         mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel glproto-devel
 
 # qtwebkit
 sudo zypper -nq install libxml2-devel libxslt-devel

coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh

@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersion="r22b"
 ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
-sdkBuildToolsVersion="30.0.3"
+sdkBuildToolsVersion="29.0.3"
 # this is compile sdk version
-sdkApiLevel="android-30"
+sdkApiLevel="android-29"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
@@ -33,16 +33,24 @@
 ##
 #############################################################################
 
-# This script needs to be called last during provisioning so that the software information will show up last in provision log.
+# This script installs QNX 7.
 
-# Storage installed RPM packages information
+targetFolder="/opt/"
+sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
+folderName="qnx700"
 
-set -ex
+sudo mkdir -p "$targetFolder"
 
-# shellcheck disable=SC2129
-echo "*********************************************" >> ~/versions.txt
-echo "***** All installed RPM packages *****" >> ~/versions.txt
-rpm -q -a | sort >> ~/versions.txt
-echo "*********************************************" >> ~/versions.txt
+echo "Extracting QNX 7"
+sudo tar -C "$targetFolder" -Jxf $sourceFile
 
-"$(dirname "$0")/../common/linux/version.sh"
+sudo chown -R qt:wheel "$targetFolder"/"$folderName"
+
+# Verify that we have last file in zip
+if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
+    exit 1
+fi
+
+# Set env variables
+echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc
+echo "QNX SDP = 7.0.0" >> ~/versions.txt

coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh

@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersion="r22b"
 ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
-sdkBuildToolsVersion="30.0.3"
+sdkBuildToolsVersion="29.0.3"
 # this is compile sdk version
-sdkApiLevel="android-30"
+sdkApiLevel="android-29"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

coin/provisioning/qtci-macos-10.15-x86_64/40-qnx700.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
@@ -33,16 +33,24 @@
 ##
 #############################################################################
 
-set -e
+# This script installs QNX 7.
 
-curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null
-sudo chmod 755 /tmp/redhat_ak.sh
-/tmp/redhat_ak.sh
+targetFolder="/opt/"
+sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
+folderName="qnx700"
 
-# refresh local certificates
-sudo subscription-manager refresh
+sudo mkdir -p "$targetFolder"
 
-# Attach available subscriptions to system. This is needed when subscriptions are renewed.
-sudo subscription-manager attach --auto
+echo "Extracting QNX 7"
+sudo tar -C "$targetFolder" -Jxf $sourceFile
 
-sudo rm -f /tmp/redhat_ak.sh
+sudo chown -R qt:wheel "$targetFolder"/"$folderName"
+
+# Verify that we have last file in zip
+if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
+    exit 1
+fi
+
+# Set env variables
+echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc
+echo "QNX SDP = 7.0.0" >> ~/versions.txt

coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh

@@ -50,4 +50,4 @@ set -ex
 # shellcheck source=../common/macos/install_xcode.sh
 source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
 
-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_12.5.1.xip 12.5.1
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.15_catalina/Xcode_12.4.xip 12.4

coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh

@@ -37,10 +37,10 @@ set -ex
 
 # shellcheck source=../common/macos/install-commandlinetools.sh
 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
-version="12.5.1"
+version="12.4"
 packageName="Command_Line_Tools_for_Xcode_$version.dmg"
-url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName"
-sha1="eaf175f4c8854511a6e829f360eb3a7d59afa517"
+url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.15_catalina/$packageName"
+sha1="eabb32d167da029dfc70af94de2bf61abd416ca1"
 
 InstallCommandLineTools $url $url $sha1 $packageName $version
 

coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh

@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
 
 ndkVersion="r22b"
 ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
-sdkBuildToolsVersion="30.0.3"
+sdkBuildToolsVersion="29.0.3"
 # this is compile sdk version
-sdkApiLevel="android-30"
+sdkApiLevel="android-29"
 
 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"

coin/provisioning/qtci-macos-11.0-x86_64/35-openssl.sh

@@ -3,5 +3,5 @@
 set -ex
 
 # shellcheck source=../common/macos/install_openssl.sh
-source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos-universal"
+source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos"
 

coin/provisioning/qtci-macos-11.0-x86_64/40-qnx700.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
@@ -33,9 +33,24 @@
 ##
 #############################################################################
 
-# This script installs QEMU Guest Agent
+# This script installs QNX 7.
 
-set -ex
+targetFolder="/opt/"
+sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
+folderName="qnx700"
 
-sudo yum -y install qemu-guest-agent
-sudo systemctl start qemu-guest-agent
+sudo mkdir -p "$targetFolder"
+
+echo "Extracting QNX 7"
+sudo tar -C "$targetFolder" -Jxf $sourceFile
+
+sudo chown -R qt:wheel "$targetFolder"/"$folderName"
+
+# Verify that we have last file in zip
+if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
+    exit 1
+fi
+
+# Set env variables
+echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc
+echo "QNX SDP = 7.0.0" >> ~/versions.txt

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

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 #############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.
@@ -33,11 +31,17 @@
 ##
 #############################################################################
 
-# This script installs CMake 3.6.2
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 
-set -ex
+# This script installs QNX SDP 7.0
 
-# CMake is needed for autotests that verify that Qt can be built with CMake
+$zip = Get-DownloadLocation "qnx700.7z"
+$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-windows.7z"
 
-# shellcheck source=../common/linux/cmake_linux.sh
-source "${BASH_SOURCE%/*}/../common/linux/cmake_linux.sh"
+Download $url $url $zip
+Verify-Checksum $zip "1f10e9660efc81b18cb897871ba2b0384cf0fc6d"
+Extract-7Zip $zip C:\
+
+Set-EnvironmentVariable "QNX_700" "C:\QNX700"
+Write-Output "QNX SDP = 7.0.0" >> ~/versions.txt
+Remove "$zip"

configure

@@ -35,9 +35,10 @@ if [ ! -e "$configure" ]; then
     exit 1
 fi
 
-set -ex
+mkdir -p qtbase || exit
 
-mkdir -p qtbase
-cd qtbase
+echo "+ cd qtbase"
+cd qtbase || exit
 
+echo "+ $configure -top-level $@"
 exec "$configure" -top-level "$@"

init-repository

@@ -301,12 +301,6 @@ use constant {
     STS_ADDITIONAL => 6
 };
 
-sub has_url_scheme
-{
-    my ($url) = @_;
-    return $url =~ "^[a-z][a-z0-9+\-.]*://";
-}
-
 sub git_clone_all_submodules
 {
     my ($self, $my_repo_base, $co_branch, $alternates, @subset) = @_;
@@ -325,9 +319,8 @@ sub git_clone_all_submodules
             $subbranches{$1} = $3;
         } elsif ($2 eq "url") {
             my ($mod, $base) = ($1, $3);
-            if (!has_url_scheme($base)) {
-                $base = $my_repo_base.'/'.$base;
-            }
+            next if ($base !~ /^\.\.\//);
+            $base = $my_repo_base.'/'.$base;
             while ($base =~ s,(?!\.\./)[^/]+/\.\./,,g) {}
             $subbases{$mod} = $base;
         } elsif ($2 eq "update") {
@@ -526,13 +519,9 @@ sub git_clone_one_submodule
 
     my $do_clone = (! -e "$submodule/.git");
 
-    my $url = $repo_basename;
-    if (!has_url_scheme($url)) {
-        $url = $self->{'base-url'}.$url;
-    }
-
+    my $url = $self->{'base-url'}.$repo_basename;
     my $mirror;
-    if (!has_url_scheme($repo_basename) && $mirror_url && ($do_clone || $self->{fetch})) {
+    if ($mirror_url && ($do_clone || $self->{fetch})) {
         $mirror = $mirror_url.$repo_basename;
     }
 
@@ -582,9 +571,7 @@ sub git_clone_one_submodule
         $self->exe('git', 'config', 'commit.template', $template);
     }
 
-    if (!has_url_scheme($repo_basename)) {
-        $self->git_add_remotes($repo_basename);
-    }
+    $self->git_add_remotes($repo_basename);
 
     if ($self->{'detach-alternates'}) {
         $self->exe('git', 'repack', '-a');

qt.pro

@@ -0,0 +1,103 @@
+# Create the super cache so modules will add themselves to it.
+cache(, super)
+
+# Suppress the license check on subsequent "visits". The first
+# visit will skip it anyway due to not having a compiler set up
+# yet. This cannot be added to the super cache, because that is
+# read before spec_pre.prf, which flushes CONFIG. This does not
+# affect submodules, as they come with a .qmake.conf. But that
+# one sets the flag via qt_build_config.prf anyway.
+!QTDIR_build: cache(CONFIG, add, $$list(QTDIR_build))
+
+TEMPLATE      = subdirs
+
+CONFIG += prepare_docs qt_docs_targets
+
+# Extract submodules from .gitmodules.
+lines = $$cat(.gitmodules, lines)
+for (line, lines) {
+    mod = $$replace(line, "^\\[submodule \"([^\"]+)\"\\]$", \\1)
+    !equals(mod, $$line) {
+        module = $$mod
+        modules += $$mod
+    } else {
+        prop = $$replace(line, "^$$escape_expand(\\t)([^ =]+) *=.*$", \\1)
+        !equals(prop, $$line) {
+            val = $$replace(line, "^[^=]+= *", )
+            module.$${module}.$$prop = $$split(val)
+        } else {
+            error("Malformed line in .gitmodules: $$line")
+        }
+    }
+}
+QMAKE_INTERNAL_INCLUDED_FILES += $$PWD/.gitmodules
+
+QT_SKIP_MODULES =
+
+# This is a bit hacky, but a proper implementation is not worth it.
+args = $$QMAKE_EXTRA_ARGS
+contains(args, -redo): \
+    args += $$cat($$OUT_PWD/config.opt, lines)
+for (ever) {
+    isEmpty(args): break()
+    a = $$take_first(args)
+
+    equals(a, -skip) {
+        isEmpty(args): break()
+        m = $$take_first(args)
+        contains(m, -.*): next()
+        m ~= s/^(qt)?/qt/
+        !contains(modules, $$m): \
+            error("-skip command line argument used with non-existent module '$$m'.")
+        QT_SKIP_MODULES += $$m
+    }
+}
+
+modules = $$sort_depends(modules, module., .depends .recommends .serialize)
+modules = $$reverse(modules)
+for (mod, modules) {
+    project = $$eval(module.$${mod}.project)
+    equals(project, -): \
+        next()
+
+    deps = $$eval(module.$${mod}.depends)
+    recs = $$eval(module.$${mod}.recommends) $$eval(module.$${mod}.serialize)
+    for (d, $$list($$deps $$recs)): \
+        !contains(modules, $$d): \
+            error("'$$mod' depends on undeclared '$$d'.")
+
+    contains(QT_SKIP_MODULES, $$mod): \
+        next()
+    !isEmpty(QT_BUILD_MODULES):!contains(QT_BUILD_MODULES, $$mod): \
+        next()
+
+    isEmpty(project) {
+        !exists($$mod/$${mod}.pro): \
+            next()
+        $${mod}.subdir = $$mod
+    } else {
+        !exists($$mod/$$project): \
+            next()
+        $${mod}.file = $$mod/$$project
+        $${mod}.makefile = Makefile
+    }
+    $${mod}.target = module-$$mod
+
+    for (d, deps) {
+        !contains(SUBDIRS, $$d) {
+            $${mod}.target =
+            break()
+        }
+        $${mod}.depends += $$d
+    }
+    isEmpty($${mod}.target): \
+        next()
+    for (d, recs) {
+        contains(SUBDIRS, $$d): \
+            $${mod}.depends += $$d
+    }
+
+    SUBDIRS += $$mod
+}
+
+load(qt_configure)