diff --git a/src/3rdparty/easing/qt_attribution.json b/src/3rdparty/easing/qt_attribution.json index bccc67b6d4..1535efa585 100644 --- a/src/3rdparty/easing/qt_attribution.json +++ b/src/3rdparty/easing/qt_attribution.json @@ -5,7 +5,7 @@ "QtUsage": "Used in Qt Core (QEasingCurve).", "Files": "easing.cpp", - "Homepage": "treat as final", + "Comment": "treat as final", "Homepage": "http://robertpenner.com/easing/", "License": "BSD 3-clause \"New\" or \"Revised\" License", "LicenseId": "BSD-3-Clause", diff --git a/src/3rdparty/forkfd/qt_attribution.json b/src/3rdparty/forkfd/qt_attribution.json index ebbb19c718..fea9eabcd3 100644 --- a/src/3rdparty/forkfd/qt_attribution.json +++ b/src/3rdparty/forkfd/qt_attribution.json @@ -3,7 +3,7 @@ "Name": "forkfd", "QDocModule": "qtcore", "QtUsage": "Used on most Unix platforms in Qt Core.", - "Files": "No upstream; treat as final", + "Comment": "No upstream; treat as final", "Files": "forkfd.c forkfd.h forkfd_gcc.h", "License": "MIT License", diff --git a/src/3rdparty/icc/qt_attribution.json b/src/3rdparty/icc/qt_attribution.json index 18accd3b54..d2e6807671 100644 --- a/src/3rdparty/icc/qt_attribution.json +++ b/src/3rdparty/icc/qt_attribution.json @@ -4,9 +4,9 @@ "Name": "sRGB color profile icc file", "QDocModule": "qtgui", "QtUsage": "Used in Qt Gui (Embedded into PDF/A-1b files generated by QPrinter/QPdfWriter).", - "Files": "No upstream: treat as final", "Files": "sRGB2014.icc", + "Comment": "No upstream: treat as final", "Description": "An ICC color profile for PDF/A-1b compatible PDF files.", "Homepage": "http://www.color.org/", "LicenseId": "LicenseRef-ICC-License", diff --git a/src/3rdparty/libpsl/qt_attribution.json b/src/3rdparty/libpsl/qt_attribution.json index 8561112882..f0c0fd8741 100644 --- a/src/3rdparty/libpsl/qt_attribution.json +++ b/src/3rdparty/libpsl/qt_attribution.json @@ -19,7 +19,7 @@ It allows browsers to, for example: "QtUsage": "Used in Qt Network to avoid setting \"supercookies\" in the cookie jar supported by Qt (by the QNetworkCookieJar class).", - "Homepage": "Consult https://github.com/publicsuffix/list for the sha1 but download from ...", + "Comment": "Consult https://github.com/publicsuffix/list for the sha1 but download from ...", "Homepage": "http://publicsuffix.org/", "Version": "f15705582ed13f390c59541300dea7288acf4137, fetched on 2023-02-02", "DownloadLocation": "https://publicsuffix.org/list/public_suffix_list.dat", diff --git a/src/3rdparty/md4/qt_attribution.json b/src/3rdparty/md4/qt_attribution.json index 27455d9b80..f61d6b97c8 100644 --- a/src/3rdparty/md4/qt_attribution.json +++ b/src/3rdparty/md4/qt_attribution.json @@ -4,7 +4,7 @@ "QDocModule": "qtcore", "QtUsage": "Used in Qt Core (QCryptographicHash).", - "Description": "Treat as final version; no upstream known", + "Comment": "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", diff --git a/src/3rdparty/md5/qt_attribution.json b/src/3rdparty/md5/qt_attribution.json index 63fc403041..f390b7e4f5 100644 --- a/src/3rdparty/md5/qt_attribution.json +++ b/src/3rdparty/md5/qt_attribution.json @@ -4,7 +4,7 @@ "QDocModule": "qtcore", "QtUsage": "Used in Qt Core (QCryptographicHash).", - "Description": "Treat as final version; no upstream known", + "Comment": "Treat as final version; no upstream known", "Description": "MD5 message-digest algorithm.", "License": "Public Domain", "LicenseId": "CC0-1.0", diff --git a/src/3rdparty/rfc6234/qt_attribution.json b/src/3rdparty/rfc6234/qt_attribution.json index 1cce430cf6..3876dc00b4 100644 --- a/src/3rdparty/rfc6234/qt_attribution.json +++ b/src/3rdparty/rfc6234/qt_attribution.json @@ -4,7 +4,7 @@ "QDocModule": "qtcore", "QtUsage": "Used in Qt Core (QCryptographicHash and QMessageAuthenticationCode)", - "Description": "The RFC actually contains the code, embedded in RFC-boilerplate; presumably we extracted it; treat as final", + "Comment": "The RFC actually contains the code, embedded in RFC-boilerplate; presumably we extracted it; treat as final", "Description": "Implements the Secure Hash Algorithms SHA 384 and SHA-521", "License": "BSD 3-clause \"New\" or \"Revised\" License", "LicenseFile": "LICENSE", diff --git a/src/3rdparty/sha3/qt_attribution.json b/src/3rdparty/sha3/qt_attribution.json index 3e847aba20..fea087e992 100644 --- a/src/3rdparty/sha3/qt_attribution.json +++ b/src/3rdparty/sha3/qt_attribution.json @@ -4,7 +4,7 @@ "Name": "Secure Hash Algorithm SHA-3 - brg_endian", "QDocModule": "qtcore", "QtUsage": "Used in Qt Core (QCryptographicHash).", - "Files": "apply brg_endian.h.patch to upstream from https://github.com/BrianGladman/sha/", + "Comment": "apply brg_endian.h.patch to upstream from https://github.com/BrianGladman/sha/", "Files": "brg_endian.h", "Description": "SHA-3, originally known as Keccak, is a cryptographic hash function.", @@ -19,8 +19,9 @@ "Name": "Secure Hash Algorithm SHA-3 - Keccak", "QDocModule": "qtcore", "QtUsage": "Used in Qt Core (QCryptographicHash).", - "Files": "https://keccak.team/obsolete/KeccakReferenceAndOptimized-3.2.zip - but it's obsolete", - "Files": "With overflow.patch applied", + "Comment": { "ObsoleteSource": + "https://keccak.team/obsolete/KeccakReferenceAndOptimized-3.2.zip", + "PatchApplied": "overflow.patch" }, "Files": "KeccakF-1600-32-rvk.macros KeccakF-1600-32.macros KeccakF-1600-64.macros KeccakF-1600-interface.h KeccakF-1600-opt32.c KeccakF-1600-opt64.c KeccakF-1600-unrolling.macros KeccakNISTInterface.c KeccakNISTInterface.h KeccakSponge.c KeccakSponge.h", "Description": "SHA-3, originally known as Keccak, is a cryptographic hash function.", diff --git a/src/corelib/kernel/qt_attribution.json b/src/corelib/kernel/qt_attribution.json index c3075c0a52..86ca3a2664 100644 --- a/src/corelib/kernel/qt_attribution.json +++ b/src/corelib/kernel/qt_attribution.json @@ -5,7 +5,7 @@ "QtUsage": "Used in Qt Core on macOS.", "Files": "qeventdispatcher_cf_p.h", - "Description": "Treat as final version; no upstream known", + "Comment": "Treat as final version; no upstream known", "Description": "Implementation of QAbstractEventDispatcher for macOS.", "License": "BSD 3-clause \"New\" or \"Revised\" License", "LicenseId": "BSD-3-Clause", diff --git a/src/corelib/text/qt_attribution.json b/src/corelib/text/qt_attribution.json index 5b8955c5c7..e70d46df39 100644 --- a/src/corelib/text/qt_attribution.json +++ b/src/corelib/text/qt_attribution.json @@ -4,14 +4,16 @@ "Name": "Unicode Character Database (UCD)", "QDocModule": "qtcore", "QtUsage": "Qt Core uses data obtained from UCD files for working with characters and strings.", - "Files": "For update, see qtbase/util/unicode/README", + "Comment": { "Files": "For update, see qtbase/util/unicode/README" }, "Files": "qunicodetables_p.h qunicodetables.cpp", "Description": "The Unicode Character Database (UCD) is a set of files that define the Unicode character properties and internal mappings.", "Homepage": "https://www.unicode.org/ucd/", - "Version": "Don't use the Unicode standard version; - UCD has its own 'Revision' numbers, see the 'UAX #44, UCD' page (https://www.unicode.org/reports/tr44/)", + "Comment": { + "Version": [ "Don't use the Unicode standard version;", + "UCD has its own 'Revision' numbers", + "see the 'UAX #44, UCD' page (https://www.unicode.org/reports/tr44/)" ] }, "Version": "30", "License": "Unicode License Agreement - Data Files and Software (2016)", "LicenseId": "Unicode-DFS-2016", @@ -23,7 +25,7 @@ "Name": "Unicode Common Locale Data Repository (CLDR)", "QDocModule": "qtcore", "QtUsage": "Used in Qt Core (QTimeZone, QLocale).", - "Files": "For update, see qtbase/util/locale_database/cldr2qlocalexml.py", + "Comment": { "Files": "For update, see qtbase/util/locale_database/cldr2qlocalexml.py" }, "Files": "qlocale_data_p.h ../time/qtimezoneprivate_data_p.h ../time/qhijricalendar_data_p.h ../time/qjalalicalendar_data_p.h ../time/qromancalendar_data_p.h", "Description": "The Unicode CLDR provides key building blocks for software to support the @@ -31,7 +33,7 @@ available.", "Homepage": "https://cldr.unicode.org/", "Version": "v42", - "License": "// as specified in https://spdx.org/licenses/Unicode-DFS-2016.html", + "Comment": { "License": "as specified in https://spdx.org/licenses/Unicode-DFS-2016.html" }, "License": "Unicode License Agreement - Data Files and Software (2016)", "LicenseId": "Unicode-DFS-2016", "LicenseFile": "UNICODE_LICENSE.txt", diff --git a/src/dbus/qt_attribution.json b/src/dbus/qt_attribution.json index 6cfe6ab2af..ada14bbc48 100644 --- a/src/dbus/qt_attribution.json +++ b/src/dbus/qt_attribution.json @@ -11,7 +11,7 @@ "LicenseId": "AFL-2.1 OR GPL-2.0-or-later", "License": "Academic Free License v2.1, or GNU General Public License v2.0 or later", "LicenseFile": "LIBDBUS-1-LICENSE.txt", - "Files": "Fragments from various upstream files, see comments in ...", + "Comment": "Fragments from various upstream files, see comments in ...", "Files": "dbus_minimal_p.h", "Copyright": "Copyright (C) 2002, 2003 CodeFactory AB Copyright (C) 2004, 2005 Red Hat, Inc." diff --git a/src/testlib/3rdparty/qt_attribution.json b/src/testlib/3rdparty/qt_attribution.json index 08a5bcf1ec..d1cf919946 100644 --- a/src/testlib/3rdparty/qt_attribution.json +++ b/src/testlib/3rdparty/qt_attribution.json @@ -4,6 +4,7 @@ "Name": "Valgrind", "QDocModule": "qttestlib", "QtUsage": "Used on Linux ond MacOS in the Qt Test module.", + "Comment": { "UpstreamFiles": [ "include/valgrind.h.in", "callgrind/callgrind.h" ] }, "Files": "valgrind_p.h callgrind_p.h", "Description": "An instrumentation framework for building dynamic analysis tools.",