Merge remote-tracking branch 'origin/5.5' into dev

Conflicts:
	src/core/doc/qt3dcore.qdocconf

Change-Id: I3e0b4288daf6be5cd0d274ab34223e7a9ea2ec18

1 files changed, 4 insertions, 4 deletions

diff --git a/src/core/nodes/qcomponent.cpp b/src/core/nodes/qcomponent.cpp
index da4b38799..815775e5b 100644
--- a/src/core/nodes/qcomponent.cpp
+++ b/src/core/nodes/qcomponent.cpp
@@ -59,8 +59,8 @@ void QComponentPrivate::addEntity(QEntity *entity)
     // We notify only if we have a QChangeArbiter
     if (m_changeArbiter != Q_NULLPTR) {
         Q_Q(QComponent);
-        QScenePropertyChangePtr e(new QScenePropertyChange(ComponentAdded, q));
-        e->setPropertyName(QByteArrayLiteral("entity"));
+        QScenePropertyChangePtr e(new QScenePropertyChange(ComponentAdded, QSceneChange::Node, q->id()));
+        e->setPropertyName("entity");
         e->setValue(QVariant::fromValue(entity->id()));
         notifyObservers(e);
     }
@@ -71,8 +71,8 @@ void QComponentPrivate::removeEntity(QEntity *entity)
     // We notify only if we have a QChangeArbiter
     if (m_changeArbiter != Q_NULLPTR) {
         Q_Q(QComponent);
-        QScenePropertyChangePtr e(new QScenePropertyChange(ComponentRemoved, q));
-        e->setPropertyName(QByteArrayLiteral("entity"));
+        QScenePropertyChangePtr e(new QScenePropertyChange(ComponentRemoved, QSceneChange::Node, q->id()));
+        e->setPropertyName("entity");
         e->setValue(QVariant::fromValue(entity->id()));
         notifyObservers(e);
     }