summaryrefslogtreecommitdiffstats
path: root/src/assistant/qhelpgenerator/collectionconfigreader.cpp
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@qt.io>2021-03-18 12:36:56 +0200
committerTarja Sundqvist <tarja.sundqvist@qt.io>2021-03-22 13:25:08 +0200
commit36831ae742619e13db32ee6048d851bddee28a74 (patch)
tree536e5e7dfa9bc3a5f2b46dc361e24c114f7f2614 /src/assistant/qhelpgenerator/collectionconfigreader.cpp
parentbf7e066168af57eaaecc66fe983d92bcad3f2ce6 (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/assistant/qhelpgenerator/collectionconfigreader.cpp')
-rw-r--r--src/assistant/qhelpgenerator/collectionconfigreader.cpp40
1 files changed, 20 insertions, 20 deletions
diff --git a/src/assistant/qhelpgenerator/collectionconfigreader.cpp b/src/assistant/qhelpgenerator/collectionconfigreader.cpp
index 916613a9f..155430c9c 100644
--- a/src/assistant/qhelpgenerator/collectionconfigreader.cpp
+++ b/src/assistant/qhelpgenerator/collectionconfigreader.cpp
@@ -1,12 +1,11 @@
/****************************************************************************
**
-** Copyright (C) 2021 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Assistant 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$
**
****************************************************************************/