4 files changed, 32 insertions, 29 deletions
diff --git a/src/extras/text/distancefieldtextrenderer.cpp b/src/extras/text/distancefieldtextrenderer.cpp
index 4cf9c0b4a..af4840a36 100644
--- a/src/extras/text/distancefieldtextrenderer.cpp
+++ b/src/extras/text/distancefieldtextrenderer.cpp
@@ -37,10 +37,10 @@
 **
 ****************************************************************************/
 
+#include <Qt3DCore/qbuffer.h>
+#include <Qt3DCore/qattribute.h>
+#include <Qt3DCore/qgeometry.h>
 #include <Qt3DRender/qmaterial.h>
-#include <Qt3DRender/qbuffer.h>
-#include <Qt3DRender/qattribute.h>
-#include <Qt3DRender/qgeometry.h>
 #include <Qt3DRender/qgeometryrenderer.h>
 
 #include <Qt3DExtras/private/qtext2dmaterial_p.h>
@@ -77,33 +77,33 @@ void DistanceFieldTextRendererPrivate::init()
     m_renderer = new Qt3DRender::QGeometryRenderer(q);
     m_renderer->setPrimitiveType(Qt3DRender::QGeometryRenderer::Triangles);
 
-    m_geometry = new Qt3DRender::QGeometry(m_renderer);
+    m_geometry = new Qt3DCore::QGeometry(m_renderer);
     m_renderer->setGeometry(m_geometry);
 
-    m_vertexBuffer = new Qt3DRender::QBuffer(m_geometry);
-    m_indexBuffer = new Qt3DRender::QBuffer(m_geometry);
+    m_vertexBuffer = new Qt3DCore::QBuffer(m_geometry);
+    m_indexBuffer = new Qt3DCore::QBuffer(m_geometry);
 
-    m_positionAttr = new Qt3DRender::QAttribute(m_geometry);
-    m_positionAttr->setName(Qt3DRender::QAttribute::defaultPositionAttributeName());
-    m_positionAttr->setVertexBaseType(Qt3DRender::QAttribute::Float);
-    m_positionAttr->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
+    m_positionAttr = new Qt3DCore::QAttribute(m_geometry);
+    m_positionAttr->setName(Qt3DCore::QAttribute::defaultPositionAttributeName());
+    m_positionAttr->setVertexBaseType(Qt3DCore::QAttribute::Float);
+    m_positionAttr->setAttributeType(Qt3DCore::QAttribute::VertexAttribute);
     m_positionAttr->setVertexSize(3);
     m_positionAttr->setByteStride(5 * sizeof(float));
     m_positionAttr->setByteOffset(0);
     m_positionAttr->setBuffer(m_vertexBuffer);
 
-    m_texCoordAttr = new Qt3DRender::QAttribute(m_geometry);
-    m_texCoordAttr->setName(Qt3DRender::QAttribute::defaultTextureCoordinateAttributeName());
-    m_texCoordAttr->setVertexBaseType(Qt3DRender::QAttribute::Float);
-    m_texCoordAttr->setAttributeType(Qt3DRender::QAttribute::VertexAttribute);
+    m_texCoordAttr = new Qt3DCore::QAttribute(m_geometry);
+    m_texCoordAttr->setName(Qt3DCore::QAttribute::defaultTextureCoordinateAttributeName());
+    m_texCoordAttr->setVertexBaseType(Qt3DCore::QAttribute::Float);
+    m_texCoordAttr->setAttributeType(Qt3DCore::QAttribute::VertexAttribute);
     m_texCoordAttr->setVertexSize(2);
     m_texCoordAttr->setByteStride(5 * sizeof(float));
     m_texCoordAttr->setByteOffset(3 * sizeof(float));
     m_texCoordAttr->setBuffer(m_vertexBuffer);
 
-    m_indexAttr = new Qt3DRender::QAttribute(m_geometry);
-    m_indexAttr->setAttributeType(Qt3DRender::QAttribute::IndexAttribute);
-    m_indexAttr->setVertexBaseType(Qt3DRender::QAttribute::UnsignedShort);
+    m_indexAttr = new Qt3DCore::QAttribute(m_geometry);
+    m_indexAttr->setAttributeType(Qt3DCore::QAttribute::IndexAttribute);
+    m_indexAttr->setVertexBaseType(Qt3DCore::QAttribute::UnsignedShort);
     m_indexAttr->setBuffer(m_indexBuffer);
 
     m_geometry->addAttribute(m_positionAttr);
diff --git a/src/extras/text/distancefieldtextrenderer_p_p.h b/src/extras/text/distancefieldtextrenderer_p_p.h
index af4bc4723..76471c5ba 100644
--- a/src/extras/text/distancefieldtextrenderer_p_p.h
+++ b/src/extras/text/distancefieldtextrenderer_p_p.h
@@ -56,14 +56,17 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DRender {
-class QGeometryRenderer;
+namespace Qt3DCore {
 class QGeometry;
 class QMaterial;
 class QAttribute;
 class QBuffer;
 }
 
+namespace Qt3DRender {
+class QGeometryRenderer;
+}
+
 namespace Qt3DExtras {
 
 class QText2DMaterial;
@@ -79,12 +82,12 @@ public:
     void init();
 
     Qt3DRender::QGeometryRenderer *m_renderer;
-    Qt3DRender::QGeometry *m_geometry;
-    Qt3DRender::QAttribute *m_positionAttr;
-    Qt3DRender::QAttribute *m_texCoordAttr;
-    Qt3DRender::QAttribute *m_indexAttr;
-    Qt3DRender::QBuffer *m_vertexBuffer;
-    Qt3DRender::QBuffer *m_indexBuffer;
+    Qt3DCore::QGeometry *m_geometry;
+    Qt3DCore::QAttribute *m_positionAttr;
+    Qt3DCore::QAttribute *m_texCoordAttr;
+    Qt3DCore::QAttribute *m_indexAttr;
+    Qt3DCore::QBuffer *m_vertexBuffer;
+    Qt3DCore::QBuffer *m_indexBuffer;
     QText2DMaterial *m_material;
 };
 
diff --git a/src/extras/text/qtext2dentity.cpp b/src/extras/text/qtext2dentity.cpp
index 897672782..a159ffab5 100644
--- a/src/extras/text/qtext2dentity.cpp
+++ b/src/extras/text/qtext2dentity.cpp
@@ -48,10 +48,10 @@
 #include <QtGui/private/qfont_p.h>
 #include <QtGui/private/qdistancefield_p.h>
 
+#include <Qt3DCore/qbuffer.h>
+#include <Qt3DCore/qattribute.h>
+#include <Qt3DCore/qgeometry.h>
 #include <Qt3DRender/qmaterial.h>
-#include <Qt3DRender/qbuffer.h>
-#include <Qt3DRender/qattribute.h>
-#include <Qt3DRender/qgeometry.h>
 #include <Qt3DRender/qgeometryrenderer.h>
 
 #include <Qt3DCore/private/qscene_p.h>
diff --git a/src/extras/text/qtextureatlas.cpp b/src/extras/text/qtextureatlas.cpp
index 4ab992224..d5d97a3a7 100644
--- a/src/extras/text/qtextureatlas.cpp
+++ b/src/extras/text/qtextureatlas.cpp
@@ -175,7 +175,7 @@ Qt3DRender::QTextureDataPtr QTextureAtlasGenerator::operator()()
 
 bool QTextureAtlasGenerator::operator==(const QTextureGenerator &other) const
 {
-    const QTextureAtlasGenerator *otherFunctor = Qt3DRender::functor_cast<QTextureAtlasGenerator>(&other);
+    const QTextureAtlasGenerator *otherFunctor = Qt3DCore::functor_cast<QTextureAtlasGenerator>(&other);
     return (otherFunctor != nullptr
             && otherFunctor->m_data == m_data
             && otherFunctor->m_atlasId == m_atlasId