diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-10-20 21:21:05 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-24 14:34:14 +0300 |
| commit | 22b60030490cf4b6418e9faab1559b658db1a887 (patch) | |
| tree | eef132cd67a1027596d151b5497f3ae9171b201a /util/cmake/json_parser.py | |
| parent | 8e2b2ab8fe9672785a92858c003e764ab3d881dd (diff) | |
Revert "Update commercial license headers"v6.2.5-lts-lgpl
This reverts commit 90c32995096ae90eb3c6f2da407488c5c063657f.
Revert of commercial license headers is required for the
Qt 6.2.x opensource releases, Qt 6.2.5 onwards.
Task-number: QTBUG-107760
Change-Id: I80c7825f97af6eab576916514c2179840eb41fd3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'util/cmake/json_parser.py')
| -rw-r--r-- | util/cmake/json_parser.py | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/util/cmake/json_parser.py b/util/cmake/json_parser.py index 6635769463..a0aaecab9d 100644 --- a/util/cmake/json_parser.py +++ b/util/cmake/json_parser.py @@ -1,13 +1,12 @@ #!/usr/bin/env python3 ############################################################################# ## -## Copyright (C) 2022 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the plugins 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$ ## -############################################################################## +############################################################################# import pyparsing as pp # type: ignore import json |