diff options
Diffstat (limited to 'src/core/aspects/qaspectmanager.cpp')
-rw-r--r-- | src/core/aspects/qaspectmanager.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp index 80faef768..01441df53 100644 --- a/src/core/aspects/qaspectmanager.cpp +++ b/src/core/aspects/qaspectmanager.cpp @@ -130,15 +130,6 @@ void QAspectManager::setRootEntity(Qt3DCore::QEntity *root) } } -// Should be called after aspects are registered -void QAspectManager::setData(const QVariantMap &data) -{ - qCDebug(Aspects) << Q_FUNC_INFO; - m_data = data; - Q_FOREACH (QAbstractAspect *aspect, m_aspects) - aspect->onInitialize(m_data); -} - /*! * Registers a new \a aspect. */ @@ -153,7 +144,8 @@ void QAspectManager::registerAspect(QAbstractAspect *aspect) QAbstractAspectPrivate::get(aspect)->m_arbiter = m_changeArbiter; // Register sceneObserver with the QChangeArbiter m_changeArbiter->registerSceneObserver(aspect->d_func()); - aspect->onInitialize(m_data); + // Initialize the aspect in the main thread + aspect->onInitialize(); } else { qCWarning(Aspects) << "Failed to register aspect"; @@ -161,11 +153,6 @@ void QAspectManager::registerAspect(QAbstractAspect *aspect) qCDebug(Aspects) << "Completed registering aspect"; } -QVariantMap QAspectManager::data() const -{ - return m_data; -} - void QAspectManager::exec() { // Gentlemen, start your engines |