diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2016-04-05 20:55:11 +0200 |
|---|---|---|
| committer | Dominik Holland <dominik.holland@pelagicore.com> | 2016-04-07 10:08:13 +0000 |
| commit | 9d9408b7e1c1de0a759e817d422f748e81f09987 (patch) | |
| tree | 93c477098f9621c0be7a093ca5424831880e4943 /src/geniviextras/qdltregistration.cpp | |
| parent | 8121b815ea4abe8f0b8454557f0bb6cbef6bf939 (diff) | |
Fix license headers to comply with Qt 5.7 standards.
src -> LGPL3/GPL3/GPL2/Commercial
tests -> GPL-EXCEPT
examples -> BSD
qdoc files -> FDL (or BSD if documenting examples)
pro/pri files -> no copyright header
Also removed the LGPL2.1 option from GeniviExtras, since it doesn't make sense
anymore when linking against a LGPL3 only QtCore library.
Change-Id: I9299cf86cf37c1dfbbe997686b624084f27c9149
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Diffstat (limited to 'src/geniviextras/qdltregistration.cpp')
| -rw-r--r-- | src/geniviextras/qdltregistration.cpp | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/geniviextras/qdltregistration.cpp b/src/geniviextras/qdltregistration.cpp index 983fc0f..34f0bdd 100644 --- a/src/geniviextras/qdltregistration.cpp +++ b/src/geniviextras/qdltregistration.cpp @@ -1,11 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2015 Pelagicore AG +** Copyright (C) 2016 Pelagicore AG ** Contact: http://www.qt.io/ or http://www.pelagicore.com/ ** ** This file is part of the QtIVI module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21-PELAGICORE$ +** $QT_BEGIN_LICENSE:LGPL3-PELAGICORE$ ** Commercial License Usage ** Licensees holding valid commercial Qt IVI licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -15,20 +15,26 @@ ** ** 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. +** 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. ** -** As a special exception, Pelagicore gives you certain additional -** rights. These rights are described in Pelagicore LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** 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-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. ** ** $QT_END_LICENSE$ ** -** SPDX-License-Identifier: LGPL-2.1 +** SPDX-License-Identifier: LGPL-3.0 ** ****************************************************************************/ |