From 8a5db798420903e6a2753e2f6651ead19243a423 Mon Sep 17 00:00:00 2001 From: Szabolcs David Date: Mon, 13 Oct 2014 02:24:05 -0700 Subject: Use the shared waitForSignal method in QQuickWebEngineViewGraphics test Change-Id: Ie27e4af5f4517bb1e1eea1262ab32140b3dff816 Reviewed-by: Andras Becsi --- .../tst_qquickwebengineviewgraphics.cpp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp index af57df7e0..b69cdd151 100644 --- a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp +++ b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp @@ -39,6 +39,8 @@ ** ****************************************************************************/ +#include "util.h" + #include #include #include @@ -99,21 +101,6 @@ static QImage get150x150GreenReferenceImage() return reference; } -static inline bool waitForSignal(QObject *obj, const char *signal, int timeout = 10000) -{ - QEventLoop loop; - QObject::connect(obj, signal, &loop, SLOT(quit())); - QTimer timer; - QSignalSpy timeoutSpy(&timer, SIGNAL(timeout())); - if (timeout > 0) { - QObject::connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit())); - timer.setSingleShot(true); - timer.start(timeout); - } - loop.exec(); - return timeoutSpy.isEmpty(); -} - tst_QQuickWebEngineViewGraphics::tst_QQuickWebEngineViewGraphics() { } -- cgit v1.2.3