Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/core/browser_context_qt.cpp
	src/webengine/api/qquickwebengineview_p.h

Change-Id: I73bdec03b627b282851d7dda12006d4ab631072c

1 files 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 <QtTest/QtTest>
 #include <QQmlContext>
 #include <QQuickView>
@@ -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()
 {
 }