diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-01-21 17:36:25 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-01-26 10:57:35 +0200 |
| commit | 81f474501aa0c7bfe2a206b303da022b72423e46 (patch) | |
| tree | 51cb5798e1709f3b2dc743859dd08551fbaa4891 /src/tools/moc/util/generate.sh | |
| parent | 7a27444682c4cabc74b82bbce71481a49d748722 (diff) | |
Update commercial license headers
Updated header.COMM to the files in
tqtc-qtbase/src/printsupport, tqtc-qtbase/src/sql,
tqtc-qtbase/src/testlib, tqtc-qtbase/src/tools,
tqtc-qtbase/src/widgets, tqtc-qtbase/src/winmain,
tqtc-qtbase/src/xml. The documentation files are not
updated.
The commercial license header may contain some
additional lines so that its line count equals
with the earlier license header. Reason for this
is that some autotests use hard coded line numbers
and a change in the line count causes failures in
tests.
Task-number: QTQAINFRA-4154
Change-Id: Ic0372da6cefd42319c4cf82a67bbbb409c1ebfc0
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/tools/moc/util/generate.sh')
| -rwxr-xr-x | src/tools/moc/util/generate.sh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/tools/moc/util/generate.sh b/src/tools/moc/util/generate.sh index 5460d28924..342218e24f 100755 --- a/src/tools/moc/util/generate.sh +++ b/src/tools/moc/util/generate.sh @@ -1,12 +1,13 @@ #!/bin/sh ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is the build configuration utility of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:GPL-EXCEPT$ +## $QT_BEGIN_LICENSE:COMM$ +## ## Commercial License Usage ## Licensees holding valid commercial Qt licenses may use this file in ## accordance with the commercial license agreement provided with the @@ -15,17 +16,16 @@ ## and conditions see https://www.qt.io/terms-conditions. For further ## information use the contact form at https://www.qt.io/contact-us. ## -## 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$ ## -############################################################################# +## +## +## +## +## +## +## +############################################################################ set -ex |