diff options
| author | Lucie Gérard <lucie.gerard@qt.io> | 2024-02-10 01:28:28 +0100 |
|---|---|---|
| committer | Lucie Gérard <lucie.gerard@qt.io> | 2024-02-20 16:22:28 +0100 |
| commit | 0fd636d7cc4f9d50b1623e9374215a15640af5e7 (patch) | |
| tree | f81fe8313e57a56540b9a1e9d164e9618905787d /src/corelib | |
| parent | 0616741288f425e5dc58e13eb5f099e4e8ce3a49 (diff) | |
Change license in files to avoid LGPL and non-LGPL license mix
According to QUIP-18 [1], all module files should be
LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
or
LicenseRef-Qt-Commercial OR GPL-3.0-only
LGPD and non-LGPL licenses should not be mixed in a
given directory.
The files in this patch are the only ones in their directory
with non-LGPL license.
The license is changed to that of the other module files
in the same directory.
[1]: https://contribute.qt-project.org/quips/18
Pick-to: 6.7
Task-number: QTBUG-121787
Change-Id: Id58248a6f60438e01e77e9448f07e3057d173260
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/debug_script.py | 2 | ||||
| -rw-r--r-- | src/corelib/global/qcompare.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/mimetypes/mime/hexdump.ps1 | 2 | ||||
| -rw-r--r-- | src/corelib/text/qanystringview.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/debug_script.py b/src/corelib/debug_script.py index b4a58530da..9410740243 100644 --- a/src/corelib/debug_script.py +++ b/src/corelib/debug_script.py @@ -1,5 +1,5 @@ # Copyright (C) 2017 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only import os import sys diff --git a/src/corelib/global/qcompare.cpp b/src/corelib/global/qcompare.cpp index a4b732891d..ac220b8434 100644 --- a/src/corelib/global/qcompare.cpp +++ b/src/corelib/global/qcompare.cpp @@ -1,6 +1,6 @@ // Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> // Copyright (C) 2023 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qcompare.h" diff --git a/src/corelib/mimetypes/mime/hexdump.ps1 b/src/corelib/mimetypes/mime/hexdump.ps1 index 26fb9dd6e6..2a99b86636 100644 --- a/src/corelib/mimetypes/mime/hexdump.ps1 +++ b/src/corelib/mimetypes/mime/hexdump.ps1 @@ -1,5 +1,5 @@ # Copyright (C) 2019 Intel Corporation. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only param([String]$path, [String]$orig) diff --git a/src/corelib/text/qanystringview.cpp b/src/corelib/text/qanystringview.cpp index dd52b77678..df117c3fc4 100644 --- a/src/corelib/text/qanystringview.cpp +++ b/src/corelib/text/qanystringview.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2020 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com> -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qanystringview.h" #include "qdebug.h" |