Update submodules on '6.2.0' in qt/qt5

Change-Id: I7a7252751d9cc351a5d78ed94af5154e861a5fd8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2025-12-21 15:38:15 +08:00 · 2021-09-25 17:35:05 +03:00 · 2021-09-25 06:06:18 +03:00 · 2021-09-23 06:23:28 +03:00 · 2021-09-21 22:00:41 +03:00 · 2021-09-21 06:50:15 +03:00
85 changed files with 342 additions and 260 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,61 +1,61 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = dev
+	branch = 6.2.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
-	recommends = qtshadertools qtsvg
+	recommends = qtimageformats qtshadertools qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = dev
+	branch = 6.2.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtmultimedia"]
-	depends = qtbase
+	depends = qtbase qtshadertools
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = dev
-	status = ignore
+	branch = 6.2.0
+	status = addon
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = dev
+	branch = 6.2.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = dev
+	branch = 6.2.0
 	status = ignore
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = dev
+	branch = 6.2.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative qttools
-	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
+	recommends = qtmultimedia
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = dev
+	branch = 6.2.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -76,14 +76,14 @@
 	recommends = qtdeclarative qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -107,218 +107,186 @@
 	status = ignore
 [submodule "qtconnectivity"]
 	depends = qtbase
-	recommends = qtdeclarative qtandroidextras
+	recommends = qtdeclarative
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
-[submodule "qtgraphicaleffects"]
-	depends = qtdeclarative
-	path = qtgraphicaleffects
-	url = ../qtgraphicaleffects.git
-	branch = dev
-	status = ignore
-[submodule "qtquickcontrols"]
-	depends = qtdeclarative
-	recommends = qtgraphicaleffects
-	path = qtquickcontrols
-	url = ../qtquickcontrols.git
-	branch = dev
-	status = ignore
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = dev
-	status = addon
-[submodule "qtandroidextras"]
-	depends = qtbase
-	path = qtandroidextras
-	url = ../qtandroidextras.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
-	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
+	recommends = qtlocation qtwebchannel qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = dev
+	branch = 6.2.0
 	status = ignore
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
-[submodule "qtquickcontrols2"]
-	depends = qtdeclarative
-	recommends = qtimageformats qtgraphicaleffects
-	path = qtquickcontrols2
-	url = ../qtquickcontrols2.git
-	branch = dev
-	status = essential
-[submodule "qtpurchasing"]
-	depends = qtbase
-	recommends = qtdeclarative qtandroidextras
-	path = qtpurchasing
-	url = ../qtpurchasing.git
-	branch = dev
-	status = ignore
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia qtquickcontrols
+	recommends = qtmultimedia
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = dev
+	branch = 6.2.0
 	status = ignore
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = dev
+	branch = 6.2.0
 	status = ignore
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = dev
+	branch = 6.2.0
 	status = ignore
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative qtshadertools
+	recommends = qtquicktimeline
 	path = qtquick3d
 	url = ../qtquick3d.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtshadertools"]
 	depends = qtbase
 	path = qtshadertools
 	url = ../qtshadertools.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qt5compat"]
 	depends = qtbase qtdeclarative
 	path = qt5compat
 	url = ../qt5compat.git
-	branch = dev
+	branch = 6.2.0
 	status = deprecated
 [submodule "qtcoap"]
 	depends = qtbase
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
 [submodule "qtopcua"]
-	depends = qtbase qtdeclarative qtquickcontrols2
+	depends = qtbase qtdeclarative
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = dev
+	branch = 6.2.0
 	status = addon
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,11 +1,13 @@
+# 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")
-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})

+# Run platform auto-detection /before/ the first project() call and thus
+# before the toolchain file is loaded.
 include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")

 project(Qt
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -35,8 +35,16 @@ instructions:
          maxTimeBetweenOutput: 1200
          userMessageOnFailure: >
            Failed to generate docs.
-        - type: MakeDirectory
-          directory: "{{.BuildDir}}/qtbase/doc/global"
+        - type: ExecuteCommand
+          command: "cp -r {{.BuildDir}}/qtbase/doc/config {{.BuildDir}}/doc"
+          maxTimeInSeconds: 12000
+          maxTimeBetweenOutput: 1200
+          userMessageOnFailure: "Failed to copy qtbase/doc/config to documentation directory."
+        - type: ExecuteCommand
+          command: "cp -r {{.BuildDir}}/qtbase/doc/global {{.BuildDir}}/doc"
+          maxTimeInSeconds: 12000
+          maxTimeBetweenOutput: 1200
+          userMessageOnFailure: "Failed to copy qtbase/doc/global to documentation directory."
        - type: UploadArtifact
          archiveDirectory: '{{.BuildDir}}/doc'
          transferType: UploadModuleDocumentation
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -91,10 +91,10 @@ Configurations:
    Template: 'qtci-windows-10-x86_64-52'
    Compiler: 'MSVC2019'
    Target arch: 'arm64'
-    Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Insignificant', 'Packaging']
+    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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_msvc_obj_debug_info=ON',
+        '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']
 -
--- a/coin/platform_configs/cmake_platforms_qemu.yaml
+++ b/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.19.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
@@ -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.19.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
@@ -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.19.2/bin",
+        "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
        'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
        'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
        'QT_QUICK_BACKEND=software',
--- a/coin/platform_configs/cmake_platforms_wasm.yaml
+++ b/coin/platform_configs/cmake_platforms_wasm.yaml
@@ -10,3 +10,26 @@ Configurations:
        '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']
--- a/coin/platform_configs/integrity.yaml
+++ b/coin/platform_configs/integrity.yaml
@@ -3,11 +3,15 @@ Configurations:
    -
      Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
      Compiler: 'GCC'
+      Target os: 'INTEGRITY'
      Platform dependency: 'Ubuntu-20.04-host'
      Features: ['Sccache', 'DisableTests']
-      Configure arguments: '-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'
-      Environment variables: ['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',
+      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']
+          'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH',
+          'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_system_webp=OFF']
--- a/coin/platform_configs/ios-tests.yaml
+++ b/coin/platform_configs/ios-tests.yaml
@@ -0,0 +1,12 @@
+Version: 2
+Configurations:
+-
+    Id: "ios-tests-target"
+    Template: 'qtci-macos-10.14-x86_64'
+    Target os: 'IOS_ANY'
+    Target arch: 'arm64'
+    Compiler: 'Clang'
+    Target compiler: 'Clang'
+    Platform dependency: 'macos-latest-xcode-universal-packaging-build'
+    Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests']
+    Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
--- a/coin/platform_configs/macos-developer-build-tests.yaml
+++ b/coin/platform_configs/macos-developer-build-tests.yaml
@@ -1,5 +1,9 @@
 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'
--- a/coin/platform_configs/macos.yaml
+++ b/coin/platform_configs/macos.yaml
@@ -10,7 +10,7 @@ Configurations:
        Features: ['Packaging', 'Sccache', 'DoNotRunTests']
        Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..'
        Environment variables: [
-            'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+            'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_gds=OFF',
            'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
            ]

@@ -19,28 +19,28 @@ Configurations:
        Id: 'macos-10.14-x86_64-tests'
        Template: 'qtci-macos-10.14-x86_64'
        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
+        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
    -
        Id: 'macos-10.15-x86_64-tests'
        Template: 'qtci-macos-10.15-x86_64-102'
        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
+        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-latest-xcode-universal-packaging-build'
    -
        Id: 'macos-11-x86_64-tests'
        Template: 'qtci-macos-11.0-x86_64-102'
        Compiler: 'Clang'
-        Features: ['Sccache', 'TestOnly']
+        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']
+        Features: ['Sccache', 'TestOnly', 'Packaging']
        Platform dependency: 'macos-latest-xcode-universal-packaging-build'

-    # Build developer builds for all modules, but only run tests for qtbase and declarative.
+    # Build x86_64 developer-builds for all modules, but only run tests for qtbase and declarative.
    # See macos-developer-build-tests.yaml for the tests
    -
        Id: 'macos-latest-xcode-x86_64-developer-build'
@@ -53,10 +53,17 @@ Configurations:
            'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
            ]

-    # ARM64 target built on apple silicon
+    # 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: ['InsignificantTests']
+        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'
--- a/coin/platform_configs/qdb.yaml
+++ b/coin/platform_configs/qdb.yaml
@@ -1,3 +1,30 @@
 Version: 2
-Include: [cmake_platforms.yaml]
-Configurations: []
+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'
+    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'
+    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'
+    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'
+    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'
+    ]
--- a/coin/platform_configs/qtapplicationmanager.yaml
+++ b/coin/platform_configs/qtapplicationmanager.yaml
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -3,11 +3,12 @@ Include: [
    cmake_platforms.yaml,
    cmake_platforms_static_tests.yaml,
    macos-developer-build-tests.yaml,
-    integrity.yaml
+    integrity.yaml,
+    ios-tests.yaml
 ]
 Configurations:
 -
-    Template: 'qtci-linux-CentOS-8.3-x86_64-50'
+    Template: 'qtci-linux-RHEL-8.2-x86_64-50'
    Target os: 'Android_ANY'
    Target arch: 'x86'
    Compiler: 'GCC'
--- a/coin/platform_configs/qtdeclarative.yaml
+++ b/coin/platform_configs/qtdeclarative.yaml
@@ -1,6 +1,8 @@
 Version: 2
 Include: [
    cmake_platforms.yaml,
-    macos-developer-build-tests.yaml
+    macos-developer-build-tests.yaml,
+    cmake_platforms_static_tests.yaml,
+    integrity.yaml
 ]
 Configurations: []
--- a/coin/platform_configs/qtimageformats.yaml
+++ b/coin/platform_configs/qtimageformats.yaml
@@ -1,3 +1,6 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml,
+    integrity.yaml
+]
 Configurations: []
--- a/coin/platform_configs/qtquickcontrols2.yaml
+++ b/coin/platform_configs/qtquickcontrols2.yaml
@@ -1,5 +0,0 @@
-Version: 2
-Include: [
-  cmake_platforms.yaml
-]
-Configurations: []
--- a/coin/platform_configs/qtsdk.yaml
+++ b/coin/platform_configs/qtsdk.yaml
@@ -0,0 +1,6 @@
+Version: 2
+Include: [
+    cmake_platforms.yaml,
+    qt-creator.yaml
+    ]
+Configurations: []
--- a/coin/platform_configs/qtshadertools.yaml
+++ b/coin/platform_configs/qtshadertools.yaml
@@ -1,3 +1,6 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml,
+    integrity.yaml
+]
 Configurations: []
--- a/coin/platform_configs/qtsvg.yaml
+++ b/coin/platform_configs/qtsvg.yaml
@@ -1,3 +1,6 @@
 Version: 2
-Include: [cmake_platforms.yaml]
+Include: [
+    cmake_platforms.yaml,
+    integrity.yaml
+]
 Configurations: []
--- a/coin/platform_configs/tqtc-qmlcachegenplus.yaml
+++ b/coin/platform_configs/tqtc-qmlcachegenplus.yaml
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/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="29.0.3"
-sdkApiLevel="android-29"
+sdkBuildToolsVersion="30.0.3"
+sdkApiLevel="android-30"

 toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
 ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc"
--- a/coin/provisioning/common/linux/cmake_linux.sh
+++ b/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.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"
+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"
 targetFolder="/opt/cmake-$version"
-appPrefix="cmake-$version-Linux-x86_64"
+appPrefix="cmake-$version-linux-x86_64"

 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"

--- a/coin/provisioning/common/linux/integrity.sh
+++ b/coin/provisioning/common/linux/integrity.sh
@@ -42,9 +42,9 @@ 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.zip"
+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="3c1edba781aa518e53e962cdb5fc5483aaa4991b"
+SHA1_toolchainEs7="e890fe332a81f8345fed3dff89b30019d9989765"
 SHA1_toolchainAddons="1eb838edca4edaa3d9076b5ce4aea6409ffaa022"
 targetFolder="$HOME"
 appPrefix=""
--- a/coin/provisioning/common/linux/openssl_for_android_linux.sh
+++ b/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_g_for-android-ndk-21.tar.gz"
+prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21.tar.gz"
 targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
-sha="2998e1a3bc9aa4bc7475d1be270db9f4109fca00"
+sha="8c4db1eb8460d749c998a0e033b3939123cbc5ac"
 DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
 tar -xzf "$targetFile" -C "${HOME}"

--- a/coin/provisioning/common/macos/cmake.sh
+++ b/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.19"
-version="3.19.2"
+majorminorversion="3.21"
+version="3.21.1"
 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="753c72931e9c76c969255c197781635e7110e363"
+SHA1="5845da632d0f073c7761df4e78efb4405e00ac5a"
 appPrefix="cmake-$version-macos-universal"

 InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
--- a/coin/provisioning/common/macos/ninja.sh
+++ b/coin/provisioning/common/macos/ninja.sh
@@ -38,10 +38,10 @@
 # shellcheck source=./../unix/InstallFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"

-version="1.10.1"
+version="1.10.2"
 internalUrl="http://ci-files01-hki.ci.local/input/mac/ninja-mac_v${version}.zip"
 externalUrl="https://github.com/ninja-build/ninja/releases/download/v${version}/ninja-mac.zip"
-SHA1="de7c594e3bf76f7c86b9d6874d49c8824b2a76e1"
+SHA1="95d0ca5e7c67ab7181c87e6a6ec59d11b1ff2d30"
 DestDir="/usr/local/bin/"

 InstallFromCompressedFileFromURL "$internalUrl" "$externalUrl" "$SHA1" "$DestDir" ""
--- a/coin/provisioning/common/unix/install-openssl.sh
+++ b/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"
-tar -xzf "$targetFile" -C "$HOME"
-mv "$opensslHome" "$opensslSource"
+mkdir -p "$opensslSource"
+tar -xzf "$targetFile" --strip 1 -C "$opensslSource"
 cd "$opensslSource"
 pwd

@@ -68,11 +68,17 @@ if [[ "$os" == "linux" ]]; then
 elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
    # Below target location has been hard coded into Coin.
    # QTQAINFRA-1195
-    openssl_install_dir=/usr/local/openssl-$version
-    opensslTargetLocation="/usr/local/opt/openssl"
+    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
@@ -80,17 +86,17 @@ elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
    if [ "$os" == "macos-universal" ]; then
        archs="x86_64 arm64"
    else
-        archs="x86_64"
+        archs="$(uname -m)"
    fi

    for arch in $archs; do
        cd $opensslBuild
        echo "Configuring OpenSSL for $arch"
-        mkdir $arch && cd $arch
+        mkdir -p $arch && cd $arch
        $opensslSource/Configure --prefix=$openssl_install_dir $commonFlags darwin64-$arch-cc

-        echo "Building OpenSSL for $arch"
-        make --silent >> /tmp/openssl_make.log 2>&1
+        echo "Building OpenSSL for $arch in $PWD"
+        make >> /tmp/openssl_make.log 2>&1

        echo "Installing OpenSSL for $arch"
        if [ "$os" == "macos-universal" ]; then
@@ -99,12 +105,13 @@ elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
            destdir=""
        fi
        # shellcheck disable=SC2024
-        sudo make --silent install DESTDIR=$destdir >> /tmp/openssl_make_install.log 2>&1
+        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

--- a/coin/provisioning/common/unix/squishInstall.sh
+++ b/coin/provisioning/common/unix/squishInstall.sh
@@ -41,23 +41,20 @@ set -ex
 # This script will fetch and extract pre-buildt squish package for Linux and Mac.
 # Squish is need by Release Test Automation (RTA)

-version="6.7-20210318-1241"
-qtBranch="60x"
+version="6.7-20210615-1349"
+qtBranch="61x"
 installFolder="/opt"
 squishFolder="$installFolder/squish"
 preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable"
 licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/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="e82701ffc1eb465dce3163ce7eab9ccaedc568c1"
+    sha1="15f7f8e9944fdc36b9b6e37576d6ca96713a8ac5"
 else
     compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz"
-     sha1="80b3f36e760963a6989a49c79818bf8671d1932a"
+     sha1="e32e5db1713e3050c3cdce696d7509c468afc7d3"
 fi

 mountFolder="/tmp/squish"
--- a/coin/provisioning/common/windows/android.ps1
+++ b/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-29"
-$sdkBuildToolsVersion = "29.0.3"
+$sdkApiLevel = "android-30"
+$sdkBuildToolsVersion = "30.0.3"
 $toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
 $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
 $toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
--- a/coin/provisioning/common/windows/cmake.ps1
+++ b/coin/provisioning/common/windows/cmake.ps1
@@ -33,21 +33,21 @@

 . "$PSScriptRoot\helpers.ps1"

-$majorminorversion = "3.19"
-$version = "3.19.2"
+$majorminorversion = "3.21"
+$version = "3.21.1"

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

 Write-Host "Removing old cmake"
 Remove "C:\CMake"

 Download $officialurl $cachedurl $zip
-Verify-Checksum $zip "5e42a287610a619c3a150376d9aaad31282cdcd4"
+Verify-Checksum $zip "7271b8c568f428af433f3aae80c292ef868993c5"

 Extract-7Zip $zip C:
-$defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86"
+$defaultinstallfolder = "C:\cmake-" + $version + "-windows-i386"
 Rename-Item $defaultinstallfolder C:\CMake

 Add-Path "C:\CMake\bin"
--- a/coin/provisioning/common/windows/emsdk.ps1
+++ b/coin/provisioning/common/windows/emsdk.ps1
@@ -50,7 +50,7 @@ $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"
+$urlWasmBinariesCache="$urlCache/windows/wasm-binaries.$version.zip"
 $sha1WasmBinaries="a6f3f49df50fe7c8a0e61065b80fd885b8266bf3"

 $urlOfficialNode = "$urlEmscripten/deps/node-v$versionNode-win-x64.zip"
@@ -65,12 +65,8 @@ $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 = "4f50327e1605e787669eb8c5e37733914e32d592"
-
 $installLocationEmsdk = "C:\\Utils\\emsdk"
-$temp = "C:\Windows\Temp"
+$temp = "C:\\Windows\\Temp"

 function Install {

@@ -94,29 +90,28 @@ 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
-"emsdk_path = '$installLocationEmsdk'" | Out-File '.emscripten' -Encoding ASCII
-"LLVM_ROOT = emsdk_path + '\\emscripten-llvm-e$version\\install\\bin'" | Out-File '.emscripten' -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 + '\\emscripten-llvm-e$version\\install\\emscripten'" | 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\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

-Set-EnvironmentVariable "EMSDK" "$installLocationEmsdk"
-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" "$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_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 "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"
+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"

 Write-Output "emsdk = $version" >> ~/versions.txt
 Write-Output "emsdk llvm = $version" >> ~/versions.txt
--- a/coin/provisioning/common/windows/ninja.ps1
+++ b/coin/provisioning/common/windows/ninja.ps1
@@ -1,13 +1,13 @@
 . "$PSScriptRoot\helpers.ps1"

-$zip = Get-DownloadLocation "ninja-1.6.0-win-x86.zip"
+$zip = Get-DownloadLocation "ninja-1.10.2-win-x86.zip"

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

 Extract-7Zip $zip C:\Utils\Ninja
 Remove "$zip"

 Add-Path "C:\Utils\Ninja"

-Write-Output "Ninja = 1.6.0" >> ~/versions.txt
+Write-Output "Ninja = 1.10.2" >> ~/versions.txt
--- a/coin/provisioning/common/windows/squishInstall.ps1
+++ b/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-20210319-0956"
-$qtBranch = "60x"
+$version = "6.7-20210614-1625"
+$qtBranch = "61x"
 $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 = "61eca4950d24d9780e02cd4183c54009eda46114"
+        $sha1 = "0ce4f94ebff488fedef29e9ed62b400a8b5014fb"
    }
 } else {
    $winVersion = "n/a"
--- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-systemsetup.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-systemsetup.sh
@@ -57,3 +57,5 @@ gsettings set org.gnome.desktop.session idle-delay 0
 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
--- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
+++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh
@@ -86,6 +86,7 @@ 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
@@ -137,6 +138,8 @@ 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[@]}"

--- a/coin/provisioning/qtci-linux-SLES-15_SP2-x86_64/02-zypperpackages.sh
+++ b/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 \
+sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \
         libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
-         mozilla-nspr-devel mozilla-nss-devel
+         mozilla-nspr-devel mozilla-nss-devel glproto-devel libxshmfence-devel

 # qtwebkit
 sudo zypper -nq install libxml2-devel libxslt-devel
--- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh
@@ -86,9 +86,11 @@ 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)
-# NOTE! Can't install nodejs-dev because libssl1.0-dev conflicts with libssl1.0-dev which is depandency of nodejs-dev.
+installPackages+=(nodejs-mozilla) # use nodejs-mozilla because nodejs is outdated

 # Common event loop handling
 installPackages+=(libglib2.0-dev)
@@ -114,6 +116,10 @@ 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
@@ -129,6 +135,11 @@ 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)
@@ -142,7 +153,6 @@ installPackages+=(libxcomposite-dev)
 installPackages+=(libxdamage-dev)
 installPackages+=(libxrandr-dev)
 installPackages+=(libfontconfig1-dev)
-installPackages+=(libxss-dev)
 installPackages+=(libsrtp2-dev)
 installPackages+=(libwebp-dev)
 installPackages+=(libjsoncpp-dev)
@@ -220,6 +230,7 @@ pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/sh

 source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
 SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
+SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"

 OpenSSLVersion="$(openssl version |cut -b 9-14)"
 echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
--- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-yocto.sh
+++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/04-yocto.sh
@@ -42,13 +42,16 @@ 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-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"
+package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemuarm-abc23a6.sh"
+PrimaryUrl="$primaryBaseUrlPath/$package"
+AltUrl="$altBaseUrlPath/$package"
+SHA1="4d52038872f795fff3745c7cb5e1e89736122958"
 yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh"
 yoctoLocationARMv7="/opt/b2qt/$versionARM"
 sysrootARMv7="armv7vet2hf-neon-poky-linux-gnueabi"
@@ -65,10 +68,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-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"
+package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemuarm64-abc23a6.sh"
+PrimaryUrl="$primaryBaseUrlPath/$package"
+AltUrl="$altBaseUrlPath/$package"
+SHA1="7644f8ac883cd017a6abd4dafe7abfe21e922466"
 yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh"
 yoctoLocationARM64="/opt/b2qt/$versionARM64"
 sysrootARM64="cortexa57-poky-linux"
@@ -85,10 +88,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-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"
+package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemumips64-abc23a6.sh"
+PrimaryUrl="$primaryBaseUrlPath/$package"
+AltUrl="$altBaseUrlPath/$package"
+SHA1="7f3b84f68957c929deb031a53d55a5620b6cee5b"
 yoctoInstaller="/tmp/yocto-toolchain-mips64.sh"
 yoctoLocationMIPS64="/opt/b2qt/$versionMIPS64"
 sysrootMIPS64="mips64r2-poky-linux"
--- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh
+++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh
@@ -35,9 +35,10 @@ 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 \
+sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \
         libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
-         mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel glproto-devel
+         mozilla-nspr-devel mozilla-nss-devel nodejs12 glproto-devel \
+         libxshmfence-devel libXdamage-devel

 # qtwebkit
 sudo zypper -nq install libxml2-devel libxslt-devel
--- a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh
+++ b/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="29.0.3"
+sdkBuildToolsVersion="30.0.3"
 # this is compile sdk version
-sdkApiLevel="android-29"
+sdkApiLevel="android-30"

 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"
--- a/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh
+++ b/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="29.0.3"
+sdkBuildToolsVersion="30.0.3"
 # this is compile sdk version
-sdkApiLevel="android-29"
+sdkApiLevel="android-30"

 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"
--- a/coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh
+++ b/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/macos_10.15_catalina/Xcode_12.4.xip 12.4
+InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_12.5.1.xip 12.5.1
--- a/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh
+++ b/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.4"
+version="12.5.1"
 packageName="Command_Line_Tools_for_Xcode_$version.dmg"
-url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.15_catalina/$packageName"
-sha1="eabb32d167da029dfc70af94de2bf61abd416ca1"
+url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName"
+sha1="eaf175f4c8854511a6e829f360eb3a7d59afa517"

 InstallCommandLineTools $url $url $sha1 $packageName $version

--- a/coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh
+++ b/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="29.0.3"
+sdkBuildToolsVersion="30.0.3"
 # this is compile sdk version
-sdkApiLevel="android-29"
+sdkApiLevel="android-30"

 toolsSourceFile="$basePath/$toolsFile"
 ndkSourceFile="$basePath/$ndkFile"
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/1
+++ b/1
--- a/1
+++ b/1
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2