diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 01:01:27 +0200 |
| commit | dd0cd711708f65c429f807f42456bff14404f9c0 (patch) | |
| tree | 14687b4d9bb0b0d2a3b0b8ad6143fa2585a7597f /util/locale_database/cldr2qtimezone.py | |
| parent | ed48391c592e8ba68c723e3017ac384f0c7a7c23 (diff) | |
| parent | 86e74d60d2ab66a142a3ed02aabcadaab53b94ed (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'util/locale_database/cldr2qtimezone.py')
| -rwxr-xr-x | util/locale_database/cldr2qtimezone.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/util/locale_database/cldr2qtimezone.py b/util/locale_database/cldr2qtimezone.py index c240d0d190..4c3609056d 100755 --- a/util/locale_database/cldr2qtimezone.py +++ b/util/locale_database/cldr2qtimezone.py @@ -1,7 +1,7 @@ #!/usr/bin/env python2 ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the test suite of the Qt Toolkit. @@ -181,6 +181,7 @@ windowsIdList = ( (u'Pacific Standard Time (Mexico)', -28800), (u'Pakistan Standard Time', 18000), (u'Paraguay Standard Time', -14400), + (u'Qyzylorda Standard Time', 18000), # a.k.a. Kyzylorda, in Kazakhstan (u'Romance Standard Time', 3600), (u'Russia Time Zone 3', 14400), (u'Russia Time Zone 10', 39600), @@ -221,6 +222,7 @@ windowsIdList = ( (u'UTC+13', 46800), (u'Venezuela Standard Time', -16200), (u'Vladivostok Standard Time', 36000), + (u'Volgograd Standard Time', 14400), (u'W. Australia Standard Time', 28800), (u'W. Central Africa Standard Time', 3600), (u'W. Europe Standard Time', 3600), @@ -386,7 +388,7 @@ ianaIdData = ByteArrayData() # Write Windows/IANA table newTempFile.write("// Windows ID Key, Country Enum, IANA ID Index\n") newTempFile.write("static const QZoneData zoneDataTable[] = {\n") -for index in windowsIdDict: +for index in sorted(windowsIdDict): data = windowsIdDict[index] newTempFile.write(" { %6d,%6d,%6d }, // %s / %s\n" % (data['windowsKey'], |