diff options
author | Robert Griebl <robert.griebl@pelagicore.com> | 2016-05-30 15:56:46 +0200 |
---|---|---|
committer | Robert Griebl <robert.griebl@pelagicore.com> | 2016-06-02 11:15:52 +0000 |
commit | ad92263c32fd5fc1f79134607e99160d459b64e0 (patch) | |
tree | 3670f748e51130f31419104670847f6efceb6453 /config.tests | |
parent | 9c03a172edbb9fef62415a57953de1f15a43bed6 (diff) |
Fixed license header to align with the final QtAS contract.
The AppMan is triple-licensed now, like the rest of Qt:
commercial, LGPL3 and GPL2/3
To be more aligned with Qt, the docs are also FDL and the tests, as well
as the tools are GPL-EXCEPT now.
Change-Id: Ib0168a112c3bcd340576f92416a6fe36fa315240
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'config.tests')
-rw-r--r-- | config.tests/libarchive/main.cpp | 22 | ||||
-rw-r--r-- | config.tests/libyaml/main.cpp | 22 |
2 files changed, 32 insertions, 12 deletions
diff --git a/config.tests/libarchive/main.cpp b/config.tests/libarchive/main.cpp index f50803ad..7dacf7ad 100644 --- a/config.tests/libarchive/main.cpp +++ b/config.tests/libarchive/main.cpp @@ -6,7 +6,7 @@ ** ** This file is part of the Pelagicore Application Manager. ** -** $QT_BEGIN_LICENSE:GPL-QTAS$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage ** Licensees holding valid commercial Qt Automotive Suite licenses may use ** this file in accordance with the commercial license agreement provided @@ -15,18 +15,28 @@ ** 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 Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU -** 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 +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or 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.GPL2 and 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. +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -** SPDX-License-Identifier: GPL-3.0 +** SPDX-License-Identifier: LGPL-3.0 ** ****************************************************************************/ diff --git a/config.tests/libyaml/main.cpp b/config.tests/libyaml/main.cpp index 0414f7bf..4bb68453 100644 --- a/config.tests/libyaml/main.cpp +++ b/config.tests/libyaml/main.cpp @@ -6,7 +6,7 @@ ** ** This file is part of the Pelagicore Application Manager. ** -** $QT_BEGIN_LICENSE:GPL-QTAS$ +** $QT_BEGIN_LICENSE:LGPL-QTAS$ ** Commercial License Usage ** Licensees holding valid commercial Qt Automotive Suite licenses may use ** this file in accordance with the commercial license agreement provided @@ -15,18 +15,28 @@ ** 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 Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU -** 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 +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or 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.GPL2 and 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. +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -** SPDX-License-Identifier: GPL-3.0 +** SPDX-License-Identifier: LGPL-3.0 ** ****************************************************************************/ |