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

Also blacklist tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove()
and comboBoxPopupPositionAfterMove().

Conflicts:
	.qmake.conf
	src/3rdparty
	src/core/render_widget_host_view_qt.cpp
	src/core/resources/resources.gyp
	src/webengine/doc/src/qtwebengine-platform-notes.qdoc
	src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp
	src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h
	tests/auto/widgets/qwebenginepage/BLACKLIST
	tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp
	tools/qmake/mkspecs/features/functions.prf

Task-number: QTBUG-55158
Change-Id: I1d73ac9b3ca5293ad3c7e3a56f4c395da930e6f4

5 files changed, 35 insertions, 19 deletions

diff --git a/tests/auto/quick/qmltests/data/tst_userScripts.qml b/tests/auto/quick/qmltests/data/tst_userScripts.qml
index dbad8cd56..92ae71f0b 100644
--- a/tests/auto/quick/qmltests/data/tst_userScripts.qml
+++ b/tests/auto/quick/qmltests/data/tst_userScripts.qml
@@ -119,19 +119,19 @@ Item {
             appendDocumentTitleScript.injectionPoint = WebEngineScript.Deferred
             webEngineView.reload();
             webEngineView.waitForLoadSucceeded();
-            compare(webEngineView.title, "New title with appendix");
+            tryCompare(webEngineView, "title", "New title with appendix");
 
             appendDocumentTitleScript.injectionPoint = WebEngineScript.DocumentReady
             changeDocumentTitleScript.injectionPoint = WebEngineScript.Deferred
             webEngineView.reload();
             webEngineView.waitForLoadSucceeded();
-            compare(webEngineView.title, "New title");
+            tryCompare(webEngineView, "title", "New title");
 
             // Make sure we can remove scripts from the preload list.
             webEngineView.userScripts = [ appendDocumentTitleScript ];
             webEngineView.reload();
             webEngineView.waitForLoadSucceeded();
-            compare(webEngineView.title, "Test page 1 with appendix");
+            tryCompare(webEngineView, "title", "Test page 1 with appendix");
 
             changeDocumentTitleScript.injectionPoint = WebEngineScript.DocumentReady
         }
diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
index d59fa92e9..904dfac26 100644
--- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
+++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp
@@ -549,9 +549,10 @@ void tst_QQuickWebEngineView::stopSettingFocusWhenDisabled_data()
 }
 
 class MouseTouchEventRecordingItem : public QQuickItem {
+    Q_OBJECT
 public:
-    explicit MouseTouchEventRecordingItem(QQuickItem *parent = 0) :
-        QQuickItem(parent), m_eventCounter(0) {
+    explicit MouseTouchEventRecordingItem(QQuickItem* child, QQuickItem *parent = 0) :
+        QQuickItem(parent), m_eventCounter(0), m_child(child) {
         setFlag(ItemHasContents);
         setAcceptedMouseButtons(Qt::AllButtons);
         setAcceptHoverEvents(true);
@@ -571,9 +572,6 @@ public:
         case QEvent::TouchUpdate:
         case QEvent::TouchEnd:
         case QEvent::TouchCancel:
-        case QEvent::HoverEnter:
-        case QEvent::HoverMove:
-        case QEvent::HoverLeave:
             ++m_eventCounter;
             event->accept();
             return true;
@@ -593,16 +591,34 @@ public:
         return m_eventCounter;
     }
 
+public Q_SLOTS:
+    void changeWidth() {
+        if (m_child)
+            setWidth(m_child->width());
+    }
+
+    void changeHeight() {
+        if (m_child)
+            setHeight(m_child->height());
+    }
+
 private:
     int m_eventCounter;
+    QQuickItem *m_child;
 };
 
 void tst_QQuickWebEngineView::inputEventForwardingDisabledWhenActiveFocusOnPressDisabled()
 {
     QQuickWebEngineView *view = webEngineView();
-    MouseTouchEventRecordingItem item;
+    MouseTouchEventRecordingItem item(view);
     item.setParentItem(m_window->contentItem());
-    item.setSize(QSizeF(640, 480));
+
+    // Resize the event recorder whenever the view is resized, so that all event positions
+    // are contained in both of the item regions.
+    QObject::connect(view, &QQuickItem::widthChanged, &item,
+                     &MouseTouchEventRecordingItem::changeWidth);
+    QObject::connect(view, &QQuickItem::heightChanged, &item,
+                     &MouseTouchEventRecordingItem::changeHeight);
     view->setParentItem(&item);
     view->setSize(QSizeF(640, 480));
     m_window->show();
@@ -610,6 +626,7 @@ void tst_QQuickWebEngineView::inputEventForwardingDisabledWhenActiveFocusOnPress
     // Simulate click and move of mouse, so that last known position in the application
     // is updated, thus a mouse move event is not generated when we don't expect it.
     QTest::mouseClick(view->window(), Qt::LeftButton);
+    QTRY_COMPARE(item.eventCount(), 2);
     item.clearEventCount();
 
     // First disable view, so it does not receive focus on page load.
diff --git a/tests/auto/quick/qquickwebengineviewgraphics/BLACKLIST b/tests/auto/quick/qquickwebengineviewgraphics/BLACKLIST
new file mode 100644
index 000000000..9ec23eb6d
--- /dev/null
+++ b/tests/auto/quick/qquickwebengineviewgraphics/BLACKLIST
@@ -0,0 +1,2 @@
+[showHideShow]
+*
diff --git a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
index 606f5af9c..2b9742b99 100644
--- a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
+++ b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
@@ -79,9 +79,7 @@ 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>");
@@ -112,9 +110,7 @@ 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()
@@ -191,9 +187,7 @@ void tst_QQuickWebEngineViewGraphics::setHtml(const QString &html)
 
     QQuickWebEngineView *webEngineView = static_cast<QQuickWebEngineView *>(m_view->rootObject());
     webEngineView->setProperty("url", QUrl(QStringLiteral("data:text/html,%1").arg(htmlData)));
-#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/quick.pro b/tests/auto/quick/quick.pro
index b278808f6..d220348ab 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -4,7 +4,10 @@ SUBDIRS += \
     inspectorserver \
     publicapi \
     qquickwebenginedefaultsurfaceformat \
-    qquickwebengineview \
-    qquickwebengineviewgraphics
+    qquickwebengineview
 
-isQMLTestSupportApiEnabled(): SUBDIRS += qmltests
+isQMLTestSupportApiEnabled() {
+    SUBDIRS += \
+        qmltests \
+        qquickwebengineviewgraphics
+}