summaryrefslogtreecommitdiffstats
path: root/src/quick3d/imports/scene3d
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-10-23 11:16:19 +0200
committerSean Harmer <sean.harmer@kdab.com>2015-10-24 16:36:33 +0000
commit6e400dec50cf0485f426f6fb5dc7c7eedd05ed92 (patch)
treecbd102b18f8e39a1e26cbcaecc9f8007064121d8 /src/quick3d/imports/scene3d
parentfee0c31d0864c49814b740d34bf5f35b21aea795 (diff)
Scene3D: register event source in the correct thread
Change-Id: Ie921b337fcf891a189c626fc300ffe8bc4b3e235 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports/scene3d')
-rw-r--r--src/quick3d/imports/scene3d/scene3ditem.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp
index 70866e385..32264d4b3 100644
--- a/src/quick3d/imports/scene3d/scene3ditem.cpp
+++ b/src/quick3d/imports/scene3d/scene3ditem.cpp
@@ -169,7 +169,6 @@ public:
QVariantMap data;
data.insert(QStringLiteral("surface"), QVariant::fromValue(saver.surface()));
- data.insert(QStringLiteral("eventSource"), QVariant::fromValue(m_item));
m_aspectEngine->setData(data);
m_renderAspect->renderInitialize(saver.context());
@@ -473,6 +472,11 @@ Scene3DItem::Scene3DItem(QQuickItem *parent)
setAcceptedMouseButtons(Qt::MouseButtonMask);
setAcceptHoverEvents(true);
+ // We need to register the event source in the main thread
+ QVariantMap data;
+ data.insert(QStringLiteral("eventSource"), QVariant::fromValue(this));
+ m_aspectEngine->setData(data);
+
m_aspectEngine->registerAspect(m_renderAspect);
m_aspectEngine->initialize();
}