ChangeArbiter/SceneChange: use id as change subject

Instead of having a QNode* or QObservable as the subject of a change, we use
it's unique NodeId instead. That will prevent the ChangeArbiter from trying to
distribute changes by looking at a QNode/QObservable id when the
QNode/QObservable might have been destroyed in the meantime.

Change-Id: Ia419d5b841434fd65522c8c65de552089cfe97cf
Task-number: QTBUG-44628
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp
index c4b6088e6..4de2f85a5 100644
--- a/src/core/nodes/qnode.cpp
+++ b/src/core/nodes/qnode.cpp
@@ -82,8 +82,7 @@ void QNodePrivate::addChild(QNode *childNode)
 
     // We notify only if we have a QChangeArbiter
     if (m_changeArbiter != Q_NULLPTR) {
-        Q_Q(QNode);
-        QScenePropertyChangePtr e(new QScenePropertyChange(NodeCreated, q));
+        QScenePropertyChangePtr e(new QScenePropertyChange(NodeCreated, QSceneChange::Node, m_id));
         e->setPropertyName("node");
         // We need to clone the parent of the childNode we send
         QNode *parentClone = QNode::clone(q_func());
@@ -109,8 +108,7 @@ void QNodePrivate::removeChild(QNode *childNode)
 
     // Notify only if child isn't a clone
     if (m_changeArbiter != Q_NULLPTR) {
-        Q_Q(QNode);
-        QScenePropertyChangePtr e(new QScenePropertyChange(NodeAboutToBeDeleted, q));
+        QScenePropertyChangePtr e(new QScenePropertyChange(NodeAboutToBeDeleted, QSceneChange::Node, m_id));
         e->setPropertyName("node");
         // We need to clone the parent of the childNode we send
         //        QNode *parentClone = QNode::clone(childNode->parentNode());
@@ -229,8 +227,7 @@ void QNodePrivate::notifyPropertyChange(const char *name, const QVariant &value)
     if (m_blockNotifications)
         return;
 
-    Q_Q(QNode);
-    QScenePropertyChangePtr e(new QScenePropertyChange(NodeUpdated, q));
+    QScenePropertyChangePtr e(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, m_id));
     e->setPropertyName(name);
     e->setValue(value);
     notifyObservers(e);