From 7c971e0e7791ab38d7d3d8ebc25468c44cbe49c5 Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Mon, 12 Oct 2015 20:45:19 +0100 Subject: Move Qt3DCore into Qt3DCore namespace Update other aspects, tests and examples accordingly. Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317 Reviewed-by: Paul Lemire --- src/render/framegraph/qframegraph.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/render/framegraph/qframegraph.h') diff --git a/src/render/framegraph/qframegraph.h b/src/render/framegraph/qframegraph.h index 2a32a95f6..0b720ea72 100644 --- a/src/render/framegraph/qframegraph.h +++ b/src/render/framegraph/qframegraph.h @@ -47,7 +47,7 @@ namespace Qt3DRender { class QFrameGraphPrivate; class QFrameGraphNode; -class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3D::QComponent +class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3DCore::QComponent { Q_OBJECT // Note : The full namespace has to be used to define the property @@ -56,7 +56,7 @@ class QT3DRENDERERSHARED_EXPORT QFrameGraph : public Qt3D::QComponent Q_CLASSINFO("DefaultProperty", "activeFrameGraph") public: - explicit QFrameGraph(Qt3D::QNode *parent = 0); + explicit QFrameGraph(Qt3DCore::QNode *parent = 0); ~QFrameGraph(); QFrameGraphNode *activeFrameGraph() const; @@ -66,8 +66,8 @@ Q_SIGNALS: void activeFrameGraphChanged(); protected: - QFrameGraph(QFrameGraphPrivate &dd, Qt3D::QNode *parent = 0); - void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE; + QFrameGraph(QFrameGraphPrivate &dd, Qt3DCore::QNode *parent = 0); + void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE; private: Q_DECLARE_PRIVATE(QFrameGraph) -- cgit v1.2.3