From af561036072f95193a1c49d65d5cf37c3dd2c88c Mon Sep 17 00:00:00 2001
From: Heikki Halmet <heikki.halmet@qt.io>
Date: Tue, 23 Mar 2021 09:07:10 +0200
Subject: [PATCH 1/2] Provisioning: Upgrade Xcode to version 12.4 for macOS
 10.15 and 11.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 7a027b4dfdf4baa65ebb07f748849aa47d5079b2)
---
 coin/provisioning/qtci-macos-10.15-x86_64/20-xcode.sh       | 2 +-
 .../qtci-macos-10.15-x86_64/21-install-commandlinetools.sh  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.15-x86_64/20-xcode.sh
index f2014388..270d894a 100755
--- 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
diff --git 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
index f13f7bae..ad047d1b 100755
--- 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
 

From 5a642020c3ca3ff1946bfd80e3e2ce2fa2af3901 Mon Sep 17 00:00:00 2001
From: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Date: Wed, 31 Mar 2021 08:02:19 +0300
Subject: [PATCH 2/2] Update submodules on '6.0' in qt/qt5

Change-Id: I7134ea8c8cce3b127337725245f12b5f9323b801
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
---
 qtdeclarative    | 2 +-
 qtdoc            | 2 +-
 qtqa             | 2 +-
 qtquick3d        | 2 +-
 qtquickcontrols2 | 2 +-
 qtquicktimeline  | 2 +-
 qttools          | 2 +-
 qttranslations   | 2 +-
 qtwayland        | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/qtdeclarative b/qtdeclarative
index 269cfce2..52feae16 160000
--- a/qtdeclarative
+++ b/qtdeclarative
@@ -1 +1 @@
-Subproject commit 269cfce29fc00d5cee919de91d4a45622a9715d2
+Subproject commit 52feae162b305d70f3009bfd30913fa458ec628e
diff --git a/qtdoc b/qtdoc
index 860e0a5c..56ad6e62 160000
--- a/qtdoc
+++ b/qtdoc
@@ -1 +1 @@
-Subproject commit 860e0a5c605748ce20673190a301cf2c4023e232
+Subproject commit 56ad6e629642fe9c5884315288123f3ab9aaf8c1
diff --git a/qtqa b/qtqa
index 00358875..e7a24c84 160000
--- a/qtqa
+++ b/qtqa
@@ -1 +1 @@
-Subproject commit 00358875ccc458e0c43c4c61993ecfd0aa1bae12
+Subproject commit e7a24c842b4b0fccd08df3b89b4462c872f51f4d
diff --git a/qtquick3d b/qtquick3d
index ea056f5f..db60f919 160000
--- a/qtquick3d
+++ b/qtquick3d
@@ -1 +1 @@
-Subproject commit ea056f5fd8f514c55b9b49c5f8f882e7480ace96
+Subproject commit db60f9195efacbfc9562b847eacb5f694d1f7ca0
diff --git a/qtquickcontrols2 b/qtquickcontrols2
index fbe21b6e..0dbcbf86 160000
--- a/qtquickcontrols2
+++ b/qtquickcontrols2
@@ -1 +1 @@
-Subproject commit fbe21b6e25eaa652032d13f3b990466d42afccd6
+Subproject commit 0dbcbf867c711b84bcb073f27be0f9f1a7e2372d
diff --git a/qtquicktimeline b/qtquicktimeline
index 5423058b..95004eb1 160000
--- a/qtquicktimeline
+++ b/qtquicktimeline
@@ -1 +1 @@
-Subproject commit 5423058bba2aef500f106d98274bac20b3b3f6e4
+Subproject commit 95004eb1645ff55feb7c6517de64bad7e5fa5f6b
diff --git a/qttools b/qttools
index 48bbf9d6..2405d966 160000
--- a/qttools
+++ b/qttools
@@ -1 +1 @@
-Subproject commit 48bbf9d6f3d896683bce8ec876b631073e8d3800
+Subproject commit 2405d96658a41624faf323b9b2ac3ead8161d458
diff --git a/qttranslations b/qttranslations
index 2d1f97a5..577d9102 160000
--- a/qttranslations
+++ b/qttranslations
@@ -1 +1 @@
-Subproject commit 2d1f97a5d14ae945815397e1802c34e38b705475
+Subproject commit 577d91027248237443c06252e270e279f16ba02c
diff --git a/qtwayland b/qtwayland
index a4f25b01..4f755859 160000
--- a/qtwayland
+++ b/qtwayland
@@ -1 +1 @@
-Subproject commit a4f25b01ed57b6607c9cb32b6043d70f1f395b78
+Subproject commit 4f755859996f1de9e246f86140f53543e520665c