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

Conflicts:
	src/quick/items/qquickitem.cpp
	tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
	tests/auto/quick/qquicklistview/tst_qquicklistview.cpp

Change-Id: I3cf47faa2fe567d62fffd985aeecbefe5811cc42

2 files changed, 68 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickgridview/data/qtbug48870.qml b/tests/auto/quick/qquickgridview/data/qtbug48870.qml
new file mode 100644
index 0000000000..7c0783fbb5
--- /dev/null
+++ b/tests/auto/quick/qquickgridview/data/qtbug48870.qml
@@ -0,0 +1,30 @@
+import QtQuick 2.6
+
+Rectangle {
+    width: 500
+    height: 500
+    color: "blue"
+
+    GridView {
+        id: view
+        objectName: "view"
+        anchors.fill: parent
+        model: testModel
+        cellWidth: 150
+        cellHeight: 150
+        readonly property int columns: Math.floor(width / cellWidth)
+
+        delegate: Rectangle {
+            width: GridView.view.cellWidth
+            height: GridView.view.cellHeight
+            color: (row & 1) != (col & 1) ? "green" : "red"
+            readonly property int row: index / view.columns
+            readonly property int col: index % view.columns
+
+            Text {
+                anchors.centerIn: parent
+                text: "Item " + index
+            }
+        }
+    }
+}
diff --git a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
index b3474db7de..07c03a57d7 100644
--- a/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
+++ b/tests/auto/quick/qquickgridview/tst_qquickgridview.cpp
@@ -36,6 +36,7 @@
 #include <QtQml/qqmlincubator.h>
 #include <QtQml/qqmlcontext.h>
 #include <QtQuick/private/qquickitem_p.h>
+#include <QtQuick/private/qquickitemview_p_p.h>
 #include <QtQuick/private/qquickgridview_p.h>
 #include <QtQuick/private/qquicktext_p.h>
 #include <QtQml/private/qqmllistmodel_p.h>
@@ -205,6 +206,7 @@ private slots:
     void contentHeightWithDelayRemove();
 
     void QTBUG_45640();
+    void QTBUG_48870_fastModelUpdates();
 
     void keyNavigationEnabled();
 
@@ -6628,6 +6630,42 @@ void tst_QQuickGridView::keyNavigationEnabled()
     QCOMPARE(gridView->currentIndex(), 1);
 }
 
+void tst_QQuickGridView::QTBUG_48870_fastModelUpdates()
+{
+    StressTestModel model;
+
+    QScopedPointer<QQuickView> window(createView());
+    QQmlContext *ctxt = window->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    window->setSource(testFileUrl("qtbug48870.qml"));
+    window->show();
+    QVERIFY(QTest::qWaitForWindowExposed(window.data()));
+
+    QQuickGridView *view = findItem<QQuickGridView>(window->rootObject(), "view");
+    QTRY_VERIFY(view != 0);
+
+    QQuickItemViewPrivate *priv = QQuickItemViewPrivate::get(view);
+    bool nonUnique;
+    FxViewItem *item = Q_NULLPTR;
+    int expectedIdx;
+    QVERIFY(testVisibleItems(priv, &nonUnique, &item, &expectedIdx));
+
+    for (int i = 0; i < 10; i++) {
+        QTest::qWait(100);
+        QVERIFY2(testVisibleItems(priv, &nonUnique, &item, &expectedIdx),
+                 qPrintable(!item ? QString("Unexpected null item")
+                            : nonUnique ? QString("Non-unique item at %1 and %2").arg(item->index).arg(expectedIdx)
+                                        : QString("Found index %1, expected index is %3").arg(item->index).arg(expectedIdx)));
+        if (i % 3 != 0) {
+            if (i & 1)
+                flick(window.data(), QPoint(100, 200), QPoint(100, 0), 100);
+            else
+                flick(window.data(), QPoint(100, 200), QPoint(100, 400), 100);
+        }
+    }
+}
+
 QTEST_MAIN(tst_QQuickGridView)
 
 #include "tst_qquickgridview.moc"