Node bookkeeping fix: clear table of connection in QNode dtor

Clearing it in the QNodePrivate dtor is actually too late, this needs to
happen before QNode::destroyed is emitted.

Task-number: QTBUG-53456
Change-Id: I4141b51c3576a348fa4c82a2a4e7806d8b545ab0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp
index 871eaed39..c26a4ca2a 100644
--- a/src/core/nodes/qnode.cpp
+++ b/src/core/nodes/qnode.cpp
@@ -79,10 +79,6 @@ QNodePrivate::QNodePrivate()
 
 QNodePrivate::~QNodePrivate()
 {
-    // Disconnect each connection that was stored
-    for (auto it = m_destructionConnections.begin(), end = m_destructionConnections.end(); it != end; ++it)
-        QObject::disconnect(it.value());
-    m_destructionConnections.clear();
 }
 
 void QNodePrivate::init(QNode *parent)
@@ -639,10 +635,16 @@ QNode::QNode(QNodePrivate &dd, QNode *parent)
 
 QNode::~QNode()
 {
+    Q_D(QNode);
+    // Disconnect each connection that was stored
+    for (auto it = d->m_destructionConnections.begin(), end = d->m_destructionConnections.end(); it != end; ++it)
+        QObject::disconnect(it.value());
+    d->m_destructionConnections.clear();
+
+    Q_EMIT nodeDestroyed();
+
     // Notify the backend that the parent lost this node as a child and
     // that this node is being destroyed.
-    Q_EMIT nodeDestroyed();
-    Q_D(QNode);
     d->notifyDestructionChangesAndRemoveFromScene();
 }