diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-02-17 09:50:31 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2010-02-17 09:51:04 (GMT) |
| commit | ff7d6e1bf004495167623fae8c97eddf2df46983 (patch) | |
| tree | 30abd78094ca1f864586afdc55fb2fc5117dc985 /tests/auto/qlocale | |
| parent | f2af6385246205acfd65d83ad3df3741d4f4ac7e (diff) | |
| download | Qt-ff7d6e1bf004495167623fae8c97eddf2df46983.zip Qt-ff7d6e1bf004495167623fae8c97eddf2df46983.tar.gz Qt-ff7d6e1bf004495167623fae8c97eddf2df46983.tar.bz2 | |
Revert "Optimized QLocale to access system locale on demand."
The change introduces regression in QIntValidator and QInputDialog, which needs
to be addressed before pushing the change again.
Also reverted the following two compile fixes:
Revert "Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)"
Revert "Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)"
This reverts commit c786e0cd3c40193073ce2f59f98a4d83bbe1a9b9.
This reverts commit 9e5176070cdeba3e96f1969cfbb71bbd407a651e.
This reverts commit 8911ed8bfe7f918b93c758f9b5d93274b37739e6.
Reviewed-by: trustme
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 8dd5fbb..3dc4dad 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()); |