diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-18 17:25:35 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2021-03-25 17:32:48 +0200 |
| commit | 9b89b70bf83c0c55ef78394dcb7c59f7c2aa0fbc (patch) | |
| tree | bf9526b5144844b831d62fdc115cc4681829fe2b /qmake/option.h | |
| parent | cf6639377f9746490874ca214b3414c0b115f026 (diff) | |
Revert "Update commercial license headers to \bin, \mkspecs, \qmake"
This reverts commit 84a4f1281d5d687bfdadafea9c5618780b1663b6.
Revert of commercial license headers is required for Qt 5.15.3
opensource release.
Task-number: QTBUG-91108
Change-Id: I097a2ac67d1747cb5f63a95b1e1b9458a7cdb703
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Diffstat (limited to 'qmake/option.h')
| -rw-r--r-- | qmake/option.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/qmake/option.h b/qmake/option.h index 6e74d16ebc..d7f4e87c70 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -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 qmake application 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$ ** ****************************************************************************/ |