diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-29 19:19:55 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-29 19:19:55 (GMT) |
| commit | 9c132451acc7fbed1611fd3676cceb26e815f50d (patch) | |
| tree | 48dee3c9a1bce695d07e56206f5b007babfdd1a5 /tests/auto | |
| parent | b9b86271b272c710817f0fad89a79c40181bdcff (diff) | |
| parent | 76cb07b10389cf808c138e7754627fd3fd5c0911 (diff) | |
| download | Qt-9c132451acc7fbed1611fd3676cceb26e815f50d.zip Qt-9c132451acc7fbed1611fd3676cceb26e815f50d.tar.gz Qt-9c132451acc7fbed1611fd3676cceb26e815f50d.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Incorrect comparison result in QString::locale
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qstring/tst_qstring.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qstring/tst_qstring.cpp b/tests/auto/qstring/tst_qstring.cpp index 969521f..abc8d9a 100644 --- a/tests/auto/qstring/tst_qstring.cpp +++ b/tests/auto/qstring/tst_qstring.cpp @@ -4319,6 +4319,9 @@ void tst_QString::localeAwareCompare_data() void tst_QString::localeAwareCompare() { +#ifdef Q_OS_SYMBIAN + QSKIP("QTBUG-16921: There is no way to set up the system locale, so this test is not reliable in Symbian."); +#else #ifdef Q_OS_WIN # ifndef Q_OS_WINCE QSKIP("On others than Win CE, we cannot set the system or user locale.", SkipAll); @@ -4416,6 +4419,7 @@ void tst_QString::localeAwareCompare() if (!locale.isEmpty()) setlocale(LC_ALL, ""); #endif +#endif // Q_OS_SYMBIAN } void tst_QString::split_data() |