diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-18 17:25:35 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-25 17:32:48 +0200 |
commit | 9b89b70bf83c0c55ef78394dcb7c59f7c2aa0fbc (patch) | |
tree | bf9526b5144844b831d62fdc115cc4681829fe2b /bin | |
parent | cf6639377f9746490874ca214b3414c0b115f026 (diff) |
Revert "Update commercial license headers to \bin, \mkspecs, \qmake"
This reverts commit 84a4f1281d5d687bfdadafea9c5618780b1663b6.
Revert of commercial license headers is required for Qt 5.15.3
opensource release.
Task-number: QTBUG-91108
Change-Id: I097a2ac67d1747cb5f63a95b1e1b9458a7cdb703
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/fixqt4headers.pl | 44 | ||||
-rwxr-xr-x | bin/syncqt.pl | 40 |
2 files changed, 42 insertions, 42 deletions
diff --git a/bin/fixqt4headers.pl b/bin/fixqt4headers.pl index 9bf07258f5..b572f469dc 100755 --- a/bin/fixqt4headers.pl +++ b/bin/fixqt4headers.pl @@ -1,13 +1,12 @@ #!/usr/bin/env perl ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2016 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the porting tools of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:COMM$ -## +## $QT_BEGIN_LICENSE:LGPL$ ## Commercial License Usage ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the @@ -16,27 +15,28 @@ ## and conditions see https://www.qt.io/terms-conditions. For further ## information use the contact form at https://www.qt.io/contact-us. ## -## $QT_END_LICENSE$ -## -## -## -## -## -## -## -## -## -## -## -## -## -## -## -## -## +## 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 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$ ## -############################################################################ +############################################################################# use Cwd; diff --git a/bin/syncqt.pl b/bin/syncqt.pl index 2891f674ab..7ede34cf1d 100755 --- a/bin/syncqt.pl +++ b/bin/syncqt.pl @@ -1,14 +1,13 @@ #!/usr/bin/env perl ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2016 The Qt Company Ltd. ## Copyright (C) 2016 Intel Corporation. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the build configuration tools of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:COMM$ -## +## $QT_BEGIN_LICENSE:LGPL$ ## Commercial License Usage ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the @@ -17,25 +16,26 @@ ## and conditions see https://www.qt.io/terms-conditions. For further ## information use the contact form at https://www.qt.io/contact-us. ## -## $QT_END_LICENSE$ -## -## -## -## -## -## -## -## -## -## -## -## -## -## -## -## +## 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 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$ ## ############################################################################# |