From 00644f4b6d69d82a8d27f3b0619de88c0e4fdd6f Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Thu, 29 Aug 2024 15:54:00 +0200 Subject: [PATCH] Include relevant Unicode Inc. copyright line in generated data files This amends commit 880d1aef99a6826c8dd690b13e1ca6ea5574f403 and extends it to cover the testlocales program under util/. Pick-to: 6.8 6.7 6.5 Task-number: QTBUG-121653 Change-Id: I3efadc69ce08810876f8e20aa4636c7624728153 Reviewed-by: Lucie Gerard --- licenseRule.json | 5 +++++ src/corelib/text/qlocale_data_p.h | 1 + src/corelib/time/qhijricalendar_data_p.h | 1 + src/corelib/time/qjalalicalendar_data_p.h | 1 + src/corelib/time/qromancalendar_data_p.h | 1 + src/corelib/time/qtimezonelocale_data_p.h | 1 + src/corelib/time/qtimezoneprivate_data_p.h | 1 + util/locale_database/testlocales/localemodel.cpp | 4 +++- 8 files changed, 14 insertions(+), 1 deletion(-) diff --git a/licenseRule.json b/licenseRule.json index e5320b14f93..9ea709c0162 100644 --- a/licenseRule.json +++ b/licenseRule.json @@ -179,6 +179,11 @@ "file type" : "util", "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] }, + "util/locale_database/testlocales/localemodel.cpp" : { + "comment" : "Exception: this contains CLDR-generated code", + "file type" : "util", + "spdx" : ["Unicode-3.0"] + }, "util/wasm/batchedtestrunner/" : { "comment" : "Exception: this is a helper tool", "file type" : "util", diff --git a/src/corelib/text/qlocale_data_p.h b/src/corelib/text/qlocale_data_p.h index 7d0485599df..690862d4fe5 100644 --- a/src/corelib/text/qlocale_data_p.h +++ b/src/corelib/text/qlocale_data_p.h @@ -1,4 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. +// Copyright © 2004-2023 Unicode, Inc. // SPDX-License-Identifier: Unicode-3.0 #ifndef QLOCALE_DATA_P_H diff --git a/src/corelib/time/qhijricalendar_data_p.h b/src/corelib/time/qhijricalendar_data_p.h index f6ae7309d44..4cebcf4da7f 100644 --- a/src/corelib/time/qhijricalendar_data_p.h +++ b/src/corelib/time/qhijricalendar_data_p.h @@ -1,4 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. +// Copyright © 2004-2023 Unicode, Inc. // SPDX-License-Identifier: Unicode-3.0 #ifndef QHIJRI_CALENDAR_DATA_P_H diff --git a/src/corelib/time/qjalalicalendar_data_p.h b/src/corelib/time/qjalalicalendar_data_p.h index bb97dbce4e3..213b8000358 100644 --- a/src/corelib/time/qjalalicalendar_data_p.h +++ b/src/corelib/time/qjalalicalendar_data_p.h @@ -1,4 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. +// Copyright © 2004-2023 Unicode, Inc. // SPDX-License-Identifier: Unicode-3.0 #ifndef QPERSIANCALENDAR_DATA_P_H diff --git a/src/corelib/time/qromancalendar_data_p.h b/src/corelib/time/qromancalendar_data_p.h index eb65d01e019..43953c55bba 100644 --- a/src/corelib/time/qromancalendar_data_p.h +++ b/src/corelib/time/qromancalendar_data_p.h @@ -1,4 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. +// Copyright © 2004-2023 Unicode, Inc. // SPDX-License-Identifier: Unicode-3.0 #ifndef QROMANCALENDAR_DATA_P_H diff --git a/src/corelib/time/qtimezonelocale_data_p.h b/src/corelib/time/qtimezonelocale_data_p.h index e32b1152f65..a7f9546d01e 100644 --- a/src/corelib/time/qtimezonelocale_data_p.h +++ b/src/corelib/time/qtimezonelocale_data_p.h @@ -1,4 +1,5 @@ // Copyright (C) 2024 The Qt Company Ltd. +// Copyright © 2004-2023 Unicode, Inc. // SPDX-License-Identifier: Unicode-3.0 #ifndef QTIMEZONELOCALE_DATA_P_H diff --git a/src/corelib/time/qtimezoneprivate_data_p.h b/src/corelib/time/qtimezoneprivate_data_p.h index 321ca725725..5f2250db4e4 100644 --- a/src/corelib/time/qtimezoneprivate_data_p.h +++ b/src/corelib/time/qtimezoneprivate_data_p.h @@ -1,5 +1,6 @@ // Copyright (C) 2021 The Qt Company Ltd. // Copyright (C) 2013 John Layt +// Copyright © 2004-2023 Unicode, Inc. // SPDX-License-Identifier: Unicode-3.0 #ifndef QTIMEZONEPRIVATE_DATA_P_H diff --git a/util/locale_database/testlocales/localemodel.cpp b/util/locale_database/testlocales/localemodel.cpp index 399e90e8b3b..41ff0c40416 100644 --- a/util/locale_database/testlocales/localemodel.cpp +++ b/util/locale_database/testlocales/localemodel.cpp @@ -1,5 +1,7 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// Copyright © 2004-2023 Unicode, Inc. +// SPDX-License-Identifier: Unicode-3.0 + #include "localemodel.h" #include