diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-10-12 20:45:19 +0100 |
---|---|---|
committer | Paul Lemire <paul.lemire@kdab.com> | 2015-10-13 13:19:50 +0000 |
commit | 7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 (patch) | |
tree | 53197a9e5eb7501d6f5b497f70c25dad9c265a6f /src/quick3d/imports/scene3d/scene3ditem_p.h | |
parent | 0bfd20ad3b8eb3edec8d6317af9eb5504f8c0871 (diff) |
Move Qt3DCore into Qt3DCore namespace
Update other aspects, tests and examples accordingly.
Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/quick3d/imports/scene3d/scene3ditem_p.h')
-rw-r--r-- | src/quick3d/imports/scene3d/scene3ditem_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick3d/imports/scene3d/scene3ditem_p.h b/src/quick3d/imports/scene3d/scene3ditem_p.h index 1f0eaafc1..301af9022 100644 --- a/src/quick3d/imports/scene3d/scene3ditem_p.h +++ b/src/quick3d/imports/scene3d/scene3ditem_p.h @@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE -namespace Qt3D { +namespace Qt3DCore { class QAspectEngine; class QEntity; } @@ -55,7 +55,7 @@ class Scene3DCleaner; class Scene3DItem : public QQuickItem { Q_OBJECT - Q_PROPERTY(Qt3D::QEntity* entity READ entity WRITE setEntity NOTIFY entityChanged) + Q_PROPERTY(Qt3DCore::QEntity* entity READ entity WRITE setEntity NOTIFY entityChanged) Q_PROPERTY(QStringList aspects READ aspects WRITE setAspects NOTIFY aspectsChanged) Q_PROPERTY(bool multisample READ multisample WRITE setMultisample NOTIFY multisampleChanged) Q_CLASSINFO("DefaultProperty", "entity") @@ -64,14 +64,14 @@ public: ~Scene3DItem(); QStringList aspects() const; - Qt3D::QEntity *entity() const; + Qt3DCore::QEntity *entity() const; bool multisample() const; void setMultisample(bool enable); public Q_SLOTS: void setAspects(const QStringList &aspects); - void setEntity(Qt3D::QEntity *entity); + void setEntity(Qt3DCore::QEntity *entity); Q_SIGNALS: void aspectsChanged(); @@ -85,9 +85,9 @@ private: QSGNode *updatePaintNode(QSGNode *node, UpdatePaintNodeData *nodeData) Q_DECL_OVERRIDE; QStringList m_aspects; - Qt3D::QEntity *m_entity; + Qt3DCore::QEntity *m_entity; - Qt3D::QAspectEngine *m_aspectEngine; + Qt3DCore::QAspectEngine *m_aspectEngine; QRenderAspect *m_renderAspect; Scene3DRenderer *m_renderer; Scene3DCleaner *m_rendererCleaner; |