From 970841235baa5ef4e723b5b1656f3702e4c78556 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 13 Mar 2023 14:39:54 +0100 Subject: [PATCH] Split multi-file Files entries in qt_attribution.json as lists MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is now the official format for Files, when there's more than one, rather than using space-joined lists. Pick-to: 6.5 Change-Id: I4a6247fff0ece8ece2944178af38894fd5a2e1e2 Reviewed-by: Qt CI Bot Reviewed-by: Joerg Bornemann Reviewed-by: Kai Köhne --- src/3rdparty/forkfd/qt_attribution.json | 2 +- src/3rdparty/libpsl/qt_attribution.json | 2 +- src/3rdparty/sha3/qt_attribution.json | 12 +++++++++++- src/corelib/text/qt_attribution.json | 6 ++++-- src/testlib/3rdparty/qt_attribution.json | 2 +- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/3rdparty/forkfd/qt_attribution.json b/src/3rdparty/forkfd/qt_attribution.json index fea9eabcd3..1b84779133 100644 --- a/src/3rdparty/forkfd/qt_attribution.json +++ b/src/3rdparty/forkfd/qt_attribution.json @@ -4,7 +4,7 @@ "QDocModule": "qtcore", "QtUsage": "Used on most Unix platforms in Qt Core.", "Comment": "No upstream; treat as final", - "Files": "forkfd.c forkfd.h forkfd_gcc.h", + "Files": [ "forkfd.c", "forkfd.h", "forkfd_gcc.h" ], "License": "MIT License", "LicenseId": "MIT", diff --git a/src/3rdparty/libpsl/qt_attribution.json b/src/3rdparty/libpsl/qt_attribution.json index f0c0fd8741..a4b652452a 100644 --- a/src/3rdparty/libpsl/qt_attribution.json +++ b/src/3rdparty/libpsl/qt_attribution.json @@ -35,7 +35,7 @@ It is now maintained on github (https://github.com/publicsuffix/list)." "Name": "libpsl - C library to handle the Public Suffix List", "QDocModule": "qtnetwork", "Description": "Libpsl allows checking domains against the Public Suffix List.", - "Files": "src/lookup_string_in_fixed_set.c src/psl-make-dafsa", + "Files": [ "src/lookup_string_in_fixed_set.c", "src/psl-make-dafsa" ], "QtUsage": "Used to compress the embedded copy of publicsuffix list and to lookup entries in it.", "Homepage": "https://github.com/rockdaboot/libpsl", diff --git a/src/3rdparty/sha3/qt_attribution.json b/src/3rdparty/sha3/qt_attribution.json index fea087e992..f4f151fe0d 100644 --- a/src/3rdparty/sha3/qt_attribution.json +++ b/src/3rdparty/sha3/qt_attribution.json @@ -22,7 +22,17 @@ "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", + "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.", "Version": "3.2", diff --git a/src/corelib/text/qt_attribution.json b/src/corelib/text/qt_attribution.json index e70d46df39..b18c1b202c 100644 --- a/src/corelib/text/qt_attribution.json +++ b/src/corelib/text/qt_attribution.json @@ -5,7 +5,7 @@ "QDocModule": "qtcore", "QtUsage": "Qt Core uses data obtained from UCD files for working with characters and strings.", "Comment": { "Files": "For update, see qtbase/util/unicode/README" }, - "Files": "qunicodetables_p.h qunicodetables.cpp", + "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.", @@ -26,7 +26,9 @@ "QDocModule": "qtcore", "QtUsage": "Used in Qt Core (QTimeZone, QLocale).", "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", + "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 world's languages, with the largest and most extensive standard repository of locale data diff --git a/src/testlib/3rdparty/qt_attribution.json b/src/testlib/3rdparty/qt_attribution.json index d1cf919946..ba4f9ce55a 100644 --- a/src/testlib/3rdparty/qt_attribution.json +++ b/src/testlib/3rdparty/qt_attribution.json @@ -5,7 +5,7 @@ "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", + "Files": [ "valgrind_p.h", "callgrind_p.h" ], "Description": "An instrumentation framework for building dynamic analysis tools.", "Homepage": "http://valgrind.org/",