From dd60182834fe92f42aad46dad6afb090387461a2 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Thu, 18 Mar 2021 17:02:26 +0200 Subject: Revert "Update commercial license headers" This reverts commit 1bd8194ea9ea5f3085a0cb689fc5408782d14a2f. Revert of commercial license header changes is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: I9fe565533596e75cd41bb55d6fc0857b61f2fdd4 Reviewed-by: Jani Heikkinen --- translations/check-ts.pl | 22 +++++++++++----------- translations/split-qt-ts.pl | 22 +++++++++++----------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/translations/check-ts.pl b/translations/check-ts.pl index 37f691c..bed4e5c 100755 --- a/translations/check-ts.pl +++ b/translations/check-ts.pl @@ -1,13 +1,12 @@ #! /usr/bin/perl -w ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2017 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the translations module of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:COMM$ -## +## $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 @@ -16,16 +15,17 @@ ## 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 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$ ## -############################################################################ +############################################################################# use strict; diff --git a/translations/split-qt-ts.pl b/translations/split-qt-ts.pl index 8b9b557..fe37e62 100755 --- a/translations/split-qt-ts.pl +++ b/translations/split-qt-ts.pl @@ -1,13 +1,12 @@ #! /usr/bin/perl -w ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2017 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the translations module of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:COMM$ -## +## $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 @@ -16,16 +15,17 @@ ## 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 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$ ## -############################################################################ +############################################################################# use strict; -- cgit v1.2.3