diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-04-11 14:58:17 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-04-23 11:14:30 +0000 |
| commit | 0542f1614aa6d50c4c9809fb0ce5f1adb5666d67 (patch) | |
| tree | 77a1ed41c16262f5cc7aa9ddb2d66d3f9b61a719 /examples/qt3d/basicshapes-cpp/scenemodifier.h | |
| parent | 8677f62fa690efa29fbb6f870af1ea2b4e7111cf (diff) | |
Move defaults and geometries out of Qt3DRender and into Qt3DExtras
QBoundingVolumeDebug has been disabled for now. Will be re-enabled later on.
Change-Id: Id6b0abab2ec2aa697330bd20d782f9d104d25d50
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/qt3d/basicshapes-cpp/scenemodifier.h')
| -rw-r--r-- | examples/qt3d/basicshapes-cpp/scenemodifier.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/examples/qt3d/basicshapes-cpp/scenemodifier.h b/examples/qt3d/basicshapes-cpp/scenemodifier.h index fed79a433..2d33ec95e 100644 --- a/examples/qt3d/basicshapes-cpp/scenemodifier.h +++ b/examples/qt3d/basicshapes-cpp/scenemodifier.h @@ -56,13 +56,13 @@ #include <Qt3DCore/qentity.h> #include <Qt3DCore/qtransform.h> -#include <Qt3DRender/QTorusMesh> -#include <Qt3DRender/QConeMesh> -#include <Qt3DRender/QCylinderMesh> -#include <Qt3DRender/QCuboidMesh> -#include <Qt3DRender/QPlaneMesh> -#include <Qt3DRender/QSphereMesh> -#include <Qt3DRender/QPhongMaterial> +#include <Qt3DExtras/QTorusMesh> +#include <Qt3DExtras/QConeMesh> +#include <Qt3DExtras/QCylinderMesh> +#include <Qt3DExtras/QCuboidMesh> +#include <Qt3DExtras/QPlaneMesh> +#include <Qt3DExtras/QSphereMesh> +#include <Qt3DExtras/QPhongMaterial> class SceneModifier : public QObject { @@ -82,7 +82,7 @@ public slots: private: Qt3DCore::QEntity *m_rootEntity; - Qt3DRender::QTorusMesh *m_torus; + Qt3DExtras::QTorusMesh *m_torus; Qt3DCore::QEntity *m_coneEntity; Qt3DCore::QEntity *m_cylinderEntity; Qt3DCore::QEntity *m_torusEntity; |