diff options
author | Liang Qi <liang.qi@qt.io> | 2019-09-12 12:18:46 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-09-13 13:04:25 +0200 |
commit | 01ad208333f7467e906dfaf0b56be50cb6945f95 (patch) | |
tree | 362fd4cb43cedbfe0f34a15b2d711b6d02b15ae2 /coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh | |
parent | 6762ccb18664aee9e50b05a9d49042477405b9bb (diff) | |
parent | 39a9e58888b19d4ad6e821b2498d85121b283c6c (diff) |
Merge remote-tracking branch 'origin/5.13' into 5.14
This change partially reverts 24f0367a60fdd3379014e507fa7f4553d433c601.
Conflicts:
coin/platform_configs/default.yaml
SLES 12 got removed temporarily.
Task-number: QTQAINFRA-2851
Change-Id: Ib12a6e5ced3c89a5c8c9c2b1548a1c9d23d159d9
Diffstat (limited to 'coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh')
-rwxr-xr-x | coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh new file mode 100755 index 00000000..44cf1b80 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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 + +# shellcheck source=../common/unix/emsdk.sh +source "${BASH_SOURCE%/*}/../common/unix/emsdk.sh" |