From f9ca637a41ae2f8f5a5439766073bf19cbc7d9e2 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Fri, 28 May 2010 14:06:05 +0200
Subject: tst_qtextcodec: Fix broken merge conflict resolution

---
 tests/auto/qtextcodec/tst_qtextcodec.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 }
-- 
cgit v0.12