Merge remote-tracking branch 'origin/stable' into 5.3

Conflicts:
	tests/auto/quick/qquicklistview/tst_qquicklistview.cpp

Change-Id: I80584b4f7d62cd86d3449e19176118e3bed886c1

2 files changed, 126 insertions, 2 deletions

diff --git a/tests/auto/quick/qquicklistview/data/qtbug39492.qml b/tests/auto/quick/qquicklistview/data/qtbug39492.qml
new file mode 100644
index 0000000000..4df3a080d7
--- /dev/null
+++ b/tests/auto/quick/qquicklistview/data/qtbug39492.qml
@@ -0,0 +1,40 @@
+import QtQuick 2.0
+import QtQml.Models 2.1
+
+Rectangle {
+    id: root
+    width: 240
+    height: 320
+    color: "#ffffff"
+
+
+    Component {
+        id: myDelegate
+        Rectangle {
+            id: wrapper
+            objectName: "wrapper"
+            height: 20
+            width: 240
+            Text {
+                objectName: "delegateText"
+                text: display
+            }
+            color: ListView.isCurrentItem ? "lightsteelblue" : "white"
+        }
+    }
+
+    DelegateModel {
+        id: delegateModel
+        objectName: "delegateModel"
+        model: testModel
+        delegate: myDelegate
+    }
+
+    ListView {
+        id: list
+        objectName: "listView"
+        model: delegateModel;
+        focus: true
+        anchors.fill: parent
+    }
+}
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
index 4fcf186690..d22f3487da 100644
--- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
+++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
@@ -41,6 +41,8 @@
 
 #include <QtTest/QtTest>
 #include <QtCore/QStringListModel>
+#include <QtCore/QSortFilterProxyModel>
+#include <QtGui/QStandardItemModel>
 #include <QtQuick/qquickview.h>
 #include <QtQml/qqmlengine.h>
 #include <QtQml/qqmlcontext.h>
@@ -50,6 +52,7 @@
 #include <QtQuick/private/qquicktext_p.h>
 #include <QtQml/private/qqmlobjectmodel_p.h>
 #include <QtQml/private/qqmllistmodel_p.h>
+#include <QtQml/private/qqmldelegatemodel_p.h>
 #include "../../shared/util.h"
 #include "../shared/viewtestutil.h"
 #include "../shared/visualtestutil.h"
@@ -63,6 +66,7 @@ Q_DECLARE_METATYPE(QQuickItemView::VerticalLayoutDirection)
 Q_DECLARE_METATYPE(QQuickItemView::PositionMode)
 Q_DECLARE_METATYPE(QQuickListView::Orientation)
 Q_DECLARE_METATYPE(Qt::Key)
+Q_DECLARE_METATYPE(QPersistentModelIndex)
 
 using namespace QQuickViewTestUtil;
 using namespace QQuickVisualTestUtil;
@@ -234,6 +238,9 @@ private slots:
 
     void layoutChange();
 
+    void QTBUG_39492_data();
+    void QTBUG_39492();
+
 private:
     template <class T> void items(const QUrl &source);
     template <class T> void changed(const QUrl &source);
@@ -7403,8 +7410,85 @@ void tst_QQuickListView::layoutChange()
     }
 }
 
-QTEST_MAIN(tst_QQuickListView)
+void tst_QQuickListView::QTBUG_39492_data()
+{
+    QStandardItemModel *sourceModel = new QStandardItemModel(this);
+    for (int i = 0; i < 5; ++i) {
+        QStandardItem *item = new QStandardItem(QString::number(i));
+        for (int j = 0; j < 5; ++j) {
+            QStandardItem *subItem = new QStandardItem(QString("%1-%2").arg(i).arg(j));
+            item->appendRow(subItem);
+        }
+        sourceModel->appendRow(item);
+    }
 
-#include "tst_qquicklistview.moc"
+    QSortFilterProxyModel *sortModel = new QSortFilterProxyModel(this);
+    sortModel->setSourceModel(sourceModel);
+
+    QTest::addColumn<QSortFilterProxyModel*>("model");
+    QTest::addColumn<QPersistentModelIndex>("rootIndex");
+
+    QTest::newRow("invalid rootIndex")
+        << sortModel
+        << QPersistentModelIndex();
+
+    QTest::newRow("rootIndex 1")
+        << sortModel
+        << QPersistentModelIndex(sortModel->index(1, 0));
 
+    QTest::newRow("rootIndex 3")
+        << sortModel
+        << QPersistentModelIndex(sortModel->index(3, 0));
 
+    const QModelIndex rootIndex2 = sortModel->index(2, 0);
+    QTest::newRow("rootIndex 2-1")
+        << sortModel
+        << QPersistentModelIndex(sortModel->index(1, 0, rootIndex2));
+}
+
+void tst_QQuickListView::QTBUG_39492()
+{
+    QFETCH(QSortFilterProxyModel*, model);
+    QFETCH(QPersistentModelIndex, rootIndex);
+
+    QQuickView *window = getView();
+    window->rootContext()->setContextProperty("testModel", QVariant::fromValue(model));
+    window->setSource(testFileUrl("qtbug39492.qml"));
+
+    QQuickListView *listview = window->rootObject()->findChild<QQuickListView *>("listView");
+    QVERIFY(listview);
+
+    QQmlDelegateModel *delegateModel = window->rootObject()->findChild<QQmlDelegateModel *>("delegateModel");
+    QVERIFY(delegateModel);
+
+    delegateModel->setRootIndex(QVariant::fromValue(QModelIndex(rootIndex)));
+    model->sort(0, Qt::AscendingOrder);
+    listview->forceLayout();
+
+    for (int i = 0; i < model->rowCount(rootIndex); ++i) {
+        QQuickItem *delegateItem = listview->itemAt(10, 10 + i * 20);
+        QVERIFY(delegateItem);
+        QQuickItem *delegateText = delegateItem->findChild<QQuickItem *>("delegateText");
+        QVERIFY(delegateText);
+        QCOMPARE(delegateText->property("text").toString(),
+                 model->index(i, 0, rootIndex).data().toString());
+    }
+
+    model->sort(0, Qt::DescendingOrder);
+    listview->forceLayout();
+
+    for (int i = 0; i < model->rowCount(rootIndex); ++i) {
+        QQuickItem *delegateItem = listview->itemAt(10, 10 + i * 20);
+        QVERIFY(delegateItem);
+        QQuickItem *delegateText = delegateItem->findChild<QQuickItem *>("delegateText");
+        QVERIFY(delegateText);
+        QCOMPARE(delegateText->property("text").toString(),
+                 model->index(i, 0, rootIndex).data().toString());
+    }
+
+    releaseView(window);
+}
+
+QTEST_MAIN(tst_QQuickListView)
+
+#include "tst_qquicklistview.moc"