From 38f8d531a26720cbf5574f06481c58ef4dad7e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucie=20G=C3=A9rard?= Date: Tue, 20 Sep 2022 16:02:00 +0200 Subject: [PATCH] Apply fixes for SPDX compliance and easier parsing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-106233 Change-Id: Ic636bcfc7d5efcf23c67482beebe2fff1f184073 Reviewed-by: Jörg Bornemann --- cmake/3rdparty/extra-cmake-modules/qt_attribution.json | 2 +- cmake/3rdparty/kwin/qt_attribution.json | 2 +- src/3rdparty/icc/qt_attribution.json | 2 +- src/3rdparty/md4/qt_attribution.json | 1 + src/3rdparty/md5/qt_attribution.json | 1 + src/3rdparty/sha1/qt_attribution.json | 1 + src/3rdparty/sqlite/qt_attribution.json | 1 + 7 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmake/3rdparty/extra-cmake-modules/qt_attribution.json b/cmake/3rdparty/extra-cmake-modules/qt_attribution.json index 941fb9ea113..1839af3690f 100644 --- a/cmake/3rdparty/extra-cmake-modules/qt_attribution.json +++ b/cmake/3rdparty/extra-cmake-modules/qt_attribution.json @@ -9,7 +9,7 @@ "Version": "5.84.0", "License": "BSD-3-Clause", - "LicenseId": "BSD 3-Clause License", + "LicenseId": "BSD-3-Clause", "LicenseFile": "COPYING-CMAKE-SCRIPTS", "Copyright": "Copyright © 2011-2018 The KDE community" } diff --git a/cmake/3rdparty/kwin/qt_attribution.json b/cmake/3rdparty/kwin/qt_attribution.json index 5c226411323..fef6bbe4c34 100644 --- a/cmake/3rdparty/kwin/qt_attribution.json +++ b/cmake/3rdparty/kwin/qt_attribution.json @@ -9,7 +9,7 @@ "Version": "5.13.4", "License": "BSD-3-Clause", - "LicenseId": "BSD 3-Clause License", + "LicenseId": "BSD-3-Clause", "LicenseFile": "COPYING-CMAKE-SCRIPTS", "Copyright": "Copyright 2014 Alex Merry Copyright 2014 Martin Gräßlin , diff --git a/src/3rdparty/icc/qt_attribution.json b/src/3rdparty/icc/qt_attribution.json index 06049954e3e..18accd3b544 100644 --- a/src/3rdparty/icc/qt_attribution.json +++ b/src/3rdparty/icc/qt_attribution.json @@ -9,7 +9,7 @@ "Description": "An ICC color profile for PDF/A-1b compatible PDF files.", "Homepage": "http://www.color.org/", - "LicenseId": "ICC License", + "LicenseId": "LicenseRef-ICC-License", "License": "International Color Consortium License", "LicenseFile": "LICENSE.txt", "Copyright": "Copyright International Color Consortium, 2015" diff --git a/src/3rdparty/md4/qt_attribution.json b/src/3rdparty/md4/qt_attribution.json index 37dd3fab5fe..27455d9b80d 100644 --- a/src/3rdparty/md4/qt_attribution.json +++ b/src/3rdparty/md4/qt_attribution.json @@ -7,5 +7,6 @@ "Description": "Treat as final version; no upstream known", "Description": "An OpenSSL-compatible implementation of the RSA Data Security, Inc. MD4 Message-Digest Algorithm.", "License": "Public Domain", + "LicenseId": "CC0-1.0", "Copyright": "Written by Alexander Peslyak - better known as Solar Designer - in 2001, and placed in the public domain. There's absolutely no warranty." } diff --git a/src/3rdparty/md5/qt_attribution.json b/src/3rdparty/md5/qt_attribution.json index adf697e32bf..63fc4030412 100644 --- a/src/3rdparty/md5/qt_attribution.json +++ b/src/3rdparty/md5/qt_attribution.json @@ -7,6 +7,7 @@ "Description": "Treat as final version; no upstream known", "Description": "MD5 message-digest algorithm.", "License": "Public Domain", + "LicenseId": "CC0-1.0", "Copyright": "Written by Colin Plumb in 1993, no copyright is claimed. Ian Jackson ." } diff --git a/src/3rdparty/sha1/qt_attribution.json b/src/3rdparty/sha1/qt_attribution.json index 707c239f8d0..8aaf5f08cb7 100644 --- a/src/3rdparty/sha1/qt_attribution.json +++ b/src/3rdparty/sha1/qt_attribution.json @@ -7,6 +7,7 @@ "Description": "Implements the Secure Hash Algorithms SHA 1", "Homepage": "http://www.dominik-reichl.de/projects/csha1/", "License": "Public Domain", + "LicenseId": "CC0-1.0", "Copyright": "Copyright (C) Dominik Reichl Copyright (C) 2016 The Qt Company Ltd" } diff --git a/src/3rdparty/sqlite/qt_attribution.json b/src/3rdparty/sqlite/qt_attribution.json index 93ffb975a64..f899aabb343 100644 --- a/src/3rdparty/sqlite/qt_attribution.json +++ b/src/3rdparty/sqlite/qt_attribution.json @@ -9,5 +9,6 @@ "Version": "3.39.2", "DownloadLocation": "https://www.sqlite.org/2022/sqlite-amalgamation-3390200.zip", "License": "Public Domain", + "LicenseId": "CC0-1.0", "Copyright": "The authors disclaim copyright to the source code. However, a license can be obtained if needed." }