diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-08-31 15:14:17 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-13 07:15:15 +0000 |
commit | af40840eedf35404ba4b39e890c158e2328ff6ec (patch) | |
tree | ce4ac1f925c34b56704c99bd332e0436e68dbecc /examples/qt3d/assimp/main.cpp | |
parent | 0269afd106da5d4d999585b3bdb1332a2c01af12 (diff) |
Move Render aspect into the Qt3DRender namespace
Updated examples and tests accordingly.
Change-Id: I8848a88472de2302aa072fa11f21ea934672b7e6
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/assimp/main.cpp')
-rw-r--r-- | examples/qt3d/assimp/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/qt3d/assimp/main.cpp b/examples/qt3d/assimp/main.cpp index 651766019..729250c13 100644 --- a/examples/qt3d/assimp/main.cpp +++ b/examples/qt3d/assimp/main.cpp @@ -49,11 +49,11 @@ class SceneHelper : public QObject Q_OBJECT public: - Q_INVOKABLE QObject *findEntity(Qt3D::QSceneLoader *loader, const QString &name); + Q_INVOKABLE QObject *findEntity(Qt3DRender::QSceneLoader *loader, const QString &name); Q_INVOKABLE void addListEntry(const QVariant &list, QObject *entry); }; -QObject *SceneHelper::findEntity(Qt3D::QSceneLoader *loader, const QString &name) +QObject *SceneHelper::findEntity(Qt3DRender::QSceneLoader *loader, const QString &name) { // The QSceneLoader instance is a component of an entity. The loaded scene // tree is added under this entity. @@ -83,7 +83,7 @@ int main(int argc, char* argv[]) Window view; Qt3D::Quick::QQmlAspectEngine engine; - engine.aspectEngine()->registerAspect(new Qt3D::QRenderAspect()); + engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); QVariantMap data; data.insert(QStringLiteral("surface"), QVariant::fromValue(static_cast<QSurface *>(&view))); |