From 22b60030490cf4b6418e9faab1559b658db1a887 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Thu, 20 Oct 2022 21:21:05 +0300 Subject: Revert "Update commercial license headers" 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 --- qmake/library/registry_p.h | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'qmake/library/registry_p.h') diff --git a/qmake/library/registry_p.h b/qmake/library/registry_p.h index 67233468b1..f9e8bba016 100644 --- a/qmake/library/registry_p.h +++ b/qmake/library/registry_p.h @@ -1,12 +1,11 @@ /**************************************************************************** ** -** Copyright (C) 2022 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,16 +14,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$ ** -******************************************************************************/ +****************************************************************************/ #ifndef QT_WINDOWS_REGISTRY_H #define QT_WINDOWS_REGISTRY_H -- cgit v1.2.3