From c9bc2a6fda97ef883981d0bd2bef09b9c54d728f Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 26 Oct 2011 14:32:55 +1000 Subject: Remove unnecessary QSKIP. Change-Id: Icaa0687d5d0370ede6076cbee9d97d89e338ca17 Reviewed-by: Rohan McGovern --- tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/auto/corelib') 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 -- cgit v1.2.3