diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/corelib/qurl-generateTLDs/main.cpp | 6 | ||||
| -rwxr-xr-x | util/locale_database/cldr2qtimezone.py | 6 | ||||
| -rw-r--r-- | util/locale_database/enumdata.py | 5 | ||||
| -rwxr-xr-x | util/locale_database/qlocalexml2cpp.py | 2 | ||||
| -rw-r--r-- | util/unicode/README | 4 |
5 files changed, 14 insertions, 9 deletions
diff --git a/util/corelib/qurl-generateTLDs/main.cpp b/util/corelib/qurl-generateTLDs/main.cpp index e458ea9d53..c03da98510 100644 --- a/util/corelib/qurl-generateTLDs/main.cpp +++ b/util/corelib/qurl-generateTLDs/main.cpp @@ -102,14 +102,14 @@ int main(int argc, char **argv) } QFile file(argv[1]); if (!file.open(QIODevice::ReadOnly)) { - fprintf("Failed to open input file (%s); see %s -usage", argv[1], argv[0]); + fprintf(stderr, "Failed to open input file (%s); see %s -usage", argv[1], argv[0]); return 1; } QFile outFile(argv[2]); if (!outFile.open(QIODevice::WriteOnly)) { - file.close() - fprintf("Failed to open output file (%s); see %s -usage", argv[2], argv[0]); + file.close(); + fprintf(stderr, "Failed to open output file (%s); see %s -usage", argv[2], argv[0]); return 1; } 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'], diff --git a/util/locale_database/enumdata.py b/util/locale_database/enumdata.py index 0e40d8a9ee..4b4febf002 100644 --- a/util/locale_database/enumdata.py +++ b/util/locale_database/enumdata.py @@ -1,7 +1,7 @@ #!/usr/bin/env python ############################################################################# ## -## 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. @@ -404,6 +404,9 @@ language_list = { 364: ["Western Balochi", "bgn"], 365: ["Cebuano", "ceb"], 366: ["Erzya", "myv"], + 367: ["Chickasaw", "cic"], + 368: ["Muscogee", "mus"], + 369: ["Silesian", "szl"], } language_aliases = { diff --git a/util/locale_database/qlocalexml2cpp.py b/util/locale_database/qlocalexml2cpp.py index a5ff7ebbf4..52e6331569 100755 --- a/util/locale_database/qlocalexml2cpp.py +++ b/util/locale_database/qlocalexml2cpp.py @@ -357,7 +357,7 @@ def main(): qtsrcdir = sys.argv[2] if not (os.path.isdir(qtsrcdir) - and all(os.path.isfile(os.path.join(qtsrcdir, 'src', 'corelib', 'tools', leaf)) + and all(os.path.isfile(os.path.join(qtsrcdir, 'src', 'corelib', 'text', leaf)) for leaf in ('qlocale_data_p.h', 'qlocale.h', 'qlocale.qdoc'))): usage() diff --git a/util/unicode/README b/util/unicode/README index 87f055d42d..1f14459d14 100644 --- a/util/unicode/README +++ b/util/unicode/README @@ -1,4 +1,4 @@ -Unicode is used to generate the unicode data in src/corelib/tools. +Unicode is used to generate the unicode data in src/corelib/text/. To update: * Find the data (UAX #44, UCD; not the XML version) at @@ -21,7 +21,7 @@ To update: * Build with the modified code, fix any compilation issues. * That may have updated qtbase/src/corelib/text/qunicodetables.cpp; if so the update matters; be sure to commit the changes to data/ at - the same time and update tools/qt_attribution.json to match; use the + the same time and update text/qt_attribution.json to match; use the UCD Revision number, rather than the Unicode standard number, as the Version, for all that qunicodetables.cpp uses the latter. |