Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	src/quick/items/qquickwindow.cpp
	src/quick/items/qquickwindow_p.h
	tests/auto/quick/quick.pro

Change-Id: Ia12f20e95fb151bbbc75dbf187364a924cd0bc7a

8 files changed, 132 insertions, 15 deletions

diff --git a/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp b/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp
index d4922599be..363064aa31 100644
--- a/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp
+++ b/tests/auto/quick/qquickframebufferobject/tst_qquickframebufferobject.cpp
@@ -192,7 +192,8 @@ void tst_QQuickFramebufferObject::testThatStuffWorks()
     item->setMsaa(msaa);
 
     view.show();
-    QTest::qWaitForWindowExposed(&view);
+    view.requestActivate();
+    QTest::qWaitForWindowActive(&view);
 
     QImage result = view.grabWindow();
 
@@ -231,7 +232,8 @@ void tst_QQuickFramebufferObject::testInvalidate()
     item->setTextureSize(QSize(200, 200));
 
     view.show();
-    QTest::qWaitForWindowExposed(&view);
+    view.requestActivate();
+    QTest::qWaitForWindowActive(&view);
 
     QCOMPARE(frameInfo.fboSize, QSize(200, 200));
 
diff --git a/tests/auto/quick/qquicklistview/data/qtbug63974.qml b/tests/auto/quick/qquicklistview/data/qtbug63974.qml
new file mode 100644
index 0000000000..1e0afa54f8
--- /dev/null
+++ b/tests/auto/quick/qquicklistview/data/qtbug63974.qml
@@ -0,0 +1,34 @@
+import QtQuick 2.6
+
+ListView {
+    id: table
+    height: 200
+    width: 100
+
+    headerPositioning: ListView.OverlayHeader
+    header: Rectangle {
+        width: table.width
+        height: 20
+        color: "red"
+        z: 100
+    }
+
+    footerPositioning: ListView.OverlayFooter
+    footer: Rectangle {
+        width: table.width
+        height: 20
+        color: "blue"
+        z: 200
+    }
+
+    model: 30
+    delegate: Rectangle {
+        height: 20
+        width: table.width
+        color: "lightgray"
+        Text {
+            text: "Item " + index
+            anchors.centerIn: parent
+        }
+    }
+}
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index a31cb37c16..f06a118976 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -256,6 +256,7 @@ private slots:
     void keyNavigationEnabled();
     void QTBUG_61269_appendDuringScrollDown();
     void QTBUG_50097_stickyHeader_positionViewAtIndex();
+    void QTBUG_63974_stickyHeader_positionViewAtIndex_Contain();
     void itemFiltered();
     void releaseItems();
 
@@ -8561,6 +8562,46 @@ void tst_QQuickListView::QTBUG_50097_stickyHeader_positionViewAtIndex()
     QTRY_COMPARE(listview->contentY(), -100.0); // back to the same position: header visible, items not under the header.
 }
 
+void tst_QQuickListView::QTBUG_63974_stickyHeader_positionViewAtIndex_Contain()
+{
+    QScopedPointer<QQuickView> window(createView());
+    window->setSource(testFileUrl("qtbug63974.qml"));
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
+
+    QQuickListView *listview = qobject_cast<QQuickListView*>(window->rootObject());
+    QVERIFY(listview != 0);
+
+    const qreal headerSize = 20;
+    const qreal footerSize = 20;
+    const qreal itemSize = 20;
+    const int itemCount = 30;
+    const qreal contentHeight = itemCount * itemSize;
+
+    const qreal initialY = listview->contentY();
+    const qreal endPosition = contentHeight + footerSize - listview->height();
+
+    QVERIFY(qFuzzyCompare(initialY, -headerSize));
+
+    listview->positionViewAtIndex(itemCount - 1, QQuickListView::Contain);
+    QTRY_COMPARE(listview->contentY(), endPosition);
+
+    listview->positionViewAtIndex(0, QQuickListView::Contain);
+    QTRY_COMPARE(listview->contentY(), -headerSize);
+
+    listview->positionViewAtIndex(itemCount - 1, QQuickListView::Visible);
+    QTRY_COMPARE(listview->contentY(), endPosition);
+
+    listview->positionViewAtIndex(0, QQuickListView::Visible);
+    QTRY_COMPARE(listview->contentY(), -headerSize);
+
+    listview->positionViewAtIndex(itemCount - 1, QQuickListView::SnapPosition);
+    QTRY_COMPARE(listview->contentY(), endPosition);
+
+    listview->positionViewAtIndex(0, QQuickListView::SnapPosition);
+    QTRY_COMPARE(listview->contentY(), -headerSize);
+}
+
 void tst_QQuickListView::itemFiltered()
 {
     QStringListModel model(QStringList() << "one" << "two" << "three" << "four" << "five" << "six");
@@ -8617,9 +8658,9 @@ void tst_QQuickListView::QTBUG_34576_velocityZero()
     QVERIFY(QTest::qWaitForWindowExposed(window));
 
     QQuickListView *listview = findItem<QQuickListView>(window->rootObject(), "list");
-    QTRY_VERIFY(listview != 0);
+    QVERIFY(listview);
     QQuickItem *contentItem = listview->contentItem();
-    QTRY_VERIFY(contentItem != 0);
+    QVERIFY(contentItem);
     QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
 
     QSignalSpy horizontalVelocitySpy(listview, SIGNAL(horizontalVelocityChanged()));
@@ -8631,20 +8672,21 @@ void tst_QQuickListView::QTBUG_34576_velocityZero()
     window->rootObject()->setProperty("horizontalVelocityZeroCount", QVariant(0));
     listview->setCurrentIndex(2);
     QTRY_COMPARE(window->rootObject()->property("current").toInt(), 2);
-    QTRY_COMPARE(horizontalVelocitySpy.count(), 0);
-    QTRY_COMPARE(window->rootObject()->property("horizontalVelocityZeroCount").toInt(), 0);
+    QCOMPARE(horizontalVelocitySpy.count(), 0);
+    QCOMPARE(window->rootObject()->property("horizontalVelocityZeroCount").toInt(), 0);
+
+    QSignalSpy currentIndexChangedSpy(listview, SIGNAL(currentIndexChanged()));
 
     // click button which increases currentIndex
     QTest::mousePress(window, Qt::LeftButton, 0, QPoint(295,215));
     QTest::mouseRelease(window, Qt::LeftButton, 0, QPoint(295,215));
 
     // verify that currentIndexChanged is triggered
-    QVERIFY(horizontalVelocitySpy.wait());
+    QTRY_VERIFY(currentIndexChangedSpy.count() > 0);
 
-    // set currentIndex to item out of view to cause listview scroll
+    // since we have set currentIndex to an item out of view, the listview will scroll
     QTRY_COMPARE(window->rootObject()->property("current").toInt(), 3);
-    QTRY_COMPARE(horizontalVelocitySpy.count() > 0, true);
-    QVERIFY(horizontalVelocitySpy.wait(1000));
+    QTRY_VERIFY(horizontalVelocitySpy.count() > 0);
 
     // velocity should be always > 0.0
     QTRY_COMPARE(window->rootObject()->property("horizontalVelocityZeroCount").toInt(), 0);
diff --git a/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp b/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp
index fe33dbd4d8..1731253da6 100644
--- a/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp
+++ b/tests/auto/quick/qquickshadereffect/tst_qquickshadereffect.cpp
@@ -52,8 +52,8 @@ public:
     int signalsConnected = 0;
 
 protected:
-    void connectNotify(const QMetaMethod &) { ++signalsConnected; }
-    void disconnectNotify(const QMetaMethod &) { --signalsConnected; }
+    void connectNotify(const QMetaMethod &) override { ++signalsConnected; }
+    void disconnectNotify(const QMetaMethod &) override { --signalsConnected; }
 
 signals:
     void dummyChanged();
@@ -257,7 +257,7 @@ void tst_qquickshadereffect::lookThroughShaderCode()
     QQmlComponent component(&engine);
     component.setData("import QtQuick 2.0\nimport ShaderEffectTest 1.0\nTestShaderEffect {}", QUrl());
     QScopedPointer<TestShaderEffect> item(qobject_cast<TestShaderEffect*>(component.create()));
-    QCOMPARE(item->signalsConnected, 1);
+    QCOMPARE(item->signalsConnected, 0);
 
     QString expected;
     if ((presenceFlags & VertexPresent) == 0)
@@ -274,7 +274,7 @@ void tst_qquickshadereffect::lookThroughShaderCode()
     QCOMPARE(item->parseLog(), expected);
 
     // If the uniform was successfully parsed, the notify signal has been connected to an update slot.
-    QCOMPARE(item->signalsConnected, (presenceFlags & SourcePresent) ? 2 : 1);
+    QCOMPARE(item->signalsConnected, (presenceFlags & SourcePresent) ? 1 : 0);
 }
 
 void tst_qquickshadereffect::deleteSourceItem()
diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro
index 9b7740646a..0f904e0c09 100644
--- a/tests/auto/quick/quick.pro
+++ b/tests/auto/quick/quick.pro
@@ -46,7 +46,7 @@ PRIVATETESTS += \
 # This test requires the xmlpatterns module
 !qtHaveModule(xmlpatterns): PRIVATETESTS -= qquickxmllistmodel
 
-QUICKTESTS =  \
+QUICKTESTS += \
     pointerhandlers \
     qquickaccessible \
     qquickanchors \
diff --git a/tests/auto/quickwidgets/qquickwidget/BLACKLIST b/tests/auto/quickwidgets/qquickwidget/BLACKLIST
new file mode 100644
index 0000000000..6594a22472
--- /dev/null
+++ b/tests/auto/quickwidgets/qquickwidget/BLACKLIST
@@ -0,0 +1,2 @@
+[enterLeave]
+osx
diff --git a/tests/auto/quickwidgets/qquickwidget/data/enterleave.qml b/tests/auto/quickwidgets/qquickwidget/data/enterleave.qml
new file mode 100644
index 0000000000..b3057e30ad
--- /dev/null
+++ b/tests/auto/quickwidgets/qquickwidget/data/enterleave.qml
@@ -0,0 +1,12 @@
+import QtQuick 2.0
+
+Rectangle {
+    property bool hasMouse: mouseArea.containsMouse
+    height: 200
+    width: 200
+    MouseArea {
+        id: mouseArea
+        hoverEnabled: true
+        anchors.fill: parent
+    }
+}
diff --git a/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp b/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp
index 537fe99012..0bf2f8d7d8 100644
--- a/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp
+++ b/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp
@@ -65,6 +65,7 @@ private slots:
     void nullEngine();
     void keyEvents();
     void shortcuts();
+    void enterLeave();
 };
 
 
@@ -445,6 +446,30 @@ void tst_qquickwidget::shortcuts()
     QTRY_VERIFY(filter.shortcutOk);
 }
 
+void tst_qquickwidget::enterLeave()
+{
+    QQuickWidget view;
+    view.setSource(testFileUrl("enterleave.qml"));
+
+    // Ensure it is not inside the window first
+    QCursor::setPos(QPoint(50, 50));
+    QTRY_VERIFY(QCursor::pos() == QPoint(50, 50));
+
+    view.move(100, 100);
+    view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view, 5000));
+    QQuickItem *rootItem = view.rootObject();
+    QVERIFY(rootItem);
+
+    QTRY_VERIFY(!rootItem->property("hasMouse").toBool());
+    // Check the enter
+    QCursor::setPos(view.pos() + QPoint(50, 50));
+    QTRY_VERIFY(rootItem->property("hasMouse").toBool());
+    // Now check the leave
+    QCursor::setPos(view.pos() - QPoint(50, 50));
+    QTRY_VERIFY(!rootItem->property("hasMouse").toBool());
+}
+
 QTEST_MAIN(tst_qquickwidget)
 
 #include "tst_qquickwidget.moc"