diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2024-03-05 10:50:07 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2024-04-22 15:22:12 +0000 |
| commit | d5e40b5e58c187086d7c23af1860c1af28957ccc (patch) | |
| tree | 6fc4e79591553f8a9b7963808e9d1a1daafe5a65 /util/unicode | |
| parent | a5bdb2128e4dc5014d5753840f84b815a0486c06 (diff) | |
Revise UCD-generated data files' SPDX headers
The existing data comes under Unicode-DFS-2016 but future updates
shall come under Unicode-3.0, so update the existing headers with the
former and the generator script with the latter. Leave a note in the
attribution file about this transitional state and how to resolve it.
Replaced UNICODE_LICENSE.txt from src/corelib/text/ with
LICENSES/Unicode-DFS-2016.txt, as fetched using reuse download.
This doesn't look like a rename but only actually adds some irrelevant
lines about where on the Unicode website the upstream files (to which
we do not apply this license) come from and changes some spacing.
Pick-to: 6.7 6.5
Fixes: QTBUG-121653
Change-Id: I50c9f4badc77a9aa402af946561aff58ae9e3e7a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Diffstat (limited to 'util/unicode')
| -rw-r--r-- | util/unicode/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index 0195c5b970..fb308b7dc0 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.cpp @@ -3616,7 +3616,7 @@ int main(int, char **) QByteArray header = "// Copyright (C) 2020 The Qt Company Ltd.\n" - "// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only\n" + "// SPDX-License-Identifier: Unicode-3.0\n" "\n"; QByteArray note = |