mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-17 09:46:08 +08:00
Merge branch 6.0 into pyside6.0
Change-Id: I2c9feb7c493239cde76e2a77da81b9e7928b76a4
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Submodule qtdeclarative updated: 269cfce29f...52feae162b
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 860e0a5c60...56ad6e6296
2
qtqa
2
qtqa
Submodule qtqa updated: 00358875cc...e7a24c842b
Submodule qtquick3d updated: ea056f5fd8...db60f9195e
Submodule qtquickcontrols2 updated: fbe21b6e25...0dbcbf867c
Submodule qtquicktimeline updated: 5423058bba...95004eb164
2
qttools
2
qttools
Submodule qttools updated: 48bbf9d6f3...2405d96658
Submodule qttranslations updated: 2d1f97a5d1...577d910272
Submodule qtwayland updated: a4f25b01ed...4f75585999
Reference in New Issue
Block a user