diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-28 12:06:05 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-28 12:06:05 (GMT) |
| commit | f9ca637a41ae2f8f5a5439766073bf19cbc7d9e2 (patch) | |
| tree | 18e9c28934638bbc59a873bd25d61073ab7393a8 /tests/auto/qtextcodec | |
| parent | df17b26b40717e35a534e373b2070d37817cb4a3 (diff) | |
| download | Qt-f9ca637a41ae2f8f5a5439766073bf19cbc7d9e2.zip Qt-f9ca637a41ae2f8f5a5439766073bf19cbc7d9e2.tar.gz Qt-f9ca637a41ae2f8f5a5439766073bf19cbc7d9e2.tar.bz2 | |
tst_qtextcodec: Fix broken merge conflict resolution
Diffstat (limited to 'tests/auto/qtextcodec')
| -rw-r--r-- | tests/auto/qtextcodec/tst_qtextcodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp index c91201e..0946c93 100644 --- a/tests/auto/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp @@ -2001,7 +2001,7 @@ void tst_QTextCodec::threadSafety() QCOMPARE(res.results(), codecList); QCOMPARE(res2.results(), mibList); -#endif +#else QSKIP("This function is not yet supported with QT_NO_CONCURRENT defined.", SkipAll); #endif } |