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

Change-Id: I4af0bf8ec1569097d97f8ce0bb8bf1a0e4a989ec

2 files changed, 42 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickmousearea/data/qtbug49100.qml b/tests/auto/quick/qquickmousearea/data/qtbug49100.qml
new file mode 100644
index 0000000000..39b293c8fa
--- /dev/null
+++ b/tests/auto/quick/qquickmousearea/data/qtbug49100.qml
@@ -0,0 +1,29 @@
+import QtQuick 2.2
+
+ListView {
+    id: list
+    width: 200
+    height: 200
+    model: 50
+    delegate: Text {
+        text: index + 1
+        height: 30
+        width: parent.width
+        MouseArea {
+            anchors.fill: parent
+        }
+        Rectangle {
+            anchors.fill: parent
+            opacity: 0.5
+            MouseArea {
+                anchors.fill: parent
+                propagateComposedEvents: true
+                onReleased: {
+                    list.currentIndex = 0;
+                    list.positionViewAtIndex(list.currentIndex, ListView.Contain)
+                }
+            }
+        }
+    }
+    Component.onCompleted: list.positionViewAtIndex(40, ListView.Beginning)
+}
diff --git a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
index d97d43abfc..d2994ca0b4 100644
--- a/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
+++ b/tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp
@@ -1144,6 +1144,19 @@ void tst_QQuickMouseArea::clickThrough()
 
     QCOMPARE(window->rootObject()->property("clicksEnabled").toInt(), 2);
     QCOMPARE(window->rootObject()->property("clicksDisabled").toInt(), 1); //disabled, shouldn't increment
+
+    window.reset(new QQuickView);
+
+    //QTBUG-49100
+    QVERIFY2(initView(*window.data(), testFileUrl("qtbug49100.qml"), true, &errorMessage), errorMessage.constData());
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
+    QVERIFY(window->rootObject() != 0);
+
+    QTest::mousePress(window.data(), Qt::LeftButton, 0, QPoint(100,100));
+    QTest::mouseRelease(window.data(), Qt::LeftButton, 0, QPoint(100,100));
+
+    QVERIFY(window->rootObject() != 0);
 }
 
 void tst_QQuickMouseArea::hoverPosition()