diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-23 07:59:29 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-23 08:02:11 +0100 |
| commit | 85eb7b7a03ff0dab3b68f11a341e060eb066940a (patch) | |
| tree | e6607708f35431f131df9dc8ba7ac42cdaf3dd71 /coin/provisioning/qtci-linux-openSUSE-15.0-x86_64 | |
| parent | 390a373f28e5c3cdcb87f4af74976d5b5cba72b2 (diff) | |
| parent | 47d14b365ed7ee6b174d48c9cb14d72c66c26d71 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
coin/platform_configs/default.txt
Change-Id: Ie21baa51738ce0761fb45fba3819b1894cc808b6
Diffstat (limited to 'coin/provisioning/qtci-linux-openSUSE-15.0-x86_64')
| -rwxr-xr-x | coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/50-open62541.sh | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/50-open62541.sh b/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/50-open62541.sh deleted file mode 100755 index 21c926b8..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-15.0-x86_64/50-open62541.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/env bash - -############################################################################# -## -## Copyright (C) 2017 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$ -## -############################################################################# - -# shellcheck source=../common/linux/open62541.sh -source "${BASH_SOURCE%/*}/../common/linux/open62541.sh" |