From 14cd2678396ed1450a72aeffa99c1504743ea415 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Thu, 7 Jun 2012 10:43:16 +0200 Subject: [PATCH] Use variadic macros where available to make QSKIP source compatible. Otherwise this is a large source incompatbility during porting, so it makes sense to provide the option of using C++11 for that. Change-Id: I9792b3ae2c1fa3743bc9a2e74380134ea2f24add Reviewed-by: Olivier Goffart Reviewed-by: Thiago Macieira --- src/testlib/qtestcase.h | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 661aaa08e8..5e88cc38e6 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -117,12 +117,22 @@ do { \ #define QTRY_COMPARE(__expr, __expected) QTRY_COMPARE_WITH_TIMEOUT(__expr, __expected, 5000) -#define QSKIP(statement) \ +#define QSKIP_INTERNAL(statement) \ do {\ QTest::qSkip(statement, __FILE__, __LINE__);\ return;\ } while (0) +#ifdef Q_COMPILER_VARIADIC_MACROS + +#define QSKIP(statement, ...) QSKIP_INTERNAL(statement) + +#else + +#define QSKIP(statement) QSKIP_INTERNAL(statement) + +#endif + #define QEXPECT_FAIL(dataIndex, comment, mode)\ do {\ if (!QTest::qExpectFail(dataIndex, comment, QTest::mode, __FILE__, __LINE__))\