Fix QQuickViewChangeListener

QQuickViewChangeListener wasn't cleaning up its ancestor listeners
properly. QQuickItemChangeListener::itemChildRemoved() is too late
for removing listeners of the _ancestors_ of the child that just
got removed.

Task-number: QTBUG-55127
Change-Id: I004a5dd0b49fa36baabf951ee41d8a9ccdef4da8
Reviewed-by: Christian Stromme <christian.stromme@qt.io>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/webview/qquickviewcontroller.cpp b/src/webview/qquickviewcontroller.cpp
index 0295d1f..ab9e254 100644
--- a/src/webview/qquickviewcontroller.cpp
+++ b/src/webview/qquickviewcontroller.cpp
@@ -99,14 +99,14 @@ void QQuickViewChangeListener::itemChildRemoved(QQuickItem *item, QQuickItem *ch
     Q_UNUSED(item)
     Q_ASSERT(item != m_item);
 
-    const bool ancestor = isAncestor(child);
+    const bool remove = (child == m_item) || isAncestor(child);
 
-    // if the child isn't an ancestor of the view item, then we don't care.
-    if (!ancestor)
+    // if the child isn't the view item or its ancestor, then we don't care.
+    if (!remove)
         return;
 
     // Remove any listener we attached to the child and its ancestors.
-    removeAncestorListeners(child, changeMask);
+    removeAncestorListeners(item, changeMask);
 }
 
 void QQuickViewChangeListener::itemParentChanged(QQuickItem * /*item*/, QQuickItem *newParent)