Take a copy of the children list before emitting the destroyingItem signal

clear() emits a signal for each item that is being destroyed. Unfortunately
that signal can be connected to some other place that already removes
the item indirectly. In that case, we would not correctly emit the
destroyed signal for all items, leading to errors later on.

Fixes a test failure in Qt Quick Controls 2

Change-Id: I3aff75d9263badd9f87883610c7a00a94ee823d3
Reviewed-by: Simon Hausmann <[email protected]>

1 files changed, 4 insertions, 1 deletions

diff --git a/src/qmlmodels/qqmlobjectmodel.cpp b/src/qmlmodels/qqmlobjectmodel.cpp
index c833206525..8e7b0a9b5f 100644
--- a/src/qmlmodels/qqmlobjectmodel.cpp
+++ b/src/qmlmodels/qqmlobjectmodel.cpp
@@ -154,7 +154,8 @@ public:
 
     void clear() {
         Q_Q(QQmlObjectModel);
-        for (const Item &child : qAsConst(children))
+        const auto copy = children;
+        for (const Item &child : copy)
             emit q->destroyingItem(child.item);
         remove(0, children.count());
     }
@@ -170,6 +171,8 @@ public:
     QList<Item> children;
 };
 
+Q_DECLARE_TYPEINFO(QQmlObjectModelPrivate::Item, Q_PRIMITIVE_TYPE);
+
 
 /*!
     \qmltype ObjectModel