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

Change-Id: I3567f741394f912d4312460e85555b6c39b61cb4

2 files changed, 66 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicklistview/data/snapOneItemCurrentIndexRemoveAnimation.qml b/tests/auto/quick/qquicklistview/data/snapOneItemCurrentIndexRemoveAnimation.qml
new file mode 100644
index 0000000000..215467f0cc
--- /dev/null
+++ b/tests/auto/quick/qquicklistview/data/snapOneItemCurrentIndexRemoveAnimation.qml
@@ -0,0 +1,39 @@
+import QtQuick 2.4
+
+ListView {
+    id: root
+    height: 400
+    width: height
+    model: ListModel {
+        id: lmodel
+        ListElement { dummy: 0 }
+        ListElement { dummy: 0 }
+        ListElement { dummy: 0 }
+        ListElement { dummy: 0 }
+        ListElement { dummy: 0 }
+        ListElement { dummy: 0 }
+    }
+
+    function removeItemZero()
+    {
+        lmodel.remove(0);
+    }
+
+    orientation: ListView.Horizontal
+    snapMode: ListView.SnapOneItem
+    highlightRangeMode: ListView.StrictlyEnforceRange
+
+    property int transitionsRun: 0
+
+    removeDisplaced: Transition {
+        id: transition
+        PropertyAnimation { property: "x"; duration: 500 }
+        onRunningChanged: if (!running) transitionsRun++;
+    }
+
+    delegate: Text {
+        text: index + " of " + lmodel.count
+        width: root.width
+        height: root.height
+    }
+}
\ No newline at end of file
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index e02c053208..a5de266636 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -182,6 +182,7 @@ private slots:
     void snapOneItemResize_QTBUG_43555();
     void snapOneItem_data();
     void snapOneItem();
+    void snapOneItemCurrentIndexRemoveAnimation();
 
     void QTBUG_9791();
     void QTBUG_11105();
@@ -5587,6 +5588,32 @@ void tst_QQuickListView::snapOneItem()
     releaseView(window);
 }
 
+void tst_QQuickListView::snapOneItemCurrentIndexRemoveAnimation()
+{
+    QQuickView *window = createView();
+
+    window->setSource(testFileUrl("snapOneItemCurrentIndexRemoveAnimation.qml"));
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window));
+
+    QQuickListView *listview = qobject_cast<QQuickListView*>(window->rootObject());
+    QTRY_VERIFY(listview != 0);
+
+    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+    QTRY_COMPARE(listview->currentIndex(), 0);
+    QSignalSpy currentIndexSpy(listview, SIGNAL(currentIndexChanged()));
+
+    QMetaObject::invokeMethod(window->rootObject(), "removeItemZero");
+    QTRY_COMPARE(listview->property("transitionsRun").toInt(), 1);
+
+    QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false);
+
+    QCOMPARE(listview->currentIndex(), 0);
+    QCOMPARE(currentIndexSpy.count(), 0);
+
+    delete window;
+}
+
 void tst_QQuickListView::attachedProperties_QTBUG_32836()
 {
     QQuickView *window = createView();