Remove QAbstractAspect::setRootEntity

We switch to a more resilient private virtual instead.

Change-Id: I90710c7873571ca0a40f7cc939282344b20a59f0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

2 files changed, 3 insertions, 5 deletions

diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index daa698e72..01f31e566 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -401,12 +401,10 @@ qint64 QRenderAspect::time() const
     return d->m_time;
 }
 
-void QRenderAspect::setRootEntity(Qt3DCore::QEntity *rootObject)
+void QRenderAspect::onRootEntityChanged(Qt3DCore::QEntity *rootEntity)
 {
-    QAbstractAspect::setRootEntity(rootObject);
-
     Q_D(QRenderAspect);
-    d->m_renderer->setSceneRoot(d->m_renderer->nodeManagers()->lookupResource<Render::Entity, Render::EntityManager>(rootObject->id()));
+    d->m_renderer->setSceneRoot(d->m_renderer->nodeManagers()->lookupResource<Render::Entity, Render::EntityManager>(rootEntity->id()));
 }
 
 void QRenderAspect::onInitialize(const QVariantMap &data)
diff --git a/src/render/frontend/qrenderaspect.h b/src/render/frontend/qrenderaspect.h
index e77c5a1c5..99e44562e 100644
--- a/src/render/frontend/qrenderaspect.h
+++ b/src/render/frontend/qrenderaspect.h
@@ -77,7 +77,7 @@ protected:
     QRenderAspect(QRenderAspectPrivate &dd, QObject *parent);
     Q_DECLARE_PRIVATE(QRenderAspect)
 
-    void setRootEntity(Qt3DCore::QEntity *rootObject) Q_DECL_OVERRIDE;
+    void onRootEntityChanged(Qt3DCore::QEntity *rootObject) Q_DECL_OVERRIDE;
     void onInitialize(const QVariantMap &data) Q_DECL_OVERRIDE;
     void onCleanup() Q_DECL_OVERRIDE;