Update submodules on '6.1' in qt/qt5

Change-Id: I5f47d5cf58e16c3599d10cfc5cd3476f823369bd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2026-01-26 00:26:26 +08:00 · 2021-04-06 06:45:45 +03:00 · 2021-04-01 16:31:29 +03:00 · 2021-04-01 10:05:18 +03:00 · 2021-03-31 09:39:29 +00:00 · 2021-03-30 14:55:18 +00:00
42 changed files with 224 additions and 132 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -18,11 +18,10 @@
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
-	recommends = qttools
 	path = qtactiveqt
 	url = ../qtactiveqt.git
 	branch = 6.1
-	status = additionalLibrary
+	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 = 6.1
-	status = additionalLibrary
+	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
-	recommends = qttools
 	path = qtimageformats
 	url = ../qtimageformats.git
 	branch = 6.1
-	status = additionalLibrary
+	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 = 6.1
-	status = additionalLibrary
+	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
-	recommends = qtdeclarative qtmultimedia qttools
+	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
 	branch = 6.1
-	status = additionalLibrary
+	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
-	recommends = qtmultimedia qtquickcontrols qttools
+	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
 	branch = 6.1
-	status = additionalLibrary
+	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 = 6.1
-	status = additionalLibrary
+	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 = 6.1
-	status = additionalLibrary
+	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 = 6.1
-	status = additionalLibrary
+	status = addon
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
@@ -333,16 +328,16 @@
 	path = qtcoap
 	url = ../qtcoap.git
 	branch = 6.1
-	status = additionalLibrary
+	status = addon
 [submodule "qtmqtt"]
 	depends = qtbase qtdeclarative qttools
 	path = qtmqtt
 	url = ../qtmqtt.git
 	branch = 6.1
-	status = additionalLibrary
+	status = addon
 [submodule "qtopcua"]
 	depends = qtbase qtdeclarative qtquickcontrols2 qttools
 	path = qtopcua
 	url = ../qtopcua.git
 	branch = 6.1
-	status = additionalLibrary
+	status = addon
--- a/cmake/QtTopLevelHelpers.cmake
+++ b/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}")
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -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']
--- a/coin/provisioning/common/linux/qnx_710.sh
+++ b/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
--- a/coin/provisioning/common/unix/squishInstall.sh
+++ b/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

+
--- a/coin/provisioning/common/windows/squishInstall.ps1
+++ b/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"

--- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh
+++ b/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
--- a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/07-qnx_710.sh
+++ b/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"
--- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/70-qnx710.sh
+++ b/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"
--- a/coin/provisioning/qtci-macos-10.15-x86_64/20-xcode.sh
+++ b/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
--- a/coin/provisioning/qtci-macos-10.15-x86_64/21-install-commandlinetools.sh
+++ b/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

--- 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.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
--- 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
@@ -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

--- a/coin/provisioning/qtci-windows-10-x86/08-libclang.ps1
+++ b/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
--- a/coin/provisioning/qtci-windows-10-x86_64/01-disable-runtimebroker.ps1
+++ b/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
--- a/13
+++ b/13
@@ -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
--- 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
--- 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
Author	SHA1	Message	Date
Qt Submodule Update Bot	7f4029e0dc	Update submodules on '6.1' in qt/qt5 Change-Id: I5f47d5cf58e16c3599d10cfc5cd3476f823369bd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-04-06 06:45:45 +03:00
Qt Submodule Update Bot	9938bdeaf1	Update submodules on '6.1' in qt/qt5 Change-Id: I365868f578ba0f55975a7d126f195e50bbca415d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-04-01 16:31:29 +03:00
Qt Submodule Update Bot	1f9f80366c	Update submodules on '6.1' in qt/qt5 Change-Id: I587b3c71f3b1f4f6b6fd36808d109f75407dfa3a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-04-01 10:05:18 +03:00
Kai Köhne	6a85c577bb	Fix ignored submodules if a submodule does not have a dependency.yaml If a subdirectory has a CMakeLists.txt file, but no dependency.yaml file qt_internal_add_module_dependencies will bail out early, with out_module_dependencies being empty. Fixes: QTBUG-92257 Change-Id: I024e812e9debd3c83b24bf306ff0375b2cb08659 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit `1397f8c123`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-03-31 09:39:29 +00:00
Heikki Halmet	ea508a87a8	Provisioning: Disable RunTime broker On some cases RunTime broker might eat huge amount of CPU Change-Id: Ie01b4e1a48e2f9e7e0deb9970160ffc92854d79b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Dimitrios Apostolou <jimis@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `3444b91634`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-03-30 14:55:18 +00:00
Qt Submodule Update Bot	18aebc6347	Update submodules on '6.1' in qt/qt5 Change-Id: Ia303bba9d248547c425839aea4d0dd5110ba8bd1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-30 07:35:29 +03:00
Qt Submodule Update Bot	f313c704ad	Update submodules on '6.1' in qt/qt5 Change-Id: Ic62e30c724dfc7531801527be044a444afbb690a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-29 12:27:58 +03:00
Johanna Äijälä	eb0962abdd	Provisioning: update Squish packges Still using unreleased custom snapshot packages from Froglogic. macOS: use custom build Qt5.15 package with separate Squish server adjusted for Qt6. Change-Id: I8605204118015feb347268c335ef731ff99e3c68 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit `02d4c34b7d`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-03-28 15:29:03 +00:00
Heikki Halmet	3a49fa3b96	Provisioning: Upgrade Xcode to version 12.4 for macOS 10.15 and 11.0 Task-number: QTQAINFRA-4230 Change-Id: Id3de8771e18da5d40cf62ad501a23fce89e845c4 Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `7a027b4dfd`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-03-26 17:15:49 +00:00
Heikki Halmet	1391b297e1	Provisioning: Install GCC toolset for CentOS GCC toolset provides upgraded GCC version for CentOS. Change-Id: Ia62c7abf21eeed5d65c6b2e35fe1013d839cfa24 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit `066964d275`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-03-26 17:15:49 +00:00
Jani Heikkinen	4d6b15b0b6	Revert "Add qttools as additional dependency to additional libraries" This reverts commit `b194786ec9`. Reason for revert: additional libraries will be part of qt5.git build -> we don't need to have qttools as dependency there anymore Change-Id: Ib4177b35ecd58ea682a69f6e4e68e4ddd5e24e49 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>	2021-03-26 11:43:59 +00:00
Jani Heikkinen	55874781a1	Change all additional libraries to addons It has been decided to not ship source-only Conan packages in Qt 6.1, but revert back to delivering the additional libraries similarly as with Qt 5. That's why we need to switch all additional libraries to addon to start building binaries for those as well in qt5.git integration. Task-number: QTBUG-91796 Pick-to: dev Change-Id: Ia154b62d5c1a997575d844aaf21f399a24626748 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>	2021-03-26 13:43:44 +02:00
Jani Heikkinen	4f3dac297e	Update submodules in Qt 6.1 Change-Id: If62b08a88735d363870b510a29947b8335f9569b Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>	2021-03-26 13:43:39 +02:00
Paul Wicking	918855032f	Update documentation for init-repository There's no mention of additionalLibrary status. Change-Id: I3ebf8fdc6dcfc01392b1ab5a42734cef81d6fc61 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit `ed139ea47e`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-03-26 07:35:07 +00:00
Qt Submodule Update Bot	e017897c6a	Update submodules on '6.1' in qt/qt5 Change-Id: Ia71ea6404ca4d02a9041e8dce147b75e68f38e2a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-25 13:13:05 +02:00
Heikki Halmet	ecd6cdc88c	Provisioning: Remove libclang from Windows 10 x86 Libclang static is not needed by Qt Creator. Also x86 package is not available in download.qt.io or in cache. Qt Creator is the only one using Windows 10 x86 at the moment. Change-Id: I983db655c497105c3154ab64b170a8ed8739a59c Reviewed-by: Matti Paaso <matti.paaso@qt.io> (cherry picked from commit `152a80ec1d`) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>	2021-03-24 06:45:21 +00:00
Qt Submodule Update Bot	72675edae8	Update submodules on '6.1' in qt/qt5 Change-Id: I37895ada72590c1151cbb96bec243009fede77df Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-24 00:30:36 +02:00
Heikki Halmet	6f8b6a1535	Add Packaging target for openSUSE 15.2 With current approach we need to make two different linux installers. One for SUSE and one for other linux targets we support. This is because current CentOS version have newer GLIBC version than what we have in SUSE. This means that installer made with CentOS won't work in SUSE versions we support Task-number: QTBUG-91873 Change-Id: If65d66093bf8dcb5fe46812e06d6b9194fdedac2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit `fb65f86083`)	2021-03-23 07:17:42 +02:00
Qt Submodule Update Bot	f87e3d8579	Update submodules on '6.1' in qt/qt5 Change-Id: I4053082e1534339cd3c217ee57e9cb3990004050 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-23 02:21:23 +02:00
Qt Submodule Update Bot	73dad71b34	Update submodules on '6.1' in qt/qt5 Change-Id: I9a51f10d0069ffa8c80b7a7e95c7227053e89544 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-22 10:55:24 +02:00
Qt Submodule Update Bot	0569b55089	Update submodules on '6.1' in qt/qt5 Change-Id: Icf88c51297e40e5eb4f62a45a864101693e77c30 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-22 05:45:33 +02:00
Qt Submodule Update Bot	648d3fbd0e	Update submodules on '6.1' in qt/qt5 Change-Id: I6274aba818b7e9c256f18fc8a7c1f62a0586c2ea Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-18 04:28:02 +02:00
Qt Submodule Update Bot	54d68ef062	Update submodules on '6.1' in qt/qt5 Change-Id: Idd1ee66a3fa9b52294cc1d536fad4b65b2b33d32 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-18 01:15:34 +02:00
Qt Submodule Update Bot	56a4d9f0a0	Update submodules on '6.1' in qt/qt5 Change-Id: Ic2b391afaaef0386fb80e56d317f03e387975cc7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-17 19:02:44 +02:00
Qt Submodule Update Bot	9c98436644	Update submodules on '6.1' in qt/qt5 Change-Id: I567d543d8746ad23bcd455cf1001fb43d30d008f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-17 03:25:44 +02:00
Qt Submodule Update Bot	703d923b0d	Update submodules on '6.1' in qt/qt5 Change-Id: Id42ad1ecd7491ec2adae6c04087af7d7acb65145 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-16 19:47:52 +02:00
Marianne Yrjänä	bb51a64003	Add QNX7.1 to CI Task-number: QTQAINFRA-3768 Change-Id: I9c0aa78fad9c6a1263e75b06fa954c335f4b6ec2 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io> (cherry picked from commit `036729ed05`)	2021-03-16 13:42:45 +00:00
Qt Submodule Update Bot	d6eb043bb9	Update submodules on '6.1' in qt/qt5 Change-Id: I410ee553812448b0fc937df8c4b1561a85d09be0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>	2021-03-16 12:11:50 +02:00