diff options
Diffstat (limited to 'examples/qt3d/materials-cpp')
-rw-r--r-- | examples/qt3d/materials-cpp/barrel.h | 4 | ||||
-rw-r--r-- | examples/qt3d/materials-cpp/houseplant.cpp | 2 | ||||
-rw-r--r-- | examples/qt3d/materials-cpp/main.cpp | 12 | ||||
-rw-r--r-- | examples/qt3d/materials-cpp/materials-cpp.pro | 2 | ||||
-rw-r--r-- | examples/qt3d/materials-cpp/planeentity.cpp | 2 | ||||
-rw-r--r-- | examples/qt3d/materials-cpp/planeentity.h | 2 | ||||
-rw-r--r-- | examples/qt3d/materials-cpp/renderableentity.h | 2 | ||||
-rw-r--r-- | examples/qt3d/materials-cpp/trefoilknot.h | 2 |
8 files changed, 14 insertions, 14 deletions
diff --git a/examples/qt3d/materials-cpp/barrel.h b/examples/qt3d/materials-cpp/barrel.h index c439d1a85..f4ba576bc 100644 --- a/examples/qt3d/materials-cpp/barrel.h +++ b/examples/qt3d/materials-cpp/barrel.h @@ -37,8 +37,8 @@ #ifndef BARREL_H #define BARREL_H -#include <Qt3DRenderer/QNormalDiffuseSpecularMapMaterial> -#include <Qt3DRenderer/qtexture.h> +#include <Qt3DRender/QNormalDiffuseSpecularMapMaterial> +#include <Qt3DRender/qtexture.h> #include "renderableentity.h" class Barrel : public RenderableEntity diff --git a/examples/qt3d/materials-cpp/houseplant.cpp b/examples/qt3d/materials-cpp/houseplant.cpp index 81d0ab0d2..55ee27c2c 100644 --- a/examples/qt3d/materials-cpp/houseplant.cpp +++ b/examples/qt3d/materials-cpp/houseplant.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "houseplant.h" -#include <Qt3DRenderer/qtexture.h> +#include <Qt3DRender/qtexture.h> const char *potNames[] = { "cross", diff --git a/examples/qt3d/materials-cpp/main.cpp b/examples/qt3d/materials-cpp/main.cpp index b2e08b7fa..41fcf563e 100644 --- a/examples/qt3d/materials-cpp/main.cpp +++ b/examples/qt3d/materials-cpp/main.cpp @@ -43,12 +43,12 @@ #include <Qt3DInput/QInputAspect> -#include <Qt3DRenderer/QRenderAspect> -#include <Qt3DRenderer/QPhongMaterial> -#include <Qt3DRenderer/QDiffuseMapMaterial> -#include <Qt3DRenderer/QForwardRenderer> -#include <Qt3DRenderer/QFrameGraph> -#include <Qt3DRenderer/QTextureImage> +#include <Qt3DRender/QRenderAspect> +#include <Qt3DRender/QPhongMaterial> +#include <Qt3DRender/QDiffuseMapMaterial> +#include <Qt3DRender/QForwardRenderer> +#include <Qt3DRender/QFrameGraph> +#include <Qt3DRender/QTextureImage> #include "planeentity.h" #include "rotatingtrefoilknot.h" diff --git a/examples/qt3d/materials-cpp/materials-cpp.pro b/examples/qt3d/materials-cpp/materials-cpp.pro index 47dee515d..8cdffd313 100644 --- a/examples/qt3d/materials-cpp/materials-cpp.pro +++ b/examples/qt3d/materials-cpp/materials-cpp.pro @@ -2,7 +2,7 @@ error( "Couldn't find the examples.pri file!" ) } -QT += 3dcore 3drenderer 3dinput +QT += 3dcore 3drender 3dinput HEADERS += \ planeentity.h \ diff --git a/examples/qt3d/materials-cpp/planeentity.cpp b/examples/qt3d/materials-cpp/planeentity.cpp index b8a400232..5faa2186e 100644 --- a/examples/qt3d/materials-cpp/planeentity.cpp +++ b/examples/qt3d/materials-cpp/planeentity.cpp @@ -36,7 +36,7 @@ #include "planeentity.h" -#include <Qt3DRenderer/QPlaneMesh> +#include <Qt3DRender/QPlaneMesh> #include <Qt3DCore/QTransform> #include <Qt3DCore/QScaleTransform> #include <Qt3DCore/QTranslateTransform> diff --git a/examples/qt3d/materials-cpp/planeentity.h b/examples/qt3d/materials-cpp/planeentity.h index 1b6f49d69..83f6b0213 100644 --- a/examples/qt3d/materials-cpp/planeentity.h +++ b/examples/qt3d/materials-cpp/planeentity.h @@ -41,7 +41,7 @@ #include <Qt3DCore/QTransform> #include <Qt3DCore/QScaleTransform> #include <Qt3DCore/QTranslateTransform> -#include <Qt3DRenderer/QPlaneMesh> +#include <Qt3DRender/QPlaneMesh> class PlaneEntity : public Qt3DCore::QEntity { diff --git a/examples/qt3d/materials-cpp/renderableentity.h b/examples/qt3d/materials-cpp/renderableentity.h index 4a6397f9d..8d0b75215 100644 --- a/examples/qt3d/materials-cpp/renderableentity.h +++ b/examples/qt3d/materials-cpp/renderableentity.h @@ -42,7 +42,7 @@ #include <Qt3DCore/QScaleTransform> #include <Qt3DCore/QRotateTransform> #include <Qt3DCore/QTranslateTransform> -#include <Qt3DRenderer/QMesh> +#include <Qt3DRender/QMesh> class RenderableEntity : public Qt3DCore::QEntity { diff --git a/examples/qt3d/materials-cpp/trefoilknot.h b/examples/qt3d/materials-cpp/trefoilknot.h index bac6e59b0..1ffd1baf1 100644 --- a/examples/qt3d/materials-cpp/trefoilknot.h +++ b/examples/qt3d/materials-cpp/trefoilknot.h @@ -42,7 +42,7 @@ #include <Qt3DCore/QScaleTransform> #include <Qt3DCore/QRotateTransform> #include <Qt3DCore/QTranslateTransform> -#include <Qt3DRenderer/QMesh> +#include <Qt3DRender/QMesh> class TrefoilKnot : public Qt3DCore::QEntity { |