diff options
| author | Andreas Hartmetz <andreas.hartmetz@kdab.com> | 2014-08-28 20:23:11 +0200 |
|---|---|---|
| committer | Andreas Hartmetz <ahartmetz@gmail.com> | 2014-09-03 21:35:08 +0200 |
| commit | 8e720177ef18d471c8ffa455750fdcd375d7a8da (patch) | |
| tree | 203eacfc2a01d9d7eb2d87476cee7a60824fab30 /src/gui/itemviews | |
| parent | 997d626173d9aba5b01b35e4d95ad162771ba789 (diff) | |
Don't call virtual methods after the source model is destroyed.
Calling clear_mapping causes the persistent indexes to be queried, and
mapped using map_to_source, so that they can be restored later. That
is not the appropriate response to the source model being deleted
because there won't be anything to restore.
Simply clear the stored mapping information instead so that the source model
actually exists when mapToSource is called by the framework.
Backport of 722798a359761a1eb635d18547b076615f192508 from qt5/qtbase
Change-Id: I9c74f97855046b968dfba7a35134c234b974e63b
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/gui/itemviews')
| -rw-r--r-- | src/gui/itemviews/qabstractproxymodel.cpp | 1 | ||||
| -rw-r--r-- | src/gui/itemviews/qsortfilterproxymodel.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/itemviews/qabstractproxymodel.cpp b/src/gui/itemviews/qabstractproxymodel.cpp index b2a936ad26..7c239b292d 100644 --- a/src/gui/itemviews/qabstractproxymodel.cpp +++ b/src/gui/itemviews/qabstractproxymodel.cpp @@ -84,6 +84,7 @@ QT_BEGIN_NAMESPACE //detects the deletion of the source model void QAbstractProxyModelPrivate::_q_sourceModelDestroyed() { + invalidatePersistentIndexes(); model = QAbstractItemModelPrivate::staticEmptyModel(); } diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp index 7e2faeb5ca..45433e289a 100644 --- a/src/gui/itemviews/qsortfilterproxymodel.cpp +++ b/src/gui/itemviews/qsortfilterproxymodel.cpp @@ -281,7 +281,8 @@ typedef QHash<QModelIndex, QSortFilterProxyModelPrivate::Mapping *> IndexMap; void QSortFilterProxyModelPrivate::_q_sourceModelDestroyed() { QAbstractProxyModelPrivate::_q_sourceModelDestroyed(); - _q_clearMapping(); + qDeleteAll(source_index_mapping); + source_index_mapping.clear(); } void QSortFilterProxyModelPrivate::remove_from_mapping(const QModelIndex &source_parent) |