aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmlmodels
diff options
context:
space:
mode:
authorMaximilian Goldstein <max.goldstein@qt.io>2021-01-08 11:58:55 +0100
committerMaximilian Goldstein <max.goldstein@qt.io>2021-01-11 15:22:00 +0100
commit8a3ede5ba1daf2d9314d71db972175b2791456c0 (patch)
tree2d48e36b27779911a5b41c24cb9142bfa859a4a5 /src/qmlmodels
parent30136b1a82bfc54459741483e76f2f70c937dedd (diff)
Fix warning and assert when removing items from groups
When removing items from groups actively shown by a model filter a warning and assert was triggered in the past. This change fixes this behavior. Fixes: QTBUG-86017 Change-Id: I49b7498a3d03141b654e453a3c35a43fc7ba804a Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qmlmodels')
-rw-r--r--src/qmlmodels/qqmldelegatemodel.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qmlmodels/qqmldelegatemodel.cpp b/src/qmlmodels/qqmldelegatemodel.cpp
index 303ca0e2e4..838a0e18e2 100644
--- a/src/qmlmodels/qqmldelegatemodel.cpp
+++ b/src/qmlmodels/qqmldelegatemodel.cpp
@@ -1340,6 +1340,8 @@ QObject *QQmlDelegateModel::object(int index, QQmlIncubator::IncubationMode incu
QQmlIncubator::Status QQmlDelegateModel::incubationStatus(int index)
{
Q_D(QQmlDelegateModel);
+ if (d->m_compositor.count(d->m_compositorGroup) <= index)
+ return QQmlIncubator::Null;
Compositor::iterator it = d->m_compositor.find(d->m_compositorGroup, index);
if (!it->inCache())
return QQmlIncubator::Null;