Merge branch 6.0 into pyside6.0

Change-Id: I2c9feb7c493239cde76e2a77da81b9e7928b76a4
This commit is contained in:
Qt Forward Merge Bot
2021-03-31 11:15:03 +00:00
11 changed files with 13 additions and 13 deletions

View File

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

View File

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

2
qtdoc

Submodule qtdoc updated: 860e0a5c60...56ad6e6296

2
qtqa

Submodule qtqa updated: 00358875cc...e7a24c842b

Submodule qttools updated: 48bbf9d6f3...2405d96658