From ab712f226dd67fe1f8957ebd81a84a688f967681 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 4 Mar 2024 16:28:13 +0100 Subject: [PATCH] Revise CLDR-generated data header files to use Unicode-3.0 for SPDX This is the correct license for the data they contain. The types that are used to package them can be made available under the same. Pick-to: 6.5 Task-number: QTBUG-121653 Change-Id: I7fb5f332f9e7f4f6db0f1f0c3964a36ce03bccb2 Reviewed-by: Volker Hilsheimer (cherry picked from commit 880d1aef99a6826c8dd690b13e1ca6ea5574f403) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/text/qlocale_data_p.h | 2 +- src/corelib/time/qhijricalendar_data_p.h | 2 +- src/corelib/time/qjalalicalendar_data_p.h | 2 +- src/corelib/time/qromancalendar_data_p.h | 2 +- src/corelib/time/qtimezoneprivate_data_p.h | 3 +-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/corelib/text/qlocale_data_p.h b/src/corelib/text/qlocale_data_p.h index 44e86fb0ffe..8d0fee77b93 100644 --- a/src/corelib/text/qlocale_data_p.h +++ b/src/corelib/text/qlocale_data_p.h @@ -1,5 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: Unicode-3.0 #ifndef QLOCALE_DATA_P_H #define QLOCALE_DATA_P_H diff --git a/src/corelib/time/qhijricalendar_data_p.h b/src/corelib/time/qhijricalendar_data_p.h index f7639f293dd..a52bf1dc4ee 100644 --- a/src/corelib/time/qhijricalendar_data_p.h +++ b/src/corelib/time/qhijricalendar_data_p.h @@ -1,5 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: Unicode-3.0 #ifndef QHIJRI_CALENDAR_DATA_P_H #define QHIJRI_CALENDAR_DATA_P_H diff --git a/src/corelib/time/qjalalicalendar_data_p.h b/src/corelib/time/qjalalicalendar_data_p.h index caaf41ea8be..0e3c3cedb97 100644 --- a/src/corelib/time/qjalalicalendar_data_p.h +++ b/src/corelib/time/qjalalicalendar_data_p.h @@ -1,5 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: Unicode-3.0 #ifndef QPERSIANCALENDAR_DATA_P_H #define QPERSIANCALENDAR_DATA_P_H diff --git a/src/corelib/time/qromancalendar_data_p.h b/src/corelib/time/qromancalendar_data_p.h index 461497cdf5e..320a19ccdc5 100644 --- a/src/corelib/time/qromancalendar_data_p.h +++ b/src/corelib/time/qromancalendar_data_p.h @@ -1,5 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// SPDX-License-Identifier: Unicode-3.0 #ifndef QROMANCALENDAR_DATA_P_H #define QROMANCALENDAR_DATA_P_H diff --git a/src/corelib/time/qtimezoneprivate_data_p.h b/src/corelib/time/qtimezoneprivate_data_p.h index 255a4610640..a4b8868c58d 100644 --- a/src/corelib/time/qtimezoneprivate_data_p.h +++ b/src/corelib/time/qtimezoneprivate_data_p.h @@ -1,7 +1,6 @@ // Copyright (C) 2021 The Qt Company Ltd. // Copyright (C) 2013 John Layt -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only - +// SPDX-License-Identifier: Unicode-3.0 #ifndef QTIMEZONEPRIVATE_DATA_P_H #define QTIMEZONEPRIVATE_DATA_P_H