diff options
author | Stephen Kelly <steveire@gmail.com> | 2009-11-26 15:00:13 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-26 15:28:00 (GMT) |
commit | 88b9c6eb3f1dde9997d5e824450c9eaa2a36f8d5 (patch) | |
tree | 44dcef8d9fa3dbbd4f115ccb3a6e16ab0b8494c1 /tests/auto/qabstractitemmodel | |
parent | 236d8ad3aedd09e905df97412380545d0986be2c (diff) | |
download | Qt-88b9c6eb3f1dde9997d5e824450c9eaa2a36f8d5.zip Qt-88b9c6eb3f1dde9997d5e824450c9eaa2a36f8d5.tar.gz Qt-88b9c6eb3f1dde9997d5e824450c9eaa2a36f8d5.tar.bz2 |
Don't crash via proxy model when moving QModelIndexes
The layoutAboutToBeChanged signal gives proxies a chance to
persist QModelIndexes. The d->itemsAboutToBeMoved method is part of
the process of moving the persistent indexes. d->itemsAboutToBeMoved
must be called after layoutAboutToBeChanged. Otherwise persistent indexes
will not be updated.
Merge-request: 2219
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
Diffstat (limited to 'tests/auto/qabstractitemmodel')
-rw-r--r-- | tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp | 21 |
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"); |