diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-21 11:11:28 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 16:54:45 +0200 |
| commit | b256d7b3bbe5ff6d3405255f0077e6b9635c8e7e (patch) | |
| tree | 4e07af5966992583cb0fd7e6660d11f29882b984 | |
| parent | e375637fe545e117ccf185ec49beed56149e2522 (diff) | |
Testlib: Fixed compilation with MSVC.
MSVC does not like VA_ARGS tricks.
Change-Id: I947dcb89e519c18a482a504725213a3f4d9670ff
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
| -rw-r--r-- | src/testlib/qtestcase.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 7ba9fd714b..4d20de6fcd 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -112,6 +112,14 @@ do { \ QCOMPARE(__expr, __expected); \ } while (0) + +#ifdef Q_CC_MSVC +#define QSKIP(statement) \ +do {\ + QTest::qSkip(statement, __FILE__, __LINE__);\ + return;\ +} while (0) +#else #define QSKIP(statement, ...) \ do {\ if (strcmp(#__VA_ARGS__, "") != 0)\ @@ -120,6 +128,7 @@ do {\ QTest::qSkip(statement, __FILE__, __LINE__);\ return;\ } while (0) +#endif #define QEXPECT_FAIL(dataIndex, comment, mode)\ do {\ |