summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3drender/scene2d/scene2d.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick3d/quick3drender/scene2d/scene2d.cpp')
-rw-r--r--src/quick3d/quick3drender/scene2d/scene2d.cpp22
1 files changed, 15 insertions, 7 deletions
diff --git a/src/quick3d/quick3drender/scene2d/scene2d.cpp b/src/quick3d/quick3drender/scene2d/scene2d.cpp
index edf4fd643..210cc5f0f 100644
--- a/src/quick3d/quick3drender/scene2d/scene2d.cpp
+++ b/src/quick3d/quick3drender/scene2d/scene2d.cpp
@@ -34,20 +34,26 @@
**
****************************************************************************/
-#include <Qt3DRender/qscene2d.h>
-#include <Qt3DRender/private/qscene2d_p.h>
-#include <Qt3DRender/private/scene2d_p.h>
-#include <Qt3DRender/private/graphicscontext_p.h>
-#include <Qt3DRender/private/texture_p.h>
-#include <Qt3DRender/private/nodemanagers_p.h>
#include <Qt3DCore/qpropertyupdatedchange.h>
+#include <Qt3DQuickRender/qscene2d.h>
+
+#include <private/qscene2d_p.h>
+#include <private/scene2d_p.h>
+#include <private/graphicscontext_p.h>
+#include <private/texture_p.h>
+#include <private/nodemanagers_p.h>
+
QT_BEGIN_NAMESPACE
+using namespace Qt3DRender::Quick;
+
namespace Qt3DRender {
namespace Render {
+namespace Quick {
+
RenderQmlEventHandler::RenderQmlEventHandler(Scene2D *node)
: QObject()
, m_node(node)
@@ -165,7 +171,7 @@ void Scene2D::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
FrameGraphNode::sceneChangeEvent(e);
}
-void Scene2D::setSharedObject(Qt3DRender::Scene2DSharedObjectPtr sharedObject)
+void Scene2D::setSharedObject(Qt3DRender::Quick::Scene2DSharedObjectPtr sharedObject)
{
m_sharedObject = sharedObject;
}
@@ -296,6 +302,8 @@ void Scene2D::cleanup()
}
}
+} // namespace Quick
+
} // namespace Render
} // namespace Qt3DRender