diff options
Diffstat (limited to 'src/render/frontend/framegraph-components')
4 files changed, 8 insertions, 8 deletions
diff --git a/src/render/frontend/framegraph-components/qcameraselector.cpp b/src/render/frontend/framegraph-components/qcameraselector.cpp index 09b887405..1db35b0a3 100644 --- a/src/render/frontend/framegraph-components/qcameraselector.cpp +++ b/src/render/frontend/framegraph-components/qcameraselector.cpp @@ -41,7 +41,7 @@ #include "qcameraselector.h" #include "qcameraselector_p.h" -#include <Qt3DCore/entity.h> +#include <Qt3DCore/qentity.h> #include <Qt3DCore/qscenepropertychange.h> QT_BEGIN_NAMESPACE @@ -62,7 +62,7 @@ QCameraSelector::QCameraSelector(Qt3D::QNode *parent) : QFrameGraphItem(*new QCameraSelectorPrivate(this), parent) {} -void QCameraSelector::setCamera(Entity *camera) +void QCameraSelector::setCamera(QEntity *camera) { Q_D(QCameraSelector); if (d->m_camera != camera) { @@ -75,7 +75,7 @@ void QCameraSelector::setCamera(Entity *camera) } } -Entity *QCameraSelector::camera() const +QEntity *QCameraSelector::camera() const { Q_D(const QCameraSelector); return d->m_camera; diff --git a/src/render/frontend/framegraph-components/qcameraselector.h b/src/render/frontend/framegraph-components/qcameraselector.h index 803f38904..f292590b2 100644 --- a/src/render/frontend/framegraph-components/qcameraselector.h +++ b/src/render/frontend/framegraph-components/qcameraselector.h @@ -55,13 +55,13 @@ class QCameraSelectorPrivate; class QT3DRENDERERSHARED_EXPORT QCameraSelector : public QFrameGraphItem { Q_OBJECT - Q_PROPERTY(Qt3D::Entity *camera READ camera WRITE setCamera NOTIFY cameraChanged) + Q_PROPERTY(Qt3D::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) public: explicit QCameraSelector(QNode *parent = 0); - void setCamera(Entity *camera); - Entity *camera() const; + void setCamera(QEntity *camera); + QEntity *camera() const; Q_SIGNALS: void cameraChanged(); diff --git a/src/render/frontend/framegraph-components/qcameraselector_p.h b/src/render/frontend/framegraph-components/qcameraselector_p.h index 2016ab9f0..e79697a65 100644 --- a/src/render/frontend/framegraph-components/qcameraselector_p.h +++ b/src/render/frontend/framegraph-components/qcameraselector_p.h @@ -56,7 +56,7 @@ public: QCameraSelectorPrivate(QCameraSelector *qq); Q_DECLARE_PUBLIC(QCameraSelector) - Entity *m_camera; + QEntity *m_camera; }; diff --git a/src/render/frontend/framegraph-components/qframegraph.cpp b/src/render/frontend/framegraph-components/qframegraph.cpp index f509a64f1..30dff26ef 100644 --- a/src/render/frontend/framegraph-components/qframegraph.cpp +++ b/src/render/frontend/framegraph-components/qframegraph.cpp @@ -41,7 +41,7 @@ #include "qframegraph.h" #include "qframegraph_p.h" -#include <Qt3DCore/entity.h> +#include <Qt3DCore/qentity.h> QT_BEGIN_NAMESPACE |