diff options
| -rw-r--r-- | src/qmlmodels/qqmldelegatemodel.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp index cee096035a..6e73894d41 100644 --- a/src/qmlmodels/qqmldelegatemodel.cpp +++ b/src/qmlmodels/qqmldelegatemodel.cpp @@ -1714,6 +1714,10 @@ void QQmlDelegateModel::_q_itemsRemoved(int index, int count) d->m_count -= count; const QList<QQmlDelegateModelItem *> cache = d->m_cache; + //Prevents items being deleted in remove loop + for (QQmlDelegateModelItem *item : cache) + item->referenceObject(); + for (int i = 0, c = cache.count(); i < c; ++i) { QQmlDelegateModelItem *item = cache.at(i); // layout change triggered by removal of a previous item might have @@ -1730,6 +1734,9 @@ void QQmlDelegateModel::_q_itemsRemoved(int index, int count) item->setModelIndex(-1, -1, -1); } } + //Release items which are referenced before the loop + for (QQmlDelegateModelItem *item : cache) + item->releaseObject(); QVector<Compositor::Remove> removes; d->m_compositor.listItemsRemoved(&d->m_adaptorModel, index, count, &removes); |