summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-19 12:53:13 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-21 01:20:29 +0200
commit27f9f136f7e39b5d612bc02f7ff8778ab424c07d (patch)
tree3c72358e3d1e42fbf0c386365e76db259e180bd7 /tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
parent016cd01846539404a0eff1e3823fa2206fe2c9a9 (diff)
Remove SkipMode parameter from QSKIP calls.
The previous commit removed SkipMode from the testlib APi. This commit removes the parameter from all calls to QSKIP. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I21c0ee6731c1bc6ac6d962590d9b31d7459dfbc5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp')
-rw-r--r--tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
index 96901f334e..c3002a81bc 100644
--- a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
+++ b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp
@@ -341,14 +341,14 @@ void tst_QTextCodec::codecForLocale()
"%A%a%B%b%Z",
localtime(&t));
if (r == 0)
- QSKIP("strftime() failed", SkipAll);
+ QSKIP("strftime() failed");
originalLocaleEncodedTimeString.resize(r);
QString unicodeTimeString = codec->toUnicode(originalLocaleEncodedTimeString);
QByteArray localeEncodedTimeString = codec->fromUnicode(unicodeTimeString);
QCOMPARE(localeEncodedTimeString, originalLocaleEncodedTimeString);
#else
- QSKIP("This test is not implemented on Windows", SkipAll);
+ QSKIP("This test is not implemented on Windows");
#endif
// find a codec that is not the codecForLocale()
@@ -361,7 +361,7 @@ void tst_QTextCodec::codecForLocale()
}
}
if (!codec2) {
- QSKIP("Could not find a codec that is not already the codecForLocale()", SkipAll);
+ QSKIP("Could not find a codec that is not already the codecForLocale()");
}
// set it, codecForLocale() should return it now