Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6

1 files changed, 21 insertions, 0 deletions

diff --git a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp
index 413419d..3736813 100644
--- a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp
+++ b/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp
@@ -112,6 +112,8 @@ private slots:
     void testMoveWithinOwnRange_data();
     void testMoveWithinOwnRange();
 
+    void testMoveThroughProxy();
+
     void testReset();
 
 
@@ -1112,6 +1114,25 @@ void tst_QAbstractItemModel::testMoveSameParentUp()
     }
 }
 
+void tst_QAbstractItemModel::testMoveThroughProxy()
+{
+    QSortFilterProxyModel *proxy = new QSortFilterProxyModel(this);
+    proxy->setSourceModel(m_model);
+
+    QList<QPersistentModelIndex> persistentList;
+
+    persistentList.append(proxy->index(0, 0));
+    persistentList.append(proxy->index(0, 0, proxy->mapFromSource(m_model->index(5, 0))));
+
+    ModelMoveCommand *moveCommand = new ModelMoveCommand(m_model, this);
+    moveCommand->setNumCols(4);
+    moveCommand->setAncestorRowNumbers(QList<int>() << 5);
+    moveCommand->setStartRow(0);
+    moveCommand->setEndRow(0);
+    moveCommand->setDestRow(0);
+    moveCommand->doCommand();
+}
+
 void tst_QAbstractItemModel::testMoveToGrandParent_data()
 {
     QTest::addColumn<int>("startRow");