From 62efea7477c2fd87a66c7bfebf35da3e894c22f0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 26 Mar 2021 15:35:51 +0200 Subject: [PATCH 1/2] Update submodules on '6.0' in qt/qt5 Change-Id: I361b0238a67f8522430bd9e4da153d16e88d1671 Reviewed-by: Qt Submodule Update Bot --- qt5compat | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtshadertools | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt5compat b/qt5compat index 130c9cb7..f97a2760 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 130c9cb7ebf53420f665293fb6e8de65d4ce9a63 +Subproject commit f97a2760aace483efe57bb0a81c9e94da9fe0c6b diff --git a/qtbase b/qtbase index 0ff1dc71..8f7bcbf1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0ff1dc7110d373c85ce41e90073291b5e2eb16ad +Subproject commit 8f7bcbf1c686d3291b58c77dc59d5dca9c7a4b6a diff --git a/qtdeclarative b/qtdeclarative index 373897b4..f8b18d7e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 373897b4bbbafc890e631ec19125d09efbc4c8c9 +Subproject commit f8b18d7e03e24c7b96cfe8c35cd80ed40169ec98 diff --git a/qtdoc b/qtdoc index 4ae02383..d3d38809 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 4ae023839759657478ca393055992eabee05e276 +Subproject commit d3d38809112e69c4136cf1f857469201b9d2c80e diff --git a/qtqa b/qtqa index a054f63d..6a6c9e09 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit a054f63dcfad2b8beadf98669792178169155dea +Subproject commit 6a6c9e090e91acc83901e6c619f130130e0ea796 diff --git a/qtquick3d b/qtquick3d index 025a8725..4b64d2a4 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 025a872585467e0672397b2d8d422556e8727a5d +Subproject commit 4b64d2a419a340ded04dd83722fbcb248b932b9e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 65d22566..71512cca 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 65d225661bf14e624f534dca900f3df26806ce7e +Subproject commit 71512cca5605ce76f00ec33212886792a9ab987b diff --git a/qtquicktimeline b/qtquicktimeline index a2f76822..8fc053c4 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit a2f76822e92881f15addf670eb9e388325ecd68d +Subproject commit 8fc053c4508a41b69fc936aa4a33e71678427029 diff --git a/qtshadertools b/qtshadertools index f13989c1..2129a3cf 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit f13989c1b21534ee1b0e5b38578dcce12dbb88a5 +Subproject commit 2129a3cfab3e8187b7a47aa0d8ca14df9660543e diff --git a/qtsvg b/qtsvg index db100719..ad3bbb64 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit db100719911af8d5728d54ed1e6866f07a774c85 +Subproject commit ad3bbb6406697354178fbe13145466e6207c834d diff --git a/qttools b/qttools index 792adc3d..c8f2ef09 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 792adc3dd0f59a56273189f290c3edc327e140b7 +Subproject commit c8f2ef09c12adfdc42561bbf6938f6d67fbed789 diff --git a/qttranslations b/qttranslations index 125adc55..653d5962 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 125adc55b4b7005c0609d1c65c3dbed8f6dc48c3 +Subproject commit 653d596295bb735f0d13fcbbb04a51d32d841e71 diff --git a/qtwayland b/qtwayland index 49f7b8ef..a5889bc4 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 49f7b8ef3505e8f0d9a5acfeea9c2e09e6f1697f +Subproject commit a5889bc4e8d91f47b097431990bb25377ec49c2e From 2e888450151543938bf09557ba96860f4f44f165 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 24 Mar 2021 08:21:04 +0200 Subject: [PATCH 2/2] Provisioning: Install GCC toolset for CentOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GCC toolset provides upgraded GCC version for CentOS. Change-Id: Ia62c7abf21eeed5d65c6b2e35fe1013d839cfa24 Reviewed-by: Qt CI Bot Reviewed-by: Tony Sarajärvi (cherry picked from commit 066964d275e37487e09df21a2759a0c127e06b7b) Reviewed-by: Qt Cherry-pick Bot --- .../03-install-gcc-toolset.sh | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh diff --git 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 new file mode 100644 index 00000000..fbd1081d --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/03-install-gcc-toolset.sh @@ -0,0 +1,41 @@ +#!/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$ +## +############################################################################# + +set -ex + +sudo yum -y install gcc-toolset-9 + +echo "source /opt/rh/gcc-toolset-10/enable" >> ~/.bashrc +