diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2017-05-23 18:16:49 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2017-06-08 13:37:21 +0000 |
| commit | 9df60df12a42a403a64dc8f9cd242c88b2cc9211 (patch) | |
| tree | dafb0be8e8b7ce02bf60dda871dabeebcc8d434f | |
| parent | 2c04d1dab56ed609a0f71dc4aff4c506905bb81c (diff) | |
Made the "do not edit generated code" notice clearer
Say where to find the scripts and make clear what to update to get
changes.
Change-Id: I424b7fdf846f7141c6df81eef90eb1ca0378bcf8
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/corelib/tools/qlocale_data_p.h | 5 | ||||
| -rw-r--r-- | src/corelib/tools/qtimezoneprivate_data_p.h | 3 | ||||
| -rwxr-xr-x | util/local_database/cldr2qtimezone.py | 3 | ||||
| -rwxr-xr-x | util/local_database/qlocalexml2cpp.py | 5 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/tools/qlocale_data_p.h index da65326146..90f2163e9e 100644 --- a/src/corelib/tools/qlocale_data_p.h +++ b/src/corelib/tools/qlocale_data_p.h @@ -82,8 +82,9 @@ static const int ImperialMeasurementSystemsCount = http://www.unicode.org/cldr/ - Do not change it, instead edit CLDR data and regenerate this file using - cldr2qlocalexml.py and qlocalexml2cpp.py. + Do not edit this section: instead regenerate it using + cldr2qlocalexml.py and qlocalexml2cpp.py on updated (or + edited) CLDR data; see qtbase/util/local_database/. */ static const QLocaleId likely_subtags[] = { diff --git a/src/corelib/tools/qtimezoneprivate_data_p.h b/src/corelib/tools/qtimezoneprivate_data_p.h index 4a6a73fe63..69b9417f19 100644 --- a/src/corelib/tools/qtimezoneprivate_data_p.h +++ b/src/corelib/tools/qtimezoneprivate_data_p.h @@ -119,7 +119,8 @@ struct QUtcData { http://www.unicode.org/cldr/ - Do not change this data, only generate it using cldr2qtimezone.py. + Do not edit this code: run cldr2qtimezone.py on updated (or + edited) CLDR data; see qtbase/util/local_database/. */ // Windows ID Key, Country Enum, IANA ID Index diff --git a/util/local_database/cldr2qtimezone.py b/util/local_database/cldr2qtimezone.py index 72abb3c355..7c10b1dfd2 100755 --- a/util/local_database/cldr2qtimezone.py +++ b/util/local_database/cldr2qtimezone.py @@ -342,7 +342,8 @@ newTempFile.write(""" http://www.unicode.org/cldr/ - Do not change this data, only generate it using cldr2qtimezone.py. + Do not edit this code: run cldr2qtimezone.py on updated (or + edited) CLDR data; see qtbase/util/local_database/. */ """ % (str(datetime.date.today()), cldr_version, versionNumber) ) diff --git a/util/local_database/qlocalexml2cpp.py b/util/local_database/qlocalexml2cpp.py index 41adbb96ee..8499469868 100755 --- a/util/local_database/qlocalexml2cpp.py +++ b/util/local_database/qlocalexml2cpp.py @@ -515,8 +515,9 @@ def main(): http://www.unicode.org/cldr/ - Do not change it, instead edit CLDR data and regenerate this file using - cldr2qlocalexml.py and qlocalexml2cpp.py. + Do not edit this section: instead regenerate it using + cldr2qlocalexml.py and qlocalexml2cpp.py on updated (or + edited) CLDR data; see qtbase/util/local_database/. */ """ % (str(datetime.date.today()), cldr_version) ) |