Merge branch 6.0 into pyside6.0

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

View File

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

2
qtbase

Submodule qtbase updated: 0ff1dc7110...8f7bcbf1c6

2
qtdoc

Submodule qtdoc updated: 4ae0238397...d3d3880911

2
qtqa

Submodule qtqa updated: a054f63dcf...6a6c9e090e

2
qtsvg

Submodule qtsvg updated: db10071991...ad3bbb6406

Submodule qttools updated: 792adc3dd0...c8f2ef09c1