diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-18 17:49:00 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-22 13:24:53 +0200 |
| commit | 6529f5bbdc6df2303d06091adeb80aa973e21295 (patch) | |
| tree | 412916feebf1996ff163e2d12b1806d96c935e49 /src/gui/text/qtextobject_p.h | |
| parent | 8a5a172987c659369831b87585a08003caef0127 (diff) | |
| download | qtbase-6529f5bbdc6df2303d06091adeb80aa973e21295.tar.gz | |
Revert "Update commercial license headers to src/dbus, src/gui, src/network"
This reverts commit 897645d417c445f19ee183147c61e1bd0694868f.
Revert of commercial license header changes is required for
Qt 5.15.3 opensource release.
Task-number: QTBUG-91108
Change-Id: I4b21b5e105d34dc076a5ffad1a6d3b2793c2f163
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Diffstat (limited to 'src/gui/text/qtextobject_p.h')
| -rw-r--r-- | src/gui/text/qtextobject_p.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/gui/text/qtextobject_p.h b/src/gui/text/qtextobject_p.h index 065c8a8196..87c83868da 100644 --- a/src/gui/text/qtextobject_p.h +++ b/src/gui/text/qtextobject_p.h @@ -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 QtGui module 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 @@ -15,25 +14,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$ ** ****************************************************************************/ |