diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-01-16 17:36:42 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-01-28 08:24:38 +0200 |
commit | 84a4f1281d5d687bfdadafea9c5618780b1663b6 (patch) | |
tree | cb456b0b22127bddb1798cf68583302c04b5829d /qmake/main.cpp | |
parent | d7f95124da230cafe26896e537e3a3a1af1fd9bb (diff) | |
download | qtbase-84a4f1281d5d687bfdadafea9c5618780b1663b6.tar.gz |
Update commercial license headers to \bin, \mkspecs, \qmake
Update header.COMM to the files in tqtc-qtbase\bin,
tqtc-qtbase\mkspecs and tqtc-qtbase\qmake.
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: I00a45e3989416057c28c90d1107c27ee0b8cbf29
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Diffstat (limited to 'qmake/main.cpp')
-rw-r--r-- | qmake/main.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/qmake/main.cpp b/qmake/main.cpp index 15b1b23f98..ddb0120a50 100644 --- a/qmake/main.cpp +++ b/qmake/main.cpp @@ -1,12 +1,13 @@ /**************************************************************************** ** -** Copyright (C) 2020 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Copyright (C) 2016 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the qmake application 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,16 +16,15 @@ ** 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$ ** +** +** +** +** +** +** +** ****************************************************************************/ #include "project.h" |