diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-26 14:32:55 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-27 11:14:12 +0200 |
| commit | c9bc2a6fda97ef883981d0bd2bef09b9c54d728f (patch) | |
| tree | 3d9ecfc4052aa541074a80f28a1907bf121db9bb /tests/auto/corelib | |
| parent | 4a81c29c476edfa2c1dcb5fecb3a76a295d43384 (diff) | |
Remove unnecessary QSKIP.
Change-Id: Icaa0687d5d0370ede6076cbee9d97d89e338ca17
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib')
| -rw-r--r-- | tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp index 4c9fc49e65..b0e9941a31 100644 --- a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp @@ -330,6 +330,7 @@ void tst_QTextCodec::codecForLocale() QTextCodec *codec = QTextCodec::codecForLocale(); QVERIFY(codec != 0); + // The rest of this test is for Unix only #if defined(Q_OS_UNIX) // get a time string that is locale-encoded QByteArray originalLocaleEncodedTimeString; @@ -346,9 +347,6 @@ void tst_QTextCodec::codecForLocale() QString unicodeTimeString = codec->toUnicode(originalLocaleEncodedTimeString); QByteArray localeEncodedTimeString = codec->fromUnicode(unicodeTimeString); QCOMPARE(localeEncodedTimeString, originalLocaleEncodedTimeString); -#else - QSKIP("This test is not implemented on Windows"); -#endif // find a codec that is not the codecForLocale() QTextCodec *codec2 = 0; @@ -370,6 +368,7 @@ void tst_QTextCodec::codecForLocale() // reset back to the default QTextCodec::setCodecForLocale(0); QCOMPARE(QTextCodec::codecForLocale(), codec); +#endif } void tst_QTextCodec::asciiToIscii() const |