diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-12-06 15:37:58 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-09 06:43:39 +0100 |
| commit | f23c247fdeba172009e0b648f03328e73686c254 (patch) | |
| tree | 78858adf5d3accbc11f641dd04bd3d6b645a3b2d /tests/auto/qdeclarativefeedback/tst_qdeclarativefeedback.cpp | |
| parent | 00c4f75af2b71253d4fb2f6c8458f43536f7d608 (diff) | |
Remove duplicate definitions of QTRY_COMPARE and QTRY_VERIFY.
These macros are now provided by QTestLib via the QtTest/QtTest header.
Change-Id: I60e571e9772170f6576465e19f8ac610313b537a
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/qdeclarativefeedback/tst_qdeclarativefeedback.cpp')
| -rw-r--r-- | tests/auto/qdeclarativefeedback/tst_qdeclarativefeedback.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/tests/auto/qdeclarativefeedback/tst_qdeclarativefeedback.cpp b/tests/auto/qdeclarativefeedback/tst_qdeclarativefeedback.cpp index 94fa26f..3ee6aad 100644 --- a/tests/auto/qdeclarativefeedback/tst_qdeclarativefeedback.cpp +++ b/tests/auto/qdeclarativefeedback/tst_qdeclarativefeedback.cpp @@ -50,22 +50,6 @@ #define SRCDIR "." #endif -#ifndef QTRY_COMPARE -#define QTRY_COMPARE(__expr, __expected) \ - do { \ - const int __step = 50; \ - const int __timeout = 5000; \ - if ((__expr) != (__expected)) { \ - QTest::qWait(0); \ - } \ - for (int __i = 0; __i < __timeout && ((__expr) != (__expected)); __i+=__step) { \ - QTest::qWait(__step); \ - } \ - QCOMPARE(__expr, __expected); \ - } while(0) -#endif - - Q_DECLARE_METATYPE(QFeedbackEffect::ThemeEffect); class tst_qdeclarativefeedback : public QObject |