diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-05-04 12:52:58 +0300 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-06-01 05:53:46 +0000 |
| commit | e8b0477c14f74f9e3098d7ba6300ecbce912efef (patch) | |
| tree | f887d3efd88193b563c3be5cfd202d90e8cda1f9 /scripts/test.pl | |
| parent | a606465231a4f8e94815e5a6657f608fd283290a (diff) | |
Fix licensing
- Remove unnecessary license files and license header templates
- Tools and test are licensed under GPL-EXCEPT nowdays, update correct
license header there
- Update test data to match current license headers
Change-Id: Ia25c9e0989be326e0edeb0325af399edc26f0054
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'scripts/test.pl')
| -rwxr-xr-x | scripts/test.pl | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/scripts/test.pl b/scripts/test.pl index bef25c31..1a04fbd2 100755 --- a/scripts/test.pl +++ b/scripts/test.pl @@ -1,32 +1,27 @@ #!/usr/bin/env perl ############################################################################# ## -## Copyright (C) 2015 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ ## ## This file is part of the Quality Assurance 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$ ## |