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>

1 files changed, 1 insertions, 1 deletions

diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/kernel/qabstractitemmodel.cpp
index 10a61ca..9335085 100644
--- a/src/corelib/kernel/qabstractitemmodel.cpp
+++ b/src/corelib/kernel/qabstractitemmodel.cpp
@@ -2546,9 +2546,9 @@ bool QAbstractItemModel::beginMoveRows(const QModelIndex &sourceParent, int sour
     int destinationLast = destinationChild + (sourceLast - sourceFirst);
     d->changes.push(QAbstractItemModelPrivate::Change(destinationParent, destinationChild, destinationLast));
 
-    d->itemsAboutToBeMoved(sourceParent, sourceFirst, sourceLast, destinationParent, destinationChild, Qt::Vertical);
     emit rowsAboutToBeMoved(sourceParent, sourceFirst, sourceLast, destinationParent, destinationChild);
     emit layoutAboutToBeChanged();
+    d->itemsAboutToBeMoved(sourceParent, sourceFirst, sourceLast, destinationParent, destinationChild, Qt::Vertical);
     return true;
 }