diff options
author | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-01-22 11:47:05 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-01-22 10:21:42 +0000 |
commit | 66e45676f5f5c6251ccab36906c6324fd0065e08 (patch) | |
tree | b7c58816aa0b9290e36af8d1602d5eadae0ebe0a /config.tests/gconf | |
parent | ca54870ffdf262f072c082adf80d63c421dbd68f (diff) |
Fix license headers
old, outdated and removed header.LGPL21 was used in some files. Replace
that with correct one (header.LGPL in src, headre.GPL-EXCEPT in tests
and header.BSD in examples).
Also remove unnesessary license files and add missing ones.
Change-Id: Ib021ae191316da379a01e355fe90fe39180f541b
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'config.tests/gconf')
-rw-r--r-- | config.tests/gconf/main.cpp | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/config.tests/gconf/main.cpp b/config.tests/gconf/main.cpp index ee95d384..4fe41bbe 100644 --- a/config.tests/gconf/main.cpp +++ b/config.tests/gconf/main.cpp @@ -1,31 +1,26 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies). +** Copyright (C) 2018 The Qt Company Ltd and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtSystems module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL21$ +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ ** 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. +** 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 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. +** 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 with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** 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$ ** |