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

1 files changed, 1 insertions, 91 deletions

diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index 405acad165..658ffa1f57 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -8264,99 +8264,9 @@ void tst_QQuickListView::keyNavigationEnabled()
     QCOMPARE(listView->currentIndex(), 1);
 }
 
-static bool testVisibleItems(const QQuickItemViewPrivate *priv, bool *nonUnique, FxViewItem **failItem, int *expectedIdx)
-{
-    QHash<QQuickItem*, int> uniqueItems;
-
-    int skip = 0;
-    for (int i = 0; i < priv->visibleItems.count(); ++i) {
-        FxViewItem *item = priv->visibleItems.at(i);
-        if (!item) {
-            *failItem = Q_NULLPTR;
-            return false;
-        }
-#if 0
-        qDebug() << "\t" << item->index
-                 << item->item
-                 << item->position()
-                 << (!item->item || QQuickItemPrivate::get(item->item)->culled ? "hidden" : "visible");
-#endif
-        if (item->index == -1) {
-            ++skip;
-        } else if (item->index != priv->visibleIndex + i - skip) {
-            *nonUnique = false;
-            *failItem = item;
-            *expectedIdx = priv->visibleIndex + i - skip;
-            return false;
-        } else if (uniqueItems.contains(item->item)) {
-            *nonUnique = true;
-            *failItem = item;
-            *expectedIdx = uniqueItems.find(item->item).value();
-            return false;
-        }
-
-        uniqueItems.insert(item->item, item->index);
-    }
-
-    return true;
-}
-
-class QTBUG_48870_Model : public QAbstractListModel
-{
-    Q_OBJECT
-
-public:
-
-    QTBUG_48870_Model()
-        : QAbstractListModel()
-        , m_rowCount(20)
-    {
-        QTimer *t = new QTimer(this);
-        t->setInterval(500);
-        t->start();
-
-        qsrand(qHash(QDateTime::currentDateTime()));
-        connect(t, &QTimer::timeout, this, &QTBUG_48870_Model::updateModel);
-    }
-
-    int rowCount(const QModelIndex &) const
-    {
-        return m_rowCount;
-    }
-
-    QVariant data(const QModelIndex &, int) const
-    {
-        return QVariant();
-    }
-
-public Q_SLOTS:
-    void updateModel()
-    {
-        if (m_rowCount > 10) {
-            for (int i = 0; i < 10; ++i) {
-                int rnum = qrand() % m_rowCount;
-                beginRemoveRows(QModelIndex(), rnum, rnum);
-                m_rowCount--;
-                endRemoveRows();
-            }
-        }
-        if (m_rowCount < 20) {
-            for (int i = 0; i < 10; ++i) {
-                int rnum = qrand() % m_rowCount;
-                beginInsertRows(QModelIndex(), rnum, rnum);
-                m_rowCount++;
-                endInsertRows();
-            }
-        }
-    }
-
-private:
-    int m_rowCount;
-};
-
 void tst_QQuickListView::QTBUG_48870_fastModelUpdates()
 {
-    QTBUG_48870_Model model;
+    StressTestModel model;
 
     QScopedPointer<QQuickView> window(createView());
     QQmlContext *ctxt = window->rootContext();