1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Include relevant Unicode Inc. copyright line in generated data files

Browse Source 
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 <lucie.gerard@qt.io>
This commit is contained in:
Edward Welbourne 2024-08-29 15:54:00 +02:00
parent 89dd15e359
commit 00644f4b6d
8 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
licenseRule.json
View File

@ -179,6 +179,11 @@
"file type" : "util", "file type" : "util",
"spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] "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/" : { "util/wasm/batchedtestrunner/" : {
"comment" : "Exception: this is a helper tool", "comment" : "Exception: this is a helper tool",
"file type" : "util", "file type" : "util",

1
src/corelib/text/qlocale_data_p.h
View File

@ -1,4 +1,5 @@
// Copyright (C) 2019 The Qt Company Ltd. // Copyright (C) 2019 The Qt Company Ltd.
// Copyright © 2004-2023 Unicode, Inc.
// SPDX-License-Identifier: Unicode-3.0 // SPDX-License-Identifier: Unicode-3.0
#ifndef QLOCALE_DATA_P_H #ifndef QLOCALE_DATA_P_H

1
src/corelib/time/qhijricalendar_data_p.h
View File

@ -1,4 +1,5 @@
// Copyright (C) 2019 The Qt Company Ltd. // Copyright (C) 2019 The Qt Company Ltd.
// Copyright © 2004-2023 Unicode, Inc.
// SPDX-License-Identifier: Unicode-3.0 // SPDX-License-Identifier: Unicode-3.0
#ifndef QHIJRI_CALENDAR_DATA_P_H #ifndef QHIJRI_CALENDAR_DATA_P_H

1
src/corelib/time/qjalalicalendar_data_p.h
View File

@ -1,4 +1,5 @@
// Copyright (C) 2019 The Qt Company Ltd. // Copyright (C) 2019 The Qt Company Ltd.
// Copyright © 2004-2023 Unicode, Inc.
// SPDX-License-Identifier: Unicode-3.0 // SPDX-License-Identifier: Unicode-3.0
#ifndef QPERSIANCALENDAR_DATA_P_H #ifndef QPERSIANCALENDAR_DATA_P_H

1
src/corelib/time/qromancalendar_data_p.h
View File

@ -1,4 +1,5 @@
// Copyright (C) 2019 The Qt Company Ltd. // Copyright (C) 2019 The Qt Company Ltd.
// Copyright © 2004-2023 Unicode, Inc.
// SPDX-License-Identifier: Unicode-3.0 // SPDX-License-Identifier: Unicode-3.0
#ifndef QROMANCALENDAR_DATA_P_H #ifndef QROMANCALENDAR_DATA_P_H

1
src/corelib/time/qtimezonelocale_data_p.h
View File

@ -1,4 +1,5 @@
// Copyright (C) 2024 The Qt Company Ltd. // Copyright (C) 2024 The Qt Company Ltd.
// Copyright © 2004-2023 Unicode, Inc.
// SPDX-License-Identifier: Unicode-3.0 // SPDX-License-Identifier: Unicode-3.0
#ifndef QTIMEZONELOCALE_DATA_P_H #ifndef QTIMEZONELOCALE_DATA_P_H

1
src/corelib/time/qtimezoneprivate_data_p.h
View File

@ -1,5 +1,6 @@
// Copyright (C) 2021 The Qt Company Ltd. // Copyright (C) 2021 The Qt Company Ltd.
// Copyright (C) 2013 John Layt <jlayt@kde.org> // Copyright (C) 2013 John Layt <jlayt@kde.org>
// Copyright © 2004-2023 Unicode, Inc.
// SPDX-License-Identifier: Unicode-3.0 // SPDX-License-Identifier: Unicode-3.0
#ifndef QTIMEZONEPRIVATE_DATA_P_H #ifndef QTIMEZONEPRIVATE_DATA_P_H

4
util/locale_database/testlocales/localemodel.cpp
View File

@ -1,5 +1,7 @@
// Copyright (C) 2016 The Qt Company Ltd. // 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 "localemodel.h"
#include <QLocale> #include <QLocale>