diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-18 12:36:56 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-22 13:25:08 +0200 |
| commit | 36831ae742619e13db32ee6048d851bddee28a74 (patch) | |
| tree | 536e5e7dfa9bc3a5f2b46dc361e24c114f7f2614 /src/designer/src/lib/shared/qtresourceeditordialog.cpp | |
| parent | bf7e066168af57eaaecc66fe983d92bcad3f2ce6 (diff) | |
Revert "Update commercial license headers"v5.15.3-lts-lgpl
This reverts commit 57a6c4852376027df7808cda250339dd5b37000e.
Revert of commercial license headers is required for Qt 5.15.3
opensource release.
Task-number: QTBUG-91108
Change-Id: I56aa875d75deeb6c50c10e72553612ae6420fea5
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Diffstat (limited to 'src/designer/src/lib/shared/qtresourceeditordialog.cpp')
| -rw-r--r-- | src/designer/src/lib/shared/qtresourceeditordialog.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/designer/src/lib/shared/qtresourceeditordialog.cpp b/src/designer/src/lib/shared/qtresourceeditordialog.cpp index 95f8b296e..a1c15e708 100644 --- a/src/designer/src/lib/shared/qtresourceeditordialog.cpp +++ b/src/designer/src/lib/shared/qtresourceeditordialog.cpp @@ -1,12 +1,11 @@ /**************************************************************************** ** -** 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 Qt Designer 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 @@ -15,14 +14,15 @@ ** 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$ ** ****************************************************************************/ |