diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-02-13 13:34:21 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-16 02:00:42 +0100 |
| commit | 9864241309203aeeda3c247fed8da8ab0ca2d041 (patch) | |
| tree | 2f0819e922975cb4374f706fc1bc7f9dd09c21a1 | |
| parent | 45cf303d3a873ff96cad1e1e8ff736602d0e8a5a (diff) | |
| download | qtbase-9864241309203aeeda3c247fed8da8ab0ca2d041.tar.gz | |
testlib: Remove obsolete version of QSKIP macro.
A variadic version of the QSKIP macro has been left in qtestlib for
a transitional period to give upstream projects time to catch up with
the removal of the function from the API. This transitional period is
now finished.
Task-number: QTBUG-21652
Change-Id: Ib1a9158c2efbae05ffd0e69e72879f6387d4b2e8
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| -rw-r--r-- | src/testlib/qtestcase.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index c721dfd0d9..128decb646 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -117,22 +117,11 @@ do { \ #define QTRY_COMPARE(__expr, __expected) QTRY_COMPARE_WITH_TIMEOUT(__expr, __expected, 5000) -#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)\ - QTest::qFail("The two argument version of QSKIP is no longer available. "\ - "Please update this test by removing the second argument in each QSKIP.", __FILE__, __LINE__);\ - QTest::qSkip(statement, __FILE__, __LINE__);\ - return;\ -} while (0) -#endif #define QEXPECT_FAIL(dataIndex, comment, mode)\ do {\ |