diff options
| -rw-r--r-- | src/corelib/tools/CLDR_LICENSE.txt | 31 | ||||
| -rw-r--r-- | src/corelib/tools/qt_attribution.json | 13 | ||||
| -rw-r--r-- | src/corelib/tools/qtimezone.cpp | 24 |
3 files changed, 46 insertions, 22 deletions
diff --git a/src/corelib/tools/CLDR_LICENSE.txt b/src/corelib/tools/CLDR_LICENSE.txt new file mode 100644 index 0000000000..ad28161436 --- /dev/null +++ b/src/corelib/tools/CLDR_LICENSE.txt @@ -0,0 +1,31 @@ +Copyright © 1991-2016 Unicode, Inc. All rights reserved. +Distributed under the Terms of Use in http://www.unicode.org/copyright.html. + +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Unicode data files and any associated documentation +(the "Data Files") or Unicode software and any associated documentation +(the "Software") to deal in the Data Files or Software +without restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, and/or sell copies of +the Data Files or Software, and to permit persons to whom the Data Files +or Software are furnished to do so, provided that either +(a) this copyright and permission notice appear with all copies +of the Data Files or Software, or +(b) this copyright and permission notice appear in associated +Documentation. + +THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT OF THIRD PARTY RIGHTS. +IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS +NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL +DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THE DATA FILES OR SOFTWARE. + +Except as contained in this notice, the name of a copyright holder +shall not be used in advertising or otherwise to promote the sale, +use or other dealings in these Data Files or Software without prior +written authorization of the copyright holder. diff --git a/src/corelib/tools/qt_attribution.json b/src/corelib/tools/qt_attribution.json new file mode 100644 index 0000000000..eec2cd6795 --- /dev/null +++ b/src/corelib/tools/qt_attribution.json @@ -0,0 +1,13 @@ +{ + "Id": "cldr-data", + "Name": "Unicode CLDR (Unicode Common Locale Data Repository)", + "QDocModule": "qtcore", + "QtUsage": "Used in Qt Core (QTimeZone). Disable the timezone feature to avoid.", + "Files": "qlocale_data_p.h", + + "Description": "QTimeZone includes data obtained from the CLDR data files.", + "License": "Unicode Data Files and Software License", + "LicenseId": "Unicode-TOU", + "LicenseFile": "CLDR_LICENSE.txt", + "Copyright": "Copyright (C) 1991-2016 Unicode, Inc." +} diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp index 63a21ec75c..e423d9af0c 100644 --- a/src/corelib/tools/qtimezone.cpp +++ b/src/corelib/tools/qtimezone.cpp @@ -218,28 +218,8 @@ Q_GLOBAL_STATIC(QTimeZoneSingleton, global_tz); \section2 License This class includes data obtained from the CLDR data files under the terms - of the Unicode license. - - \legalese - COPYRIGHT AND PERMISSION NOTICE - - Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under - the Terms of Use in http://www.unicode.org/copyright.html. - - Permission is hereby granted, free of charge, to any person obtaining a - copy of the Unicode data files and any associated documentation (the "Data - Files") or Unicode software and any associated documentation (the "Software") - to deal in the Data Files or Software without restriction, including without - limitation the rights to use, copy, modify, merge, publish, distribute, and/or - sell copies of the Data Files or Software, and to permit persons to whom the - Data Files or Software are furnished to do so, provided that (a) the above - copyright notice(s) and this permission notice appear with all copies of the - Data Files or Software, (b) both the above copyright notice(s) and this - permission notice appear in associated documentation, and (c) there is clear - notice in each modified Data File or in the Software as well as in the - documentation associated with the Data File(s) or Software that the data or - software has been modified. - \endlegalese + of the Unicode Data Files and Software License. See + \l{Unicode CLDR (Unicode Common Locale Data Repository)} for the details. \sa QDateTime */ |