diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2016-04-05 21:39:08 +0200 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2016-04-11 15:28:22 +0000 |
| commit | 755b9db736d5c03dbd2d55dfca6becf666e3150d (patch) | |
| tree | 6a69e75be9f1c610b745075e74687755986b8556 /src/bench/host.h | |
| parent | 8a36a105b356c226ffbbbec305fc99333e211d79 (diff) | |
Use the same license wording for GPL3 as the standard Qt 5.7 license.
Change-Id: Ic1b9bda12459b552cc78c5346544a8b443270ff4
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'src/bench/host.h')
| -rw-r--r-- | src/bench/host.h | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/bench/host.h b/src/bench/host.h index 67bc4a1..ef22278 100644 --- a/src/bench/host.h +++ b/src/bench/host.h @@ -1,26 +1,27 @@ /**************************************************************************** ** ** Copyright (C) 2016 Pelagicore AG -** Contact: http://www.qt.io/ or http://www.pelagicore.com/ +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QmlLive tool. ** -** $QT_BEGIN_LICENSE:GPL3-PELAGICORE$ +** $QT_BEGIN_LICENSE:GPL-QTAS$ ** Commercial License Usage -** Licensees holding valid commercial Pelagicore QmlLive -** 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 -** Pelagicore. For licensing terms and conditions, contact us at: -** http://www.pelagicore.com. +** Licensees holding valid commercial Qt Automotive Suite 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 https://www.qt.io/terms-conditions. +** For further information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3 requirements will be -** met: http://www.gnu.org/licenses/gpl-3.0.html. +** General Public License version 3 or (at your option) any later version +** approved by the KDE Free Qt Foundation. The licenses are as published by +** the Free Software Foundation and appearing in the file LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** |