diff -r 5dc02b23752f -r 3e2da88830cd tests/auto/qtextcodec/tst_qtextcodec.cpp --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp Tue Jul 06 15:10:48 2010 +0300 +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp Wed Aug 18 10:37:55 2010 +0300 @@ -2001,6 +2001,8 @@ QCOMPARE(res.results(), codecList); QCOMPARE(res2.results(), mibList); +#else + QSKIP("This function is not yet supported with QT_NO_CONCURRENT defined.", SkipAll); #endif } @@ -2012,7 +2014,7 @@ QVERIFY(!QTextCodec::codecForName("\1a\2b\3a\4d\5c\6s\7a\xffr\xec_\x9c_")); QVERIFY(!QTextCodec::codecForName("\n")); QVERIFY(!QTextCodec::codecForName("don't exist")); - QByteArray huge = "azertyuiop^$qsdfghjklm