diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-27 08:44:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-27 08:44:13 (GMT) |
| commit | 10830900ce5ff361c52b8c244ba14e53e98722f0 (patch) | |
| tree | 5aeaeb0c9f3d4002d65e674e4d0fe3c4067223a5 | |
| parent | a32798fa17b5d67c002a8910baf7b8dc85084691 (diff) | |
| parent | a38cb0dbec7238903c62e8a08ecd6faecb58e9b2 (diff) | |
| download | Qt-10830900ce5ff361c52b8c244ba14e53e98722f0.zip Qt-10830900ce5ff361c52b8c244ba14e53e98722f0.tar.gz Qt-10830900ce5ff361c52b8c244ba14e53e98722f0.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.
| -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) |