diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2023-02-02 16:59:19 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2023-04-20 14:17:26 +0100 |
| commit | ce8839e056abb1ca3151c88f370b38bca8f60e3b (patch) | |
| tree | 349ef1c221e80c9e6073f872464c7aef4932c7d0 /src/corelib/text | |
| parent | 1bf1aec7902113e14e30d52429378ce7e50ad38d (diff) | |
| download | qtbase-ce8839e056abb1ca3151c88f370b38bca8f60e3b.tar.gz | |
Deploy Comment fields in qt_attribution.json files
Replace the old abuse of other fields as comments, to be overwritten
by a later setting to a proper value, with actual Comment fields, now
that we have them.
Added a new comment to the valgrind files to say where they come from
in the upstream.
Pick-to: 6.5
Change-Id: I2edcfa2949fa9e59f3f67d3e578d8e5009854cf6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Diffstat (limited to 'src/corelib/text')
| -rw-r--r-- | src/corelib/text/qt_attribution.json | 12 |
1 files changed, 7 insertions, 5 deletions
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", |