diff options
author | Edward Welbourne <edward.welbourne@qt.io> | 2018-08-15 14:09:38 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-08-16 10:10:43 +0000 |
commit | 32f1bf0cac28806ae79a7467ed9dd5f16f6debde (patch) | |
tree | c8675add76a3125943c43933645ded130725ce89 | |
parent | bcf0be9b8ffa4739c2be26c53210b2fe3c3f1fe0 (diff) |
Update QLocale::Country doc for new territories
Neglected in 44b6757fe50b6bf581864d3da519a3ff60818fa8
Noted the need for this in a relevant script's instructions.
Change-Id: If69666f1799acebd434034c80b91056cb8777488
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r-- | src/corelib/tools/qlocale.qdoc | 5 | ||||
-rwxr-xr-x | util/local_database/cldr2qlocalexml.py | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc index bbb13bd165..5c0a9b63e5 100644 --- a/src/corelib/tools/qlocale.qdoc +++ b/src/corelib/tools/qlocale.qdoc @@ -568,6 +568,7 @@ \value Estonia \value Ethiopia \value EuropeanUnion Since Qt 5.7 + \value Europe Since Qt 5.12 \value FalklandIslands \value FaroeIslands \value Fiji @@ -619,6 +620,8 @@ \value Kuwait \value Kyrgyzstan \value Laos + \value LatinAmerica + \value LatinAmericaAndTheCaribbean Obsolete, please use LatinAmerica \value Latvia \value Lebanon \value Lesotho @@ -742,6 +745,7 @@ \value UnitedStatesVirginIslands \value WallisAndFutunaIslands \value WesternSahara + \value World Since Qt 5.12 \value Yemen \value Zambia \value Zimbabwe @@ -749,7 +753,6 @@ \value Serbia \value SaintBarthelemy \value SaintMartin - \value LatinAmericaAndTheCaribbean \value AscensionIsland \value AlandIslands \value DiegoGarcia diff --git a/util/local_database/cldr2qlocalexml.py b/util/local_database/cldr2qlocalexml.py index c8605dcc94..ce45f631a6 100755 --- a/util/local_database/cldr2qlocalexml.py +++ b/util/local_database/cldr2qlocalexml.py @@ -38,7 +38,12 @@ command-line argument. Save its standard output (but not error) to a file for later processing by ``./qlocalexml2cpp.py`` When you update the CLDR data, be sure to also update -src/corelib/tools/qt_attribution.json's entry for unicode-cldr. +src/corelib/tools/qt_attribution.json's entry for unicode-cldr. Check +this script's output for unknown language, country or script messages; +if any can be resolved, use their entry in common/main/en.xml to +append new entries to enumdata.py's lists and update documentation in +src/corelib/tools/qlocale.qdoc, adding the new entries in alphabetic +order. .. _CLDR: ftp://unicode.org/Public/cldr/ """ |