From 3effd6bc1211536313e666639b99f51d1fc23e05 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 6 Dec 2011 17:15:15 +1000 Subject: Remove unused QTRY_WAIT macros. Change-Id: I8484c19d0458d9ec9a3a621fa0b866258e8212c3 Reviewed-by: Rohan McGovern --- .../integration/qcamerabackend/tst_qcamerabackend.cpp | 15 --------------- .../qmediaplayerbackend/tst_qmediaplayerbackend.cpp | 14 -------------- 2 files changed, 29 deletions(-) diff --git a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp index f32f427a6..a72daecce 100644 --- a/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp +++ b/tests/auto/integration/qcamerabackend/tst_qcamerabackend.cpp @@ -98,21 +98,6 @@ QT_USE_NAMESPACE } while(0) #endif - -#define QTRY_WAIT(code, __expr) \ - do { \ - const int __step = 50; \ - const int __timeout = 10000; \ - if (!(__expr)) { \ - QTest::qWait(0); \ - } \ - for (int __i = 0; __i < __timeout && !(__expr); __i+=__step) { \ - do { code } while(0); \ - QTest::qWait(__step); \ - } \ - } while(0) - - /* This is the backend conformance test. diff --git a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp index abcc3ec39..ec3078e0e 100644 --- a/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp +++ b/tests/auto/integration/qmediaplayerbackend/tst_qmediaplayerbackend.cpp @@ -52,20 +52,6 @@ QT_USE_NAMESPACE -#define QTRY_WAIT(code, __expr) \ - do { \ - const int __step = 50; \ - const int __timeout = 5000; \ - if (!(__expr)) { \ - QTest::qWait(0); \ - } \ - for (int __i = 0; __i < __timeout && !(__expr); __i+=__step) { \ - do { code } while(0); \ - QTest::qWait(__step); \ - } \ - } while(0) - - /* This is the backend conformance test. -- cgit v1.2.3