From 790aca0ea1bbd33a8ff29c83c0ab0bd968304f03 Mon Sep 17 00:00:00 2001 From: David Faure Date: Sat, 14 Jul 2012 01:37:53 +0200 Subject: Add QSignalSpy::wait() method. Change-Id: I1f3b49e3dee19bf0b1d2933c6e6ad7972186e0d0 Reviewed-by: Rohan McGovern Reviewed-by: Jason McDonald --- src/testlib/qtesteventloop.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/testlib/qtesteventloop.h') diff --git a/src/testlib/qtesteventloop.h b/src/testlib/qtesteventloop.h index 98d69963ca..3f08a93b69 100644 --- a/src/testlib/qtesteventloop.h +++ b/src/testlib/qtesteventloop.h @@ -61,8 +61,9 @@ class Q_TESTLIB_EXPORT QTestEventLoop : public QObject public: inline QTestEventLoop(QObject *aParent = 0) : QObject(aParent), inLoop(false), _timeout(false), timerId(-1), loop(0) {} - inline void enterLoop(int secs); + inline void enterLoopMSecs(int ms); + inline void enterLoop(int secs) { enterLoopMSecs(secs * 1000); } inline void changeInterval(int secs) { killTimer(timerId); timerId = startTimer(secs * 1000); } @@ -92,7 +93,7 @@ private: QEventLoop *loop; }; -inline void QTestEventLoop::enterLoop(int secs) +inline void QTestEventLoop::enterLoopMSecs(int ms) { Q_ASSERT(!loop); @@ -101,7 +102,7 @@ inline void QTestEventLoop::enterLoop(int secs) inLoop = true; _timeout = false; - timerId = startTimer(secs * 1000); + timerId = startTimer(ms); loop = &l; l.exec(); -- cgit v1.2.3