diff options
| author | Liang Qi <liang.qi@nokia.com> | 2010-05-27 08:40:23 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2010-05-27 08:40:23 (GMT) |
| commit | a38cb0dbec7238903c62e8a08ecd6faecb58e9b2 (patch) | |
| tree | e4a6561839b4e63e64b5c816b8e22250ac41884d /tests | |
| parent | 40a1ced340f53d2ae44364a3802529bc71b70ae3 (diff) | |
| download | Qt-a38cb0dbec7238903c62e8a08ecd6faecb58e9b2.zip Qt-a38cb0dbec7238903c62e8a08ecd6faecb58e9b2.tar.gz Qt-a38cb0dbec7238903c62e8a08ecd6faecb58e9b2.tar.bz2 | |
Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qtextcodec/tst_qtextcodec.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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) |