diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-11-19 19:12:58 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-19 21:18:03 +0100 |
| commit | da90a3a490b452154391676857ac2ffc269d4843 (patch) | |
| tree | 9671ccef3d69ea168425d703c08ead4809bc5f4c /tests | |
| parent | b256c47d625c519a88fe9dd96611015445776434 (diff) | |
QLocale: replace hard-coded default country-for-language map
...with a generated one in a way similar to what
http://www.unicode.org/reports/tr35/#Likely_Subtags suggests.
The supplemental/likelySubtags.xml contains all the required data.
This changes some default countries to a most-expected ones.
Change-Id: I920a5623601d8661a943e78197d3bcc838191483
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp index a1b6d1cbc6..211a7b2f87 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -278,14 +278,14 @@ void tst_QLocale::ctor() TEST_CTOR(C, AnyCountry, QLocale::C, QLocale::AnyCountry) TEST_CTOR(C, France, QLocale::C, QLocale::AnyCountry) - TEST_CTOR(Arabic, AnyCountry, QLocale::Arabic, QLocale::SaudiArabia) + TEST_CTOR(Arabic, AnyCountry, QLocale::Arabic, QLocale::Egypt) TEST_CTOR(Dutch, AnyCountry, QLocale::Dutch, QLocale::Netherlands) TEST_CTOR(German, AnyCountry, QLocale::German, QLocale::Germany) TEST_CTOR(Greek, AnyCountry, QLocale::Greek, QLocale::Greece) TEST_CTOR(Malay, AnyCountry, QLocale::Malay, QLocale::Malaysia) TEST_CTOR(Persian, AnyCountry, QLocale::Persian, QLocale::Iran) - TEST_CTOR(Portuguese, AnyCountry, QLocale::Portuguese, QLocale::Portugal) - TEST_CTOR(Serbian, AnyCountry, QLocale::Serbian, QLocale::SerbiaAndMontenegro) + TEST_CTOR(Portuguese, AnyCountry, QLocale::Portuguese, QLocale::Brazil) + TEST_CTOR(Serbian, AnyCountry, QLocale::Serbian, QLocale::Serbia) TEST_CTOR(Somali, AnyCountry, QLocale::Somali, QLocale::Somalia) TEST_CTOR(Spanish, AnyCountry, QLocale::Spanish, QLocale::Spain) TEST_CTOR(Swedish, AnyCountry, QLocale::Swedish, QLocale::Sweden) |