Merge branch '5.6' into 5.7

Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9

6 files changed, 27 insertions, 9 deletions

diff --git a/tests/auto/quick/qmltests/data/icons/small-favicon.png b/tests/auto/quick/qmltests/data/icons/small-favicon.png
index 4462752a5..8cf9a50a4 100644
--- a/tests/auto/quick/qmltests/data/icons/small-favicon.png
+++ b/tests/auto/quick/qmltests/data/icons/small-favicon.png
diff --git a/tests/auto/quick/qquickwebengineview/BLACKLIST b/tests/auto/quick/qquickwebengineview/BLACKLIST
new file mode 100644
index 000000000..d4d5c9844
--- /dev/null
+++ b/tests/auto/quick/qquickwebengineview/BLACKLIST
@@ -0,0 +1,2 @@
+[transparentWebEngineViews]
+windows
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));
 }
 
diff --git a/tests/auto/quick/shared/util.h b/tests/auto/quick/shared/util.h
index 8f7a85f68..66b42d010 100644
--- a/tests/auto/quick/shared/util.h
+++ b/tests/auto/quick/shared/util.h
@@ -119,7 +119,16 @@ inline bool waitForLoadFailed(QQuickWebEngineView *webEngineView, int timeout =
 
 inline bool waitForViewportReady(QQuickWebEngineView *webEngineView, int timeout = 10000)
 {
-    return waitForSignal(reinterpret_cast<QObject *>(webEngineView->experimental()), SIGNAL(loadVisuallyCommitted()), timeout);
+#ifdef ENABLE_QML_TESTSUPPORT_API
+    return waitForSignal(reinterpret_cast<QObject *>(webEngineView->testSupport()), SIGNAL(loadVisuallyCommitted()), timeout);
+#else
+    Q_UNUSED(webEngineView)
+    Q_UNUSED(timeout)
+    qFatal("Test Support API is disabled. The result is not reliable.\
+            Use the following command to build Test Support module and rebuild WebEngineView API:\
+            qmake -r WEBENGINE_CONFIG+=testsupport && make");
+    return false;
+#endif
 }
 
 #endif /* UTIL_H */
diff --git a/tests/auto/quick/tests.pri b/tests/auto/quick/tests.pri
index 3c56aef97..efe9ff9d0 100644
--- a/tests/auto/quick/tests.pri
+++ b/tests/auto/quick/tests.pri
@@ -17,3 +17,7 @@ macx: CONFIG -= app_bundle
 
 # This define is used by some tests to look up resources in the source tree
 DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\"
+
+isQMLTestSupportApiEnabled() {
+    DEFINES += ENABLE_QML_TESTSUPPORT_API
+}
diff --git a/tests/auto/widgets/qwebengineaccessibility/BLACKLIST b/tests/auto/widgets/qwebengineaccessibility/BLACKLIST
deleted file mode 100644
index 0450f8c1c..000000000
--- a/tests/auto/widgets/qwebengineaccessibility/BLACKLIST
+++ /dev/null
@@ -1,6 +0,0 @@
-[hierarchy]
-windows
-[text]
-windows
-[value]
-windows