Update submodules on '6.1' in qt/qt5

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

.gitmodules

@@ -18,11 +18,10 @@
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
-	recommends = qttools
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -122,18 +121,17 @@
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
-	recommends = qtdeclarative qtshadertools qttools
+	recommends = qtdeclarative qtshadertools
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
-	recommends = qttools
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
@@ -236,25 +234,25 @@
 	status = ignore
 [submodule "qtcharts"]
 	depends = qtbase
-	recommends = qtdeclarative qtmultimedia qttools
+	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
-	recommends = qtdeclarative qtmultimedia qttools
+	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia qtquickcontrols qttools
+	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -264,11 +262,10 @@
 	status = ignore
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
-	recommends = qttools
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
@@ -278,11 +275,10 @@
 	status = ignore
 [submodule "qtnetworkauth"]
 	depends = qtbase
-	recommends = qttools
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
@@ -299,11 +295,10 @@
 	status = ignore
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
-	recommends = qttools
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
@@ -332,17 +327,17 @@
 	depends = qtbase qttools
 	path = qtcoap
 	url = ../qtcoap.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative qttools
 	path = qtmqtt
 	url = ../qtmqtt.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative qtquickcontrols2 qttools
 	path = qtopcua
 	url = ../qtopcua.git
-	branch = dev
-	status = additionalLibrary
+	branch = 6.1
+	status = addon

cmake/QtTopLevelHelpers.cmake

@@ -108,8 +108,9 @@ function(qt_internal_sort_module_dependencies modules out_all_ordered dependenci
                 "${${module_dependencies_list_var_name}}" PARENT_SCOPE)
         if(NOT module_depends)
             list(APPEND no_dependencies "${module}")
+        else()
+            set(ordered "${out_ordered}")
         endif()
-        set(ordered "${out_ordered}")
     endforeach()
     if (no_dependencies)
         list(APPEND ordered "${no_dependencies}")

coin/platform_configs/cmake_platforms.yaml

@@ -50,7 +50,7 @@ Configurations:
     Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
     Compiler: 'GCC'
     Features: ['Packaging', 'Sccache', 'DoNotRunTests']
-    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY'
     Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
@@ -67,6 +67,13 @@ Configurations:
     Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
+-
+    Template: 'qtci-linux-openSUSE-15.2-x86_64-50'
+    Compiler: 'GCC'
+    Features: ['Packaging', 'Sccache']
+    Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY'
+    Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
+        'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
 -
     Template: 'qtci-linux-SLES-15_SP2-x86_64-50'
     Compiler: 'GCC'
@@ -137,3 +144,36 @@ Configurations:
     Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
     Environment variables: ['Path={{.Env.MINGW810}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
         'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache','LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
+-
+    Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
+    Target os: 'QNX_710'
+    Target arch: 'x86_64'
+    Compiler: 'GCC'
+    Target compiler: 'QCC'
+    Platform dependency: 'Ubuntu-20.04-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'Insignificant']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -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-Ubuntu-20.04-x86_64-50'
+    Target os: 'QNX_710'
+    Target arch: 'arm64'
+    Compiler: 'GCC'
+    Target compiler: 'QCC'
+    Platform dependency: 'Ubuntu-20.04-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'Insignificant']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -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-Ubuntu-20.04-x86_64-50'
+    Target os: 'QNX_710'
+    Target arch: 'armv7'
+    Compiler: 'GCC'
+    Target compiler: 'QCC'
+    Platform dependency: 'Ubuntu-20.04-host'
+    Features: ['Packaging', 'Sccache', 'DisableTests', 'Insignificant']
+    Environment variables: [
+        'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -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/provisioning/common/linux/gcc.sh

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

coin/provisioning/common/linux/qnx_710.sh

@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2021 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+# This script installs QNX 7.
+
+set -ex
+
+# shellcheck source=../unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+DownloadAndExtract () {
+    url=$1
+    sha=$2
+    file=$3
+    folder=$4
+
+    DownloadURL "$url" "$url" "$sha" "$file"
+    sudo tar -C $folder -Jxf $file
+
+    rm -rf $file
+}
+
+targetFolder="/opt/"
+folderName="qnx710"
+targetPath="$targetFolder$folderName"
+
+if [ ! -d "$targetFolder" ]; then
+    mkdir -p $targetFolder
+fi
+
+# QNX SDP
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx710-20201027-linux.tar.xz"
+targetFile="qnx710.tar.xz"
+sha1="fa9eb0f4247504a546cb014784646847eb6c8114"
+DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
+
+# Toolchain files
+sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx-toolchains.tar.xz"
+targetFile="qnx-toolchains.tar.xz"
+sha1="d8a97605d80a2296f98caba3854557ca0dd5d7d3"
+DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetPath"
+
+sudo chown -R qt:users "$targetPath"
+
+# Verify that we have last files in tars
+if [ ! -f $targetPath/qnxsdp-env.sh ] || [ ! -f $targetPath/qnx-toolchain-x8664.cmake ]
+then
+    echo "QNX toolchain installation failed!"
+    exit -1
+fi
+
+# Set env variables
+SetEnvVar "QNX_710" "$targetPath"
+
+echo "QNX SDP = 7.1.0" >> ~/versions.txt

coin/provisioning/common/unix/squishInstall.sh

@@ -41,7 +41,7 @@ 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-20210119-1632"
+version="6.7-20210318-1241"
 qtBranch="60x"
 installFolder="/opt"
 squishFolder="$installFolder/squish"
@@ -49,12 +49,12 @@ preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build
 licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/515x/.squish-3-license"
 licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a"
 if uname -a |grep -q Darwin; then
-     version="6.6.1"
-     compressedFolder="prebuild-squish-$version-515x-macx86_64.tar.gz"
-     sha1="9fff9a7cb037214d21f47f2cc53747885fd1f2ae"
+     version="6.7-20210301-1401"
+     compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz"
+     sha1="562d065ed810f03cb0dad4cf81a4fc688bc813ec"
 else
      compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz"
-     sha1="8780665c3560456cd86980802cb24513233444fe"
+     sha1="80b3f36e760963a6989a49c79818bf8671d1932a"
 fi
 
 mountFolder="/tmp/squish"
@@ -117,31 +117,24 @@ if uname -a |grep -q "Ubuntu"; then
     echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.profile
     echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.profile
 else
-    echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc
-    echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc
+    echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.bashrc
+    echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.bashrc
 fi
 
 echo "Verifying Squish, available installations:"
 ls -la $squishFolder
-if uname -a |grep -q Darwin; then
-  if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
-      echo "Squish for Qt installation tested successfully"
-  else
-      echo "Squish for Qt test failed! Package wasn't installed correctly."
-      exit 1
-  fi
+
+if "$squishFolder/squish_for_qt5/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
+  echo "Squish for Qt5 installation tested successfully"
 else
-  if "$squishFolder/squish_for_qt5/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
-      echo "Squish for Qt5 installation tested successfully"
-  else
-      echo "Squish for Qt5 test failed! Package wasn't installed correctly."
-      exit 1
-  fi
-  if "$squishFolder/squish_for_qt6/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
-      echo "Squish for Qt6 installation tested successfully"
-  else
-      echo "Squish for Qt6 test failed! Package wasn't installed correctly."
-      exit 1
-  fi
+  echo "Squish for Qt5 test failed! Package wasn't installed correctly."
+  exit 1
+fi
+if "$squishFolder/squish_for_qt6/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
+  echo "Squish for Qt6 installation tested successfully"
+else
+  echo "Squish for Qt6 test failed! Package wasn't installed correctly."
+  exit 1
 fi
 
+

coin/provisioning/common/windows/squishInstall.ps1

@@ -36,7 +36,7 @@
 # This script will pre-installed squish package for Windows.
 # Squish is need by Release Test Automation (RTA)
 
-$version = "6.7-20210112-1612"
+$version = "6.7-20210319-0956"
 $qtBranch = "60x"
 $targetDir = "C:\Utils\squish"
 $squishPackage = "C:\Utils\rta_squish"
@@ -50,7 +50,7 @@ Write-Host "Installing Squish license to home directory"
 Copy-Item $licenseUrl\$licensePackage ~\$licensePackage
 
 if (Is64BitWinHost) {
-     $arch = "x64"
+    $arch = "x64"
 } else {
     $arch = "x86"
 }
@@ -60,15 +60,10 @@ $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\Curren
 if ($OSVersion -eq "Windows 10 Enterprise") {
     $winVersion = "win10"
     if (Is64BitWinHost) {
-        $sha1 = "628bb65cf515d08df388b0dc4d5b403e4c6657b2"
-    } else {
-        $sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705"
-        #Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild
-        $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\6.6.1_rerun"
+        $sha1 = "61eca4950d24d9780e02cd4183c54009eda46114"
     }
-} elseif ($OSVersion -eq "Windows 7 Enterprise") {
-    $winVersion = "win7"
-    $sha1 = "ec890c16bb671ae79b093ba81e6567d2780f85a2"
+} else {
+    $winVersion = "n/a"
 }
 $squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip"
 

coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,35 +33,9 @@
 ##
 #############################################################################
 
-# This script installs QNX 7.
-
 set -ex
 
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+sudo yum -y install gcc-toolset-9
 
-targetFolder="/opt/"
-sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-linux.tar.xz"
-sha1="9fb115b2c84b8e7b6016a51cc421a763bda298a1"
-folderName="qnx700"
-targetFile="qnx700.tar.xz"
-wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
-echo "$sha1  $targetFile" | sha1sum --check
-if [ ! -d "$targetFolder" ]; then
-    mkdir -p $targetFolder
-fi
-sudo tar -C $targetFolder -Jxf $targetFile
-sudo chown -R qt:users "$targetFolder"/"$folderName"
+echo "source /opt/rh/gcc-toolset-10/enable" >> ~/.bashrc
 
-# Verify that we have last file in tar
-if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then
-    echo "Installation failed!"
-    exit -1
-fi
-
-rm -rf $targetFile
-
-# Set env variables
-SetEnvVar "QNX_700" "$targetFolder$folderName"
-
-echo "QNX SDP = 7.0.0" >> ~/versions.txt

coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_710.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -36,4 +36,4 @@
 set -ex
 
 # shellcheck source=../common/linux/qnx_700.sh
-source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh"
+source "${BASH_SOURCE%/*}/../common/linux/qnx_710.sh"

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh

@@ -5,4 +5,4 @@ set -ex
 # shellcheck source=../common/linux/gcc.sh
 source "${BASH_SOURCE%/*}/../common/linux/gcc.sh"
 
-InstallGCC 9.3.0 50 5038e8752407d14e5a70c8efc80c20a6d4219aaa 212f77d7b7fe1fdf01a1c0b0ebc9d82aeda5e1e0
+InstallGCC 8.3.0 50 ccccfe4fe9206d111a173c19a21f8700d1133ae8 c27f4499dd263fe4fb01bcc5565917f3698583b2

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

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the test suite of the Qt Toolkit.
@@ -36,4 +36,4 @@
 set -ex
 
 # shellcheck source=../common/linux/qnx_700.sh
-source "${BASH_SOURCE%/*}/../common/linux/qnx_700.sh"
+source "${BASH_SOURCE%/*}/../common/linux/qnx_710.sh"

coin/provisioning/qtci-macos-10.15-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.3.xip 12.3
+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-10.15-x86_64/21-install-commandlinetools.sh

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -37,10 +37,10 @@ set -ex
 
 # shellcheck source=../common/macos/install-commandlinetools.sh
 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
-version="12.3"
+version="12.4"
 packageName="Command_Line_Tools_for_Xcode_$version.dmg"
 url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.15_catalina/$packageName"
-sha1="67d55d5868e1f495a66e2b302e91a3cdea923ca9"
+sha1="eabb32d167da029dfc70af94de2bf61abd416ca1"
 
 InstallCommandLineTools $url $url $sha1 $packageName $version
 

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.3.xip 12.3
+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

@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2020 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -37,10 +37,10 @@ set -ex
 
 # shellcheck source=../common/macos/install-commandlinetools.sh
 source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
-version="12.3"
+version="12.4"
 packageName="Command_Line_Tools_for_Xcode_$version.dmg"
 url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.15_catalina/$packageName"
-sha1="67d55d5868e1f495a66e2b302e91a3cdea923ca9"
+sha1="eabb32d167da029dfc70af94de2bf61abd416ca1"
 
 InstallCommandLineTools $url $url $sha1 $packageName $version
 

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

@@ -1,2 +0,0 @@
-. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 vs2019
-. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw $False

coin/provisioning/qtci-windows-10-x86/90-squish.ps1

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

coin/provisioning/qtci-windows-10-x86_64/01-disable-runtimebroker.ps1

@@ -0,0 +1,4 @@
+# Disable RunTime Broker
+# The RunTime Broker is a Windows system process, which helps to manage app permissions on your pc between Windows apps and ensures apps are behaving themselves.
+# Coordinates execution of background work for WinRT application. If this service is stopped or disabled, then background work might not be triggered.
+reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\TimeBrokerSvc" /V Start /T REG_dWORD /D 4 /F

init-repository

@@ -72,11 +72,14 @@ Options:
         Only initialize the specified subset of modules given as the
         argument. Specified modules must already exist in .gitmodules. The
         string "all" results in cloning all known modules. The strings
-        "essential", "addon", "preview", "deprecated", "obsolete", and
-        "ignore" refer to classes of modules; "default" maps to
-        "essential,addon,preview,deprecated", which corresponds with the
-        set of maintained modules and is also the default set. Module
-        names may be prefixed with a dash to exclude them from a bigger
+        "essential", "addon", "preview", "deprecated", "obsolete",
+        "additionalLibrary", and "ignore" refer to classes of modules
+        identified by "status=" lines in the .gitmodules file.
+        You can use "default" in the subset as a short-hand for
+        "essential,addon,preview,deprecated", which corresponds to the set of
+        maintained modules included in standard Qt releases; this is also the
+        default module subset when this option is not given. Entries
+        may be prefixed with a dash to exclude them from a bigger
         set, e.g. "all,-ignore".
 
     --no-update
@@ -646,7 +649,7 @@ sub run
     die("Have no origin remote.\n") if (!$url);
     $url =~ s,\.git$,,;
     $url =~ s/((?:tqtc-)?qt5)$//;
-    my $qtrepo = $1 or 'qt5';
+    my $qtrepo = $1 || 'qt5';
     $self->{'base-url'} = $url;
 
     $self->git_clone_all_submodules($qtrepo, $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}});