Merge branch '5.6' into 5.7

Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9

1 files changed, 11 insertions, 2 deletions

diff --git a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
index cd1d1ac44..606f5af9c 100644
--- a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
+++ b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
@@ -34,6 +34,7 @@
 #include <QQuickItem>
 #include <QPainter>
 #include <qtwebengineglobal.h>
+#include <private/qquickwebenginetestsupport_p.h>
 #include <private/qquickwebengineview_p.h>
 
 class TestView : public QQuickView {
@@ -78,6 +79,9 @@ private Q_SLOTS:
 private:
     void setHtml(const QString &html);
     QScopedPointer<TestView> m_view;
+#ifdef ENABLE_QML_TESTSUPPORT_API
+    QScopedPointer<QQuickWebEngineTestSupport> m_testSupport;
+#endif
 };
 
 static const QString greenSquare("<div style=\"background-color: #00ff00; position:absolute; left:50px; top: 50px; width: 50px; height: 50px;\"></div>");
@@ -108,6 +112,9 @@ tst_QQuickWebEngineViewGraphics::~tst_QQuickWebEngineViewGraphics()
 void tst_QQuickWebEngineViewGraphics::initTestCase()
 {
     QtWebEngine::initialize();
+#ifdef ENABLE_QML_TESTSUPPORT_API
+    m_testSupport.reset(new QQuickWebEngineTestSupport);
+#endif
 }
 
 void tst_QQuickWebEngineViewGraphics::init()
@@ -183,9 +190,11 @@ void tst_QQuickWebEngineViewGraphics::setHtml(const QString &html)
     m_view->create();
 
     QQuickWebEngineView *webEngineView = static_cast<QQuickWebEngineView *>(m_view->rootObject());
-    QSignalSpy spy(reinterpret_cast<QObject *>(webEngineView->experimental()), SIGNAL(loadVisuallyCommitted()));
     webEngineView->setProperty("url", QUrl(QStringLiteral("data:text/html,%1").arg(htmlData)));
-    QVERIFY(!spy.isEmpty() || spy.wait());
+#ifdef ENABLE_QML_TESTSUPPORT_API
+    webEngineView->setTestSupport(m_testSupport.data());
+#endif
+    QVERIFY(waitForViewportReady(webEngineView));
     QCOMPARE(m_view->rootObject()->property("loading"), QVariant(false));
 }