diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-18 17:29:29 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-26 16:43:56 +0200 |
commit | c8989ca20fa5798f7853f07df6e150cc407c64a4 (patch) | |
tree | fa05e1b843566266c7972266353a8d4832ae16c4 /util/lexgen/tokenizer.cpp | |
parent | 9b89b70bf83c0c55ef78394dcb7c59f7c2aa0fbc (diff) |
Revert "Update commercial license headers to /util files"v5.15.3-lts-lgpl
This reverts commit d7f95124da230cafe26896e537e3a3a1af1fd9bb.
Revert of commercial license headers is required for
Qt 5.15.3 opensource release.
Task-number: QTBUG-91108
Change-Id: Ifad15cc26055eed6c82e30b5b68bb33d070bae0e
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Diffstat (limited to 'util/lexgen/tokenizer.cpp')
-rw-r--r-- | util/lexgen/tokenizer.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/util/lexgen/tokenizer.cpp b/util/lexgen/tokenizer.cpp index 473b0f3af8..ee0ec8af46 100644 --- a/util/lexgen/tokenizer.cpp +++ b/util/lexgen/tokenizer.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 utils 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$ ** ****************************************************************************/ // auto generated. DO NOT EDIT. |