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 /examples/qt3d/assimp/main.cpp | |
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 'examples/qt3d/assimp/main.cpp')
-rw-r--r-- | examples/qt3d/assimp/main.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/examples/qt3d/assimp/main.cpp b/examples/qt3d/assimp/main.cpp index 729250c13..e8389bf33 100644 --- a/examples/qt3d/assimp/main.cpp +++ b/examples/qt3d/assimp/main.cpp @@ -57,17 +57,17 @@ QObject *SceneHelper::findEntity(Qt3DRender::QSceneLoader *loader, const QString { // The QSceneLoader instance is a component of an entity. The loaded scene // tree is added under this entity. - QVector<Qt3D::QEntity *> entities = loader->entities(); + QVector<Qt3DCore::QEntity *> entities = loader->entities(); if (entities.isEmpty()) return 0; // Technically there could be multiple entities referencing the scene loader // but sharing is discouraged, and in our case there will be one anyhow. - Qt3D::QEntity *root = entities[0]; + Qt3DCore::QEntity *root = entities[0]; // The scene structure and names always depend on the asset. - return root->findChild<Qt3D::QEntity *>(name); + return root->findChild<Qt3DCore::QEntity *>(name); } void SceneHelper::addListEntry(const QVariant &list, QObject *entry) @@ -81,7 +81,7 @@ int main(int argc, char* argv[]) QGuiApplication app(argc, argv); Window view; - Qt3D::Quick::QQmlAspectEngine engine; + Qt3DCore::Quick::QQmlAspectEngine engine; engine.aspectEngine()->registerAspect(new Qt3DRender::QRenderAspect()); engine.aspectEngine()->registerAspect(new Qt3DInput::QInputAspect()); |