diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-03-24 09:47:43 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-03-24 09:47:43 (GMT) |
| commit | 58db7e9e0713dad6da02cefa461101f0ac79cab8 (patch) | |
| tree | 4daf49f4d22a351b756fabda472c06d26cab8304 /tests/auto/qlocale | |
| parent | 555175f9d9e5633b8fcfd6e6f6a11c84faa9946e (diff) | |
| download | Qt-58db7e9e0713dad6da02cefa461101f0ac79cab8.zip Qt-58db7e9e0713dad6da02cefa461101f0ac79cab8.tar.gz Qt-58db7e9e0713dad6da02cefa461101f0ac79cab8.tar.bz2 | |
Revert "Optimized QLocale to access system locale on demand."
This reverts commit 0d3c62150f2fa2c06f7676336076be4622059cc3,
which causes the following (intermittent) test failuers:
TESTCASE_FAIL qtconcurrentmap (pulse_qws/linux-x86-g++)
TESTFUNCTION_FAIL qtconcurrentmap::mapped (pulse_qws/linux-x86-g++)
Diffstat (limited to 'tests/auto/qlocale')
| -rw-r--r-- | tests/auto/qlocale/tst_qlocale.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tests/auto/qlocale/tst_qlocale.cpp b/tests/auto/qlocale/tst_qlocale.cpp index 21a6f32..182f73b 100644 --- a/tests/auto/qlocale/tst_qlocale.cpp +++ b/tests/auto/qlocale/tst_qlocale.cpp @@ -158,15 +158,9 @@ void tst_QLocale::ctor() QCoreApplication app(argc, (char**)&argv); #endif QLocale default_locale = QLocale::system(); - - QVERIFY(!default_locale.monthName(1, QLocale::LongFormat).isEmpty()); - QVERIFY(!default_locale.monthName(1, QLocale::ShortFormat).isEmpty()); - QVERIFY(default_locale.language() != 0); - QLocale::Language default_lang = default_locale.language(); QLocale::Country default_country = default_locale.country(); - qDebug("Default: %s/%s", QLocale::languageToString(default_lang).toLatin1().constData(), QLocale::countryToString(default_country).toLatin1().constData()); |