From a47bea229676cd91672c361ba78deea16668b58a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucie=20G=C3=A9rard?= Date: Sat, 10 Feb 2024 01:11:16 +0100 Subject: [PATCH] Correct license in qmake/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The majority of files in qmake/ have non-LGPL licensing. Remove the mix of licenses and follow the majority. Not sure what is the type of the files in qmake/ according to QUIP-18 [1]. [1]: https://contribute.qt-project.org/quips/18 Task-number: QTBUG-121787 Change-Id: I4003daada9e20b9ea4524de89ba49fbe0880ec23 Reviewed-by: Kai Köhne (cherry picked from commit 3828b30951e3bdaa8227d0ade14725de04593671) Reviewed-by: Qt Cherry-pick Bot --- qmake/propertyprinter.cpp | 2 +- qmake/propertyprinter.h | 2 +- qmake/qmakelibraryinfo.cpp | 2 +- qmake/qmakelibraryinfo.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qmake/propertyprinter.cpp b/qmake/propertyprinter.cpp index 10c94942e15..52a790e2c8b 100644 --- a/qmake/propertyprinter.cpp +++ b/qmake/propertyprinter.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "propertyprinter.h" diff --git a/qmake/propertyprinter.h b/qmake/propertyprinter.h index ba7a1d92dfa..90fa3a42740 100644 --- a/qmake/propertyprinter.h +++ b/qmake/propertyprinter.h @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef PROPERTYPRINTER_H #define PROPERTYPRINTER_H diff --git a/qmake/qmakelibraryinfo.cpp b/qmake/qmakelibraryinfo.cpp index 531eb2372b9..a8400366138 100644 --- a/qmake/qmakelibraryinfo.cpp +++ b/qmake/qmakelibraryinfo.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2021 The Qt Company Ltd. // Copyright (C) 2016 Intel Corporation. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #include "qmakelibraryinfo.h" diff --git a/qmake/qmakelibraryinfo.h b/qmake/qmakelibraryinfo.h index 7c303c43b87..c3240efd156 100644 --- a/qmake/qmakelibraryinfo.h +++ b/qmake/qmakelibraryinfo.h @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 #ifndef QMAKELIBRARYINFO_H #define QMAKELIBRARYINFO_H