From a38cb0dbec7238903c62e8a08ecd6faecb58e9b2 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Thu, 27 May 2010 10:40:23 +0200
Subject: Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.

---
 tests/auto/qtextcodec/tst_qtextcodec.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp
index aa97e87..149efae 100644
--- a/tests/auto/qtextcodec/tst_qtextcodec.cpp
+++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp
@@ -1938,6 +1938,7 @@ static int loadAndConvertMIB(int mib)
 
 void tst_QTextCodec::threadSafety()
 {
+#ifndef QT_NO_CONCURRENT
     QThreadPool::globalInstance()->setMaxThreadCount(12);
 
     QList<QByteArray> codecList = QTextCodec::availableCodecs();
@@ -1948,6 +1949,9 @@ void tst_QTextCodec::threadSafety()
 
     QCOMPARE(res.results(), codecList);
     QCOMPARE(res2.results(), mibList);
+#else
+    QSKIP("This function is not yet supported with QT_NO_CONCURRENT defined.", SkipAll);
+#endif
 }
 
 QTEST_MAIN(tst_QTextCodec)
-- 
cgit v0.12