--- a/tests/auto/qtextcodec/tst_qtextcodec.cpp Fri Jun 11 14:24:45 2010 +0300
+++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp Wed Jun 23 19:07:03 2010 +0300
@@ -1987,8 +1987,6 @@
void tst_QTextCodec::threadSafety()
{
- QList<QByteArray> codecList = QTextCodec::availableCodecs();
- QList<int> mibList = QTextCodec::availableMibs();
#ifndef QT_NO_CONCURRENT
QThreadPool::globalInstance()->setMaxThreadCount(12);
@@ -1999,6 +1997,8 @@
QCOMPARE(res.results(), codecList);
QCOMPARE(res2.results(), mibList);
+#else
+ QSKIP("This function is not yet supported with QT_NO_CONCURRENT defined.", SkipAll);
#endif
}