Move core/io content to render/geometry and io

Change-Id: I79e0b0d62e07a269ebfce99edff56d30da28494c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

38 files changed, 134 insertions, 150 deletions

diff --git a/src/core/core.pri b/src/core/core.pri
index 17315c7d5..e970d5822 100644
--- a/src/core/core.pri
+++ b/src/core/core.pri
@@ -12,8 +12,6 @@ include (./core-components/core-components.pri)
 include (./transforms/transforms.pri)
 # Resources Management
 include (./resources/resources.pri)
-# IO
-include (./io/io.pri)
 # Services
 include (./services/services.pri)
 
diff --git a/src/core/io/io.pri b/src/core/io/io.pri
deleted file mode 100644
index c56bdae2e..000000000
--- a/src/core/io/io.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-HEADERS += \
-    $$PWD/qabstractbuffer.h \
-    $$PWD/qabstractattribute.h \
-    $$PWD/qabstractattribute_p.h \
-    $$PWD/qabstractbuffer_p.h \
-    $$PWD/qurlhelper_p.h
-
-SOURCES += \
-    $$PWD/qabstractbuffer.cpp \
-    $$PWD/qabstractattribute.cpp \
-    $$PWD/qurlhelper.cpp
-
-INCLUDEPATH += $$PWD
diff --git a/src/plugins/sceneparsers/assimp/assimpparser.cpp b/src/plugins/sceneparsers/assimp/assimpparser.cpp
index 0768d408e..5ffc1a4c8 100644
--- a/src/plugins/sceneparsers/assimp/assimpparser.cpp
+++ b/src/plugins/sceneparsers/assimp/assimpparser.cpp
@@ -53,7 +53,7 @@
 #include <QColor>
 #include <qmath.h>
 #include <Qt3DRender/private/renderlogging_p.h>
-#include <Qt3DCore/private/qurlhelper_p.h>
+#include <Qt3DRender/private/qurlhelper_p.h>
 #include <Qt3DRender/qgeometryrenderer.h>
 #include <Qt3DRender/qgeometry.h>
 
@@ -319,7 +319,7 @@ bool AssimpParser::isAssimpPath(const QString &path)
  */
 void AssimpParser::setSource(const QUrl &source)
 {
-    const QString path = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(source);
+    const QString path = QUrlHelper::urlToLocalFileOrQrc(source);
     QFileInfo file(path);
     m_sceneDir = file.absoluteDir();
     if (!file.exists()) {
@@ -335,7 +335,7 @@ void AssimpParser::setSource(const QUrl &source)
  */
 bool AssimpParser::isExtensionSupported(const QUrl &source) const
 {
-    const QString path = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(source);
+    const QString path = QUrlHelper::urlToLocalFileOrQrc(source);
     return AssimpParser::isAssimpPath(path);
 }
 
diff --git a/src/plugins/sceneparsers/gltf/gltfparser.cpp b/src/plugins/sceneparsers/gltf/gltfparser.cpp
index cf9c011cc..0ede1ead2 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser.cpp
+++ b/src/plugins/sceneparsers/gltf/gltfparser.cpp
@@ -48,7 +48,7 @@
 #include <Qt3DCore/QEntity>
 #include <Qt3DCore/QTransform>
 
-#include <Qt3DCore/private/qurlhelper_p.h>
+#include <Qt3DRender/private/qurlhelper_p.h>
 
 #include <Qt3DRender/QAlphaCoverage>
 #include <Qt3DRender/QBlendEquation>
@@ -187,7 +187,7 @@ bool GLTFParser::setJSON(const QJsonDocument &json )
  */
 void GLTFParser::setSource(const QUrl &source)
 {
-    const QString path = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(source);
+    const QString path = QUrlHelper::urlToLocalFileOrQrc(source);
     QFileInfo finfo(path);
     if (!finfo.exists()) {
         qCWarning(GLTFParserLog) << "missing file:" << path;
@@ -215,7 +215,7 @@ void GLTFParser::setSource(const QUrl &source)
  */
 bool GLTFParser::isExtensionSupported(const QUrl &source) const
 {
-    const QString path = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(source);
+    const QString path = QUrlHelper::urlToLocalFileOrQrc(source);
     return GLTFParser::isGLTFPath(path);
 }
 
diff --git a/src/plugins/sceneparsers/gltf/gltfparser.h b/src/plugins/sceneparsers/gltf/gltfparser.h
index 85fff0040..0a4bbcfe9 100644
--- a/src/plugins/sceneparsers/gltf/gltfparser.h
+++ b/src/plugins/sceneparsers/gltf/gltfparser.h
@@ -163,7 +163,7 @@ private:
     QFile* resolveLocalData(QString path) const;
 
     QVariant parameterValueFromJSON(int type, const QJsonValue &value) const;
-    static Qt3DCore::QAbstractAttribute::DataType accessorTypeFromJSON(int componentType);
+    static QAbstractAttribute::DataType accessorTypeFromJSON(int componentType);
     static uint accessorDataSizeFromJson(const QString &type);
 
     static QRenderState *buildStateEnable(int state);
diff --git a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
index a4782535b..512ddfe10 100644
--- a/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
+++ b/src/quick3d/imports/core/qt3dquick3dcoreplugin.cpp
@@ -37,7 +37,6 @@
 #include "qt3dquick3dcoreplugin.h"
 #include <Qt3DCore/qcameralens.h>
 #include <Qt3DCore/qcamera.h>
-#include <Qt3DCore/qabstractattribute.h>
 #include <Qt3DCore/qtransform.h>
 #include <private/quick3dentity_p.h>
 #include <private/quick3dentityloader_p.h>
@@ -64,8 +63,6 @@ void Qt3DQuick3DCorePlugin::registerTypes(const char *uri)
     qmlRegisterExtendedUncreatableType<Qt3DCore::QNode, Qt3DCore::Quick::Quick3DNode>(uri, 2, 0, "Node", QStringLiteral("Node is a base class"));
     Qt3DCore::Quick::registerExtendedType<Qt3DCore::QCamera, Qt3DCore::Quick::Quick3DNode>("QCamera", "Qt3D.Core/Camera", uri, 2, 0, "Camera");
     qmlRegisterType<Qt3DCore::QCameraLens>(uri, 2, 0, "CameraLens");
-
-    qmlRegisterUncreatableType<Qt3DCore::QAbstractAttribute>(uri, 2, 0, "AbstractAttribute", QStringLiteral("QAbstractAttribute is abstract"));
 }
 
 QT_END_NAMESPACE
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index 6d23d7fae..32f4f9ff6 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -206,8 +206,8 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
     qmlRegisterType<Qt3DRender::QTextureImage>(uri, 2, 0, "TextureImage");
 
     // Geometry
-    qmlRegisterUncreatableType<Qt3DCore::QAbstractAttribute>(uri, 2, 0, "QAbstractAttribute", QStringLiteral("QAbstractAttribute is abstract"));
-    qmlRegisterUncreatableType<Qt3DCore::QAbstractBuffer>(uri, 2, 0, "QAbstractBuffer", QStringLiteral("QAbstractBuffer is abstract"));
+    qmlRegisterUncreatableType<Qt3DRender::QAbstractAttribute>(uri, 2, 0, "QAbstractAttribute", QStringLiteral("QAbstractAttribute is abstract"));
+    qmlRegisterUncreatableType<Qt3DRender::QAbstractBuffer>(uri, 2, 0, "QAbstractBuffer", QStringLiteral("QAbstractBuffer is abstract"));
     qmlRegisterType<Qt3DRender::QAttribute>(uri, 2, 0, "Attribute");
     Qt3DRender::Quick::registerExtendedType<Qt3DRender::QBuffer, Qt3DRender::Render::Quick::Quick3DBuffer>("QBuffer", "Qt3D.Render/Buffer", uri, 2, 0, "Buffer");
     Qt3DRender::Quick::registerExtendedType<Qt3DRender::QGeometry, Qt3DRender::Render::Quick::Quick3DGeometry>("QGeometry", "Qt3D.Render/Geometry", uri, 2, 0, "Geometry");
diff --git a/src/quick3d/quick3drender/items/quick3dbuffer.cpp b/src/quick3d/quick3drender/items/quick3dbuffer.cpp
index a80443e6f..1371dd5cb 100644
--- a/src/quick3d/quick3drender/items/quick3dbuffer.cpp
+++ b/src/quick3d/quick3drender/items/quick3dbuffer.cpp
@@ -55,7 +55,7 @@ Quick3DBuffer::Quick3DBuffer(QObject *parent)
     , m_engine(Q_NULLPTR)
     , m_v4engine(Q_NULLPTR)
 {
-    QObject::connect(parentBuffer(), &Qt3DCore::QAbstractBuffer::dataChanged, this, &Quick3DBuffer::bufferDataChanged);
+    QObject::connect(parentBuffer(), &Qt3DRender::QAbstractBuffer::dataChanged, this, &Quick3DBuffer::bufferDataChanged);
 }
 
 QByteArray Quick3DBuffer::convertToRawData(const QJSValue &jsValue)
diff --git a/src/quick3d/quick3drender/items/quick3dgeometry.cpp b/src/quick3d/quick3drender/items/quick3dgeometry.cpp
index 47235c106..5b7e35722 100644
--- a/src/quick3d/quick3drender/items/quick3dgeometry.cpp
+++ b/src/quick3d/quick3drender/items/quick3dgeometry.cpp
@@ -47,39 +47,39 @@ Quick3DGeometry::Quick3DGeometry(QObject *parent)
 {
 }
 
-QQmlListProperty<Qt3DCore::QAbstractAttribute> Quick3DGeometry::attributeList()
+QQmlListProperty<Qt3DRender::QAbstractAttribute> Quick3DGeometry::attributeList()
 {
-    return QQmlListProperty<Qt3DCore::QAbstractAttribute>(this, 0,
-                                                      &Quick3DGeometry::appendAttribute,
-                                                      &Quick3DGeometry::attributesCount,
-                                                      &Quick3DGeometry::attributeAt,
-                                                      &Quick3DGeometry::clearAttributes);
+    return QQmlListProperty<Qt3DRender::QAbstractAttribute>(this, 0,
+                                                            &Quick3DGeometry::appendAttribute,
+                                                            &Quick3DGeometry::attributesCount,
+                                                            &Quick3DGeometry::attributeAt,
+                                                            &Quick3DGeometry::clearAttributes);
 }
 
-void Quick3DGeometry::appendAttribute(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, Qt3DCore::QAbstractAttribute *attribute)
+void Quick3DGeometry::appendAttribute(QQmlListProperty<Qt3DRender::QAbstractAttribute> *list, Qt3DRender::QAbstractAttribute *attribute)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
     geometry->m_managedAttributes.append(attribute);
     geometry->parentGeometry()->addAttribute(attribute);
 }
 
-Qt3DCore::QAbstractAttribute *Quick3DGeometry::attributeAt(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, int index)
+Qt3DRender::QAbstractAttribute *Quick3DGeometry::attributeAt(QQmlListProperty<Qt3DRender::QAbstractAttribute> *list, int index)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
     return geometry->parentGeometry()->attributes().at(index);
 }
 
-int Quick3DGeometry::attributesCount(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list)
+int Quick3DGeometry::attributesCount(QQmlListProperty<Qt3DRender::QAbstractAttribute> *list)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
     return geometry->parentGeometry()->attributes().count();
 }
 
-void Quick3DGeometry::clearAttributes(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list)
+void Quick3DGeometry::clearAttributes(QQmlListProperty<Qt3DRender::QAbstractAttribute> *list)
 {
     Quick3DGeometry *geometry = static_cast<Quick3DGeometry *>(list->object);
-    QVector<Qt3DCore::QAbstractAttribute *> &managedAttributes = geometry->m_managedAttributes;
-    Q_FOREACH (Qt3DCore::QAbstractAttribute *attribute, managedAttributes)
+    QVector<Qt3DRender::QAbstractAttribute *> &managedAttributes = geometry->m_managedAttributes;
+    Q_FOREACH (Qt3DRender::QAbstractAttribute *attribute, managedAttributes)
         geometry->parentGeometry()->removeAttribute(attribute);
     managedAttributes.clear();
 }
diff --git a/src/quick3d/quick3drender/items/quick3dgeometry_p.h b/src/quick3d/quick3drender/items/quick3dgeometry_p.h
index 0434b34c5..2983fe03e 100644
--- a/src/quick3d/quick3drender/items/quick3dgeometry_p.h
+++ b/src/quick3d/quick3drender/items/quick3dgeometry_p.h
@@ -61,22 +61,22 @@ namespace Quick {
 class QT3DQUICKRENDERSHARED_PRIVATE_EXPORT Quick3DGeometry : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QQmlListProperty<Qt3DCore::QAbstractAttribute> attributes READ attributeList)
+    Q_PROPERTY(QQmlListProperty<Qt3DRender::QAbstractAttribute> attributes READ attributeList)
     Q_CLASSINFO("DefaultProperty", "attributes")
 
 public:
     explicit Quick3DGeometry(QObject *parent = 0);
     inline QGeometry *parentGeometry() const { return qobject_cast<QGeometry *>(parent()); }
 
-    QQmlListProperty<Qt3DCore::QAbstractAttribute> attributeList();
+    QQmlListProperty<Qt3DRender::QAbstractAttribute> attributeList();
 
 private:
-    static void appendAttribute(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, Qt3DCore::QAbstractAttribute *provider);
-    static Qt3DCore::QAbstractAttribute *attributeAt(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list, int index);
-    static int attributesCount(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list);
-    static void clearAttributes(QQmlListProperty<Qt3DCore::QAbstractAttribute> *list);
+    static void appendAttribute(QQmlListProperty<Qt3DRender::QAbstractAttribute> *list, Qt3DRender::QAbstractAttribute *provider);
+    static Qt3DRender::QAbstractAttribute *attributeAt(QQmlListProperty<Qt3DRender::QAbstractAttribute> *list, int index);
+    static int attributesCount(QQmlListProperty<Qt3DRender::QAbstractAttribute> *list);
+    static void clearAttributes(QQmlListProperty<Qt3DRender::QAbstractAttribute> *list);
 
-    QVector<Qt3DCore::QAbstractAttribute *> m_managedAttributes;
+    QVector<Qt3DRender::QAbstractAttribute *> m_managedAttributes;
 };
 
 } // namespace Quick
diff --git a/src/render/frontend/qitemmodelbuffer.cpp b/src/render/frontend/qitemmodelbuffer.cpp
index d11b178fe..b7561b4c9 100644
--- a/src/render/frontend/qitemmodelbuffer.cpp
+++ b/src/render/frontend/qitemmodelbuffer.cpp
@@ -111,7 +111,7 @@ void variantToBytes(void* dest, const QVariant& v, GLint type)
 
 namespace {
 
-Qt3DCore::QAbstractAttribute::DataType typeFromGLType(GLint dataType, uint &dataCount)
+QAbstractAttribute::DataType typeFromGLType(GLint dataType, uint &dataCount)
 {
     switch (dataType) {
 
diff --git a/src/render/geometry/attribute.cpp b/src/render/geometry/attribute.cpp
index bb568678f..fa7cfa444 100644
--- a/src/render/geometry/attribute.cpp
+++ b/src/render/geometry/attribute.cpp
@@ -47,13 +47,13 @@ namespace Render {
 
 Attribute::Attribute()
     : QBackendNode(ReadOnly)
-    , m_dataType(Qt3DCore::QAbstractAttribute::Float)
+    , m_dataType(QAbstractAttribute::Float)
     , m_dataSize(1)
     , m_count(0)
     , m_byteStride(0)
     , m_byteOffset(0)
     , m_divisor(0)
-    , m_attributeType(Qt3DCore::QAbstractAttribute::VertexAttribute)
+    , m_attributeType(QAbstractAttribute::VertexAttribute)
     , m_attributeDirty(false)
 {
 }
@@ -64,13 +64,13 @@ Attribute::~Attribute()
 
 void Attribute::cleanup()
 {
-    m_dataType = Qt3DCore::QAbstractAttribute::Float;
+    m_dataType = QAbstractAttribute::Float;
     m_dataSize = 1;
     m_count = 0;
     m_byteStride = 0;
     m_byteOffset = 0;
     m_divisor = 0;
-    m_attributeType = Qt3DCore::QAbstractAttribute::VertexAttribute;
+    m_attributeType = QAbstractAttribute::VertexAttribute;
     m_bufferId = Qt3DCore::QNodeId();
     m_name.clear();
     m_attributeDirty = false;
diff --git a/src/render/geometry/attribute_p.h b/src/render/geometry/attribute_p.h
index 8791d98a2..2320e97b0 100644
--- a/src/render/geometry/attribute_p.h
+++ b/src/render/geometry/attribute_p.h
@@ -70,26 +70,26 @@ public:
 
     inline Qt3DCore::QNodeId bufferId() const { return m_bufferId; }
     inline QString name() const { return m_name; }
-    inline Qt3DCore::QAbstractAttribute::DataType dataType() const { return m_dataType; }
+    inline QAbstractAttribute::DataType dataType() const { return m_dataType; }
     inline uint dataSize() const { return m_dataSize; }
     inline uint count() const { return m_count; }
     inline uint byteStride() const { return m_byteStride; }
     inline uint byteOffset() const { return m_byteOffset; }
     inline uint divisor() const { return m_divisor; }
-    inline Qt3DCore::QAbstractAttribute::AttributeType attributeType() const { return m_attributeType; }
+    inline QAbstractAttribute::AttributeType attributeType() const { return m_attributeType; }
     inline bool isDirty() const { return m_attributeDirty; }
     void unsetDirty();
 
 private:
     Qt3DCore::QNodeId m_bufferId;
     QString m_name;
-    Qt3DCore::QAbstractAttribute::DataType m_dataType;
+    QAbstractAttribute::DataType m_dataType;
     uint m_dataSize;
     uint m_count;
     uint m_byteStride;
     uint m_byteOffset;
     uint m_divisor;
-    Qt3DCore::QAbstractAttribute::AttributeType m_attributeType;
+    QAbstractAttribute::AttributeType m_attributeType;
     bool m_attributeDirty;
 };
 
diff --git a/src/render/geometry/geometry.cpp b/src/render/geometry/geometry.cpp
index 5209d9d26..02f7b0582 100644
--- a/src/render/geometry/geometry.cpp
+++ b/src/render/geometry/geometry.cpp
@@ -36,7 +36,7 @@
 
 #include "geometry_p.h"
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DCore/qabstractattribute.h>
+#include <Qt3DRender/qabstractattribute.h>
 #include <Qt3DRender/qgeometry.h>
 #include <Qt3DRender/qboundingvolumespecifier.h>
 
diff --git a/src/render/geometry/geometry.pri b/src/render/geometry/geometry.pri
index 81ee39c81..acc53474f 100644
--- a/src/render/geometry/geometry.pri
+++ b/src/render/geometry/geometry.pri
@@ -7,6 +7,10 @@ HEADERS += \
     $$PWD/geometry_p.h \
     $$PWD/geometryrenderer_p.h \
     $$PWD/geometryrenderermanager_p.h \
+    $$PWD/qabstractattribute.h \
+    $$PWD/qabstractattribute_p.h \
+    $$PWD/qabstractbuffer.h \
+    $$PWD/qabstractbuffer_p.h \
     $$PWD/qattribute.h \
     $$PWD/qattribute_p.h \
     $$PWD/qbuffer.h \
@@ -43,6 +47,8 @@ SOURCES += \
     $$PWD/geometry.cpp \
     $$PWD/geometryrenderer.cpp \
     $$PWD/geometryrenderermanager.cpp \
+    $$PWD/qabstractattribute.cpp \
+    $$PWD/qabstractbuffer.cpp \
     $$PWD/qattribute.cpp \
     $$PWD/qbuffer.cpp \
     $$PWD/qcuboidmesh.cpp \
diff --git a/src/core/io/qabstractattribute.cpp b/src/render/geometry/qabstractattribute.cpp
index 577d6596c..da3f413fd 100644
--- a/src/core/io/qabstractattribute.cpp
+++ b/src/render/geometry/qabstractattribute.cpp
@@ -42,10 +42,10 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DCore {
+namespace Qt3DRender {
 
 /*!
-    \class Qt3DCore::QAbstractAttributePrivate
+    \class Qt3DRender::QAbstractAttributePrivate
     \internal
 */
 QAbstractAttributePrivate::QAbstractAttributePrivate()
@@ -69,7 +69,7 @@ QAbstractAttribute::QAbstractAttribute(QNode *parent)
 
 QAbstractAttribute::~QAbstractAttribute()
 {
-    Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DCore::QAbstractAttribute subclass didn't call QNode::cleanup in its destructor");
+    Q_ASSERT_X(Qt3DCore::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QAbstractAttribute subclass didn't call QNode::cleanup in its destructor");
 }
 
 QAbstractAttribute::QAbstractAttribute(QAbstractBuffer *buf, DataType type, uint dataSize, uint count, uint offset, uint stride, QNode *parent)
diff --git a/src/core/io/qabstractattribute.h b/src/render/geometry/qabstractattribute.h
index cf23812d1..62ebdc0a5 100644
--- a/src/core/io/qabstractattribute.h
+++ b/src/render/geometry/qabstractattribute.h
@@ -34,26 +34,26 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DCORE_QABSTRACTATTRIBUTE_H
-#define QT3DCORE_QABSTRACTATTRIBUTE_H
+#ifndef QT3DRENDER_QABSTRACTATTRIBUTE_H
+#define QT3DRENDER_QABSTRACTATTRIBUTE_H
 
-#include <Qt3DCore/qt3dcore_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DCore/QNode>
 #include <QtCore/QSharedPointer>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DCore {
+namespace Qt3DRender {
 
 class QAbstractBuffer;
 class QAbstractAttributePrivate;
 
 typedef QSharedPointer<QAbstractBuffer> QAbstractBufferPtr;
 
-class QT3DCORESHARED_EXPORT QAbstractAttribute : public QNode
+class QT3DRENDERSHARED_EXPORT QAbstractAttribute : public Qt3DCore::QNode
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3DCore::QAbstractBuffer *buffer READ buffer WRITE setBuffer NOTIFY bufferChanged)
+    Q_PROPERTY(Qt3DRender::QAbstractBuffer *buffer READ buffer WRITE setBuffer NOTIFY bufferChanged)
     Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
     Q_PROPERTY(DataType dataType READ dataType WRITE setDataType NOTIFY dataTypeChanged)
     Q_PROPERTY(uint dataSize READ dataSize WRITE setDataSize NOTIFY dataSizeChanged)
@@ -134,8 +134,8 @@ private:
     Q_DECLARE_PRIVATE(QAbstractAttribute)
 };
 
-} // Qt3D
+} // Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DCORE_QABSTRACTATTRIBUTE_H
+#endif // QT3DRENDER_QABSTRACTATTRIBUTE_H
diff --git a/src/core/io/qabstractattribute_p.h b/src/render/geometry/qabstractattribute_p.h
index 5c203e549..a9a2127ae 100644
--- a/src/core/io/qabstractattribute_p.h
+++ b/src/render/geometry/qabstractattribute_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DCORE_QABSTRACTATTRIBUTE_P_H
-#define QT3DCORE_QABSTRACTATTRIBUTE_P_H
+#ifndef QT3DRENDER_QABSTRACTATTRIBUTE_P_H
+#define QT3DRENDER_QABSTRACTATTRIBUTE_P_H
 
 //
 //  W A R N I N G
@@ -48,18 +48,18 @@
 // We mean it.
 //
 
-#include <Qt3DCore/QAbstractAttribute>
-#include <Qt3DCore/QAbstractBuffer>
+#include <Qt3DRender/QAbstractAttribute>
+#include <Qt3DRender/QAbstractBuffer>
 #include <private/qnode_p.h>
-#include <private/qt3dcore_global_p.h>
+#include <private/qt3drender_global_p.h>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DCore {
+namespace Qt3DRender {
 
 class QAbstractAttribute;
 
-class QT3DCORE_PRIVATE_EXPORT QAbstractAttributePrivate : public QNodePrivate
+class QT3DRENDERSHARED_PRIVATE_EXPORT QAbstractAttributePrivate : public Qt3DCore::QNodePrivate
 {
 public:
     Q_DECLARE_PUBLIC(QAbstractAttribute)
@@ -77,8 +77,8 @@ public:
     QAbstractAttribute::AttributeType m_attributeType;
 };
 
-} // Qt3D
+} // Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DCORE_QABSTRACTATTRIBUTE_P_H
+#endif // QT3DRENDER_QABSTRACTATTRIBUTE_P_H
diff --git a/src/core/io/qabstractbuffer.cpp b/src/render/geometry/qabstractbuffer.cpp
index d9a9ee845..815740aee 100644
--- a/src/core/io/qabstractbuffer.cpp
+++ b/src/render/geometry/qabstractbuffer.cpp
@@ -39,7 +39,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DCore {
+namespace Qt3DRender {
 
 /*!
     \class Qt3DCore::QAbstractBufferPrivate
@@ -58,7 +58,7 @@ QAbstractBuffer::QAbstractBuffer(QNode *parent)
 
 QAbstractBuffer::~QAbstractBuffer()
 {
-    Q_ASSERT_X(QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DCore::QAbstractBuffer subclass didn't call QNode::cleanup in its destructor");
+    Q_ASSERT_X(Qt3DCore::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QAbstractBuffer subclass didn't call QNode::cleanup in its destructor");
 }
 
 /*! \internal */
@@ -79,7 +79,7 @@ void QAbstractBuffer::setData(const QByteArray &bytes)
     Q_D(QAbstractBuffer);
     if (bytes != d->m_data) {
         d->m_data = bytes;
-        QNodePrivate::get(this)->notifyPropertyChange("data", QVariant::fromValue(d->m_data));
+        Qt3DCore::QNodePrivate::get(this)->notifyPropertyChange("data", QVariant::fromValue(d->m_data));
         emit dataChanged();
     }
 }
@@ -90,6 +90,6 @@ QByteArray QAbstractBuffer::data() const
     return d->m_data;
 }
 
-} // Qt3D
+} // Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/core/io/qabstractbuffer.h b/src/render/geometry/qabstractbuffer.h
index 07723d476..60609da99 100644
--- a/src/core/io/qabstractbuffer.h
+++ b/src/render/geometry/qabstractbuffer.h
@@ -34,20 +34,20 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DCORE_QABSTRACTBUFFER_H
-#define QT3DCORE_QABSTRACTBUFFER_H
+#ifndef QT3DRENDER_QABSTRACTBUFFER_H
+#define QT3DRENDER_QABSTRACTBUFFER_H
 
-#include <Qt3DCore/qt3dcore_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DCore/QNode>
 #include <QtCore/QSharedPointer>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DCore {
+namespace Qt3DRender {
 
 class QAbstractBufferPrivate;
 
-class QT3DCORESHARED_EXPORT QAbstractBuffer : public QNode
+class QT3DRENDERSHARED_EXPORT QAbstractBuffer : public Qt3DCore::QNode
 {
     Q_OBJECT
 public:
@@ -68,8 +68,8 @@ private:
     Q_DECLARE_PRIVATE(QAbstractBuffer)
 };
 
-} // Qt3D
+} // Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DCORE_QABSTRACTBUFFER_H
+#endif // QT3DRENDER_QABSTRACTBUFFER_H
diff --git a/src/core/io/qabstractbuffer_p.h b/src/render/geometry/qabstractbuffer_p.h
index f4e548746..67ef0bb74 100644
--- a/src/core/io/qabstractbuffer_p.h
+++ b/src/render/geometry/qabstractbuffer_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DCORE_QABSTRACTBUFFER_P_H
-#define QT3DCORE_QABSTRACTBUFFER_P_H
+#ifndef QT3DRENDER_QABSTRACTBUFFER_P_H
+#define QT3DRENDER_QABSTRACTBUFFER_P_H
 
 //
 //  W A R N I N G
@@ -49,17 +49,17 @@
 //
 
 #include <private/qnode_p.h>
-#include <private/qt3dcore_global_p.h>
+#include <private/qt3drender_global_p.h>
 
 #include <QByteArray>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DCore {
+namespace Qt3DRender {
 
 class QAbstractBuffer;
 
-class QT3DCORE_PRIVATE_EXPORT QAbstractBufferPrivate : public QNodePrivate
+class QT3DRENDERSHARED_PRIVATE_EXPORT QAbstractBufferPrivate : public Qt3DCore::QNodePrivate
 {
 public:
     Q_DECLARE_PUBLIC(QAbstractBuffer)
@@ -68,8 +68,8 @@ public:
     QByteArray m_data;
 };
 
-} // Qt3D
+} // Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DCORE_QABSTRACTBUFFER_P_H
+#endif // QT3DRENDER_QABSTRACTBUFFER_P_H
diff --git a/src/render/geometry/qattribute.h b/src/render/geometry/qattribute.h
index 7634ddae5..005beb1fb 100644
--- a/src/render/geometry/qattribute.h
+++ b/src/render/geometry/qattribute.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QATTRIBUTE_H
 #define QT3DRENDER_QATTRIBUTE_H
 
-#include <Qt3DCore/qabstractattribute.h>
+#include <Qt3DRender/qabstractattribute.h>
 #include <Qt3DRender/qt3drender_global.h>
 #include <QtCore/QSharedPointer>
 
@@ -48,7 +48,7 @@ namespace Qt3DRender {
 class QAttributePrivate;
 class QBuffer;
 
-class QT3DRENDERSHARED_EXPORT QAttribute : public Qt3DCore::QAbstractAttribute
+class QT3DRENDERSHARED_EXPORT QAttribute : public QAbstractAttribute
 {
     Q_OBJECT
 
diff --git a/src/render/geometry/qattribute_p.h b/src/render/geometry/qattribute_p.h
index 3d481e467..a64adfd8b 100644
--- a/src/render/geometry/qattribute_p.h
+++ b/src/render/geometry/qattribute_p.h
@@ -57,7 +57,7 @@ namespace Qt3DRender {
 
 class QAttribute;
 
-class QT3DRENDERSHARED_EXPORT QAttributePrivate : public Qt3DCore::QAbstractAttributePrivate
+class QT3DRENDERSHARED_EXPORT QAttributePrivate : public QAbstractAttributePrivate
 {
 public:
     QAttributePrivate();
diff --git a/src/render/geometry/qboundingvolumespecifier.cpp b/src/render/geometry/qboundingvolumespecifier.cpp
index 2c6662eee..b1900aa12 100644
--- a/src/render/geometry/qboundingvolumespecifier.cpp
+++ b/src/render/geometry/qboundingvolumespecifier.cpp
@@ -36,7 +36,7 @@
 
 #include "qboundingvolumespecifier.h"
 #include <private/qobject_p.h>
-#include <Qt3DCore/qabstractattribute.h>
+#include <Qt3DRender/qabstractattribute.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -50,7 +50,7 @@ public:
         , m_positionAttribute(Q_NULLPTR)
     {}
 
-    Qt3DCore::QAbstractAttribute *m_positionAttribute;
+    QAbstractAttribute *m_positionAttribute;
 };
 
 QBoundingVolumeSpecifier::QBoundingVolumeSpecifier(QObject *parent)
@@ -58,13 +58,13 @@ QBoundingVolumeSpecifier::QBoundingVolumeSpecifier(QObject *parent)
 {
 }
 
-Qt3DCore::QAbstractAttribute *QBoundingVolumeSpecifier::positionAttribute() const
+QAbstractAttribute *QBoundingVolumeSpecifier::positionAttribute() const
 {
     Q_D(const QBoundingVolumeSpecifier);
     return d->m_positionAttribute;
 }
 
-void QBoundingVolumeSpecifier::setPositionAttribute(Qt3DCore::QAbstractAttribute *positionAttribute)
+void QBoundingVolumeSpecifier::setPositionAttribute(QAbstractAttribute *positionAttribute)
 {
     Q_D(QBoundingVolumeSpecifier);
     if (positionAttribute != d->m_positionAttribute) {
diff --git a/src/render/geometry/qboundingvolumespecifier.h b/src/render/geometry/qboundingvolumespecifier.h
index 3ff43a262..42dc0aacb 100644
--- a/src/render/geometry/qboundingvolumespecifier.h
+++ b/src/render/geometry/qboundingvolumespecifier.h
@@ -42,23 +42,20 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DCore {
-class QAbstractAttribute;
-}
-
 namespace Qt3DRender {
 
+class QAbstractAttribute;
 class QBoundingVolumeSpecifierPrivate;
 
 class QT3DRENDERSHARED_EXPORT QBoundingVolumeSpecifier : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3DCore::QAbstractAttribute *positionAttribute READ positionAttribute WRITE setPositionAttribute NOTIFY positionAttributeChanged)
+    Q_PROPERTY(Qt3DRender::QAbstractAttribute *positionAttribute READ positionAttribute WRITE setPositionAttribute NOTIFY positionAttributeChanged)
 public:
     explicit QBoundingVolumeSpecifier(QObject *parent = 0);
 
-    Qt3DCore::QAbstractAttribute *positionAttribute() const;
-    void setPositionAttribute(Qt3DCore::QAbstractAttribute *positionAttribute);
+    QAbstractAttribute *positionAttribute() const;
+    void setPositionAttribute(QAbstractAttribute *positionAttribute);
 
 Q_SIGNALS:
     void positionAttributeChanged();
diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h
index b73eae34d..4c205cb95 100644
--- a/src/render/geometry/qbuffer.h
+++ b/src/render/geometry/qbuffer.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QBUFFER_H
 #define QT3DRENDER_QBUFFER_H
 
-#include <Qt3DCore/qabstractbuffer.h>
+#include <Qt3DRender/qabstractbuffer.h>
 #include <Qt3DRender/qt3drender_global.h>
 #include <QSharedPointer>
 
@@ -49,7 +49,7 @@ class QBufferPrivate;
 class QBufferFunctor;
 typedef QSharedPointer<QBufferFunctor> QBufferFunctorPtr;
 
-class QT3DRENDERSHARED_EXPORT QBuffer : public Qt3DCore::QAbstractBuffer
+class QT3DRENDERSHARED_EXPORT QBuffer : public QAbstractBuffer
 {
     Q_OBJECT
     Q_PROPERTY(BufferType type READ type WRITE setType NOTIFY typeChanged)
diff --git a/src/render/geometry/qbuffer_p.h b/src/render/geometry/qbuffer_p.h
index f1f0c1e8e..31d66c744 100644
--- a/src/render/geometry/qbuffer_p.h
+++ b/src/render/geometry/qbuffer_p.h
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERSHARED_EXPORT QBufferPrivate : public Qt3DCore::QAbstractBufferPrivate
+class QT3DRENDERSHARED_EXPORT QBufferPrivate : public QAbstractBufferPrivate
 {
 public:
     QBufferPrivate();
diff --git a/src/render/geometry/qgeometry.cpp b/src/render/geometry/qgeometry.cpp
index af76a6b5f..0dca93336 100644
--- a/src/render/geometry/qgeometry.cpp
+++ b/src/render/geometry/qgeometry.cpp
@@ -37,8 +37,8 @@
 #include "qgeometry.h"
 #include "qgeometry_p.h"
 #include <private/qnode_p.h>
-#include <Qt3DCore/qabstractattribute.h>
 #include <Qt3DCore/qscenepropertychange.h>
+#include <Qt3DRender/qabstractattribute.h>
 #include <Qt3DRender/qboundingvolumespecifier.h>
 
 QT_BEGIN_NAMESPACE
@@ -81,7 +81,7 @@ QGeometry::~QGeometry()
     QNode::cleanup();
 }
 
-void QGeometry::addAttribute(Qt3DCore::QAbstractAttribute *attribute)
+void QGeometry::addAttribute(QAbstractAttribute *attribute)
 {
     Q_D(QGeometry);
     if (!d->m_attributes.contains(attribute)) {
@@ -103,7 +103,7 @@ void QGeometry::addAttribute(Qt3DCore::QAbstractAttribute *attribute)
     }
 }
 
-void QGeometry::removeAttribute(Qt3DCore::QAbstractAttribute *attribute)
+void QGeometry::removeAttribute(QAbstractAttribute *attribute)
 {
     Q_D(QGeometry);
     if (d->m_changeArbiter != Q_NULLPTR) {
diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h
index 434bdcb78..f2ba6575e 100644
--- a/src/render/geometry/qgeometry.h
+++ b/src/render/geometry/qgeometry.h
@@ -42,16 +42,13 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DCore {
-class QAbstractAttribute;
-}
-
 namespace Qt3DRender {
 
+class QAbstractAttribute;
 class QGeometryPrivate;
 class QBoundingVolumeSpecifier;
 
-typedef QVector<Qt3DCore::QAbstractAttribute *> QAttributeList;
+typedef QVector<QAbstractAttribute *> QAttributeList;
 
 class QT3DRENDERSHARED_EXPORT QGeometry : public Qt3DCore::QNode
 {
@@ -63,8 +60,8 @@ public:
     ~QGeometry();
 
     QAttributeList attributes() const;
-    void addAttribute(Qt3DCore::QAbstractAttribute *attribute);
-    void removeAttribute(Qt3DCore::QAbstractAttribute *attribute);
+    void addAttribute(QAbstractAttribute *attribute);
+    void removeAttribute(QAbstractAttribute *attribute);
 
     void setVerticesPerPatch(int verticesPerPatch);
     int verticesPerPatch() const;
diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp
index e0d3629a9..bb45b61a7 100644
--- a/src/render/geometry/qmesh.cpp
+++ b/src/render/geometry/qmesh.cpp
@@ -43,7 +43,7 @@
 #include <Qt3DRender/private/objloader_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DRender/private/renderlogging_p.h>
-#include <Qt3DCore/private/qurlhelper_p.h>
+#include <Qt3DRender/private/qurlhelper_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -144,7 +144,7 @@ QGeometry *MeshFunctor::operator()()
 
 
     // TO DO: Handle file download if remote url
-    QString filePath = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(m_sourcePath);
+    QString filePath = Qt3DRender::QUrlHelper::urlToLocalFileOrQrc(m_sourcePath);
 
     if (loader.load(filePath, m_subMesh))
         return loader.geometry();
diff --git a/src/render/io/io.pri b/src/render/io/io.pri
index e6e05ef29..c2ce822f8 100644
--- a/src/render/io/io.pri
+++ b/src/render/io/io.pri
@@ -6,6 +6,7 @@ HEADERS += \
     $$PWD/qabstractsceneloader_p.h \
     $$PWD/qaxisalignedboundingbox_p.h \
     $$PWD/qsceneloader.h \
+    $$PWD/qurlhelper_p.h \
     $$PWD/scene_p.h \
     $$PWD/scenemanager_p.h \
     $$PWD/uniformbuffer_p.h \
@@ -18,6 +19,7 @@ SOURCES += \
     $$PWD/qabstractsceneloader.cpp \
     $$PWD/qaxisalignedboundingbox.cpp \
     $$PWD/qsceneloader.cpp \
+    $$PWD/qurlhelper.cpp \
     $$PWD/scene.cpp \
     $$PWD/scenemanager.cpp \
     $$PWD/uniformbuffer.cpp \
diff --git a/src/core/io/qurlhelper.cpp b/src/render/io/qurlhelper.cpp
index fab671b94..5663689fe 100644
--- a/src/core/io/qurlhelper.cpp
+++ b/src/render/io/qurlhelper.cpp
@@ -38,7 +38,7 @@
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DCore {
+namespace Qt3DRender {
 
 QString QUrlHelper::urlToLocalFileOrQrc(const QUrl &url)
 {
@@ -60,6 +60,6 @@ QString QUrlHelper::urlToLocalFileOrQrc(const QUrl &url)
     return url.toLocalFile();
 }
 
-} // Qt3D
+} // Qt3DRender
 
 QT_END_NAMESPACE
diff --git a/src/core/io/qurlhelper_p.h b/src/render/io/qurlhelper_p.h
index 9bc6b5dfe..9c4f21384 100644
--- a/src/core/io/qurlhelper_p.h
+++ b/src/render/io/qurlhelper_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DCORE_QURLHELPER_P_H
-#define QT3DCORE_QURLHELPER_P_H
+#ifndef QT3DRENDER_QURLHELPER_P_H
+#define QT3DRENDER_QURLHELPER_P_H
 
 //
 //  W A R N I N G
@@ -48,21 +48,21 @@
 // We mean it.
 //
 
-#include <Qt3DCore/qt3dcore_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <QUrl>
 
 QT_BEGIN_NAMESPACE
 
-namespace Qt3DCore {
+namespace Qt3DRender {
 
-class QT3DCORESHARED_EXPORT QUrlHelper
+class QT3DRENDERSHARED_EXPORT QUrlHelper
 {
 public:
     static QString urlToLocalFileOrQrc(const QUrl &url);
 };
 
-} // Qt3D
+} // Qt3DRender
 
 QT_END_NAMESPACE
 
-#endif // QT3DCORE_QURLHELPER_P_H
+#endif // QT3DRENDER_QURLHELPER_P_H
diff --git a/src/render/jobs/calcboundingvolumejob.cpp b/src/render/jobs/calcboundingvolumejob.cpp
index 43842a2ee..feeb7c422 100644
--- a/src/render/jobs/calcboundingvolumejob.cpp
+++ b/src/render/jobs/calcboundingvolumejob.cpp
@@ -93,8 +93,8 @@ void calculateLocalBoundingVolume(NodeManagers *manager, Entity *node)
 
             if (pickVolumeAttribute) {
                 if (!pickVolumeAttribute
-                        || pickVolumeAttribute->attributeType() != Qt3DCore::QAbstractAttribute::VertexAttribute
-                        || pickVolumeAttribute->dataType() != Qt3DCore::QAbstractAttribute::Float
+                        || pickVolumeAttribute->attributeType() != QAbstractAttribute::VertexAttribute
+                        || pickVolumeAttribute->dataType() != QAbstractAttribute::Float
                         || pickVolumeAttribute->dataSize() < 3) {
                     qWarning() << "QBoundingVolumeSpecifier pickVolume Attribute not suited for bounding volume computation";
                     return;
diff --git a/src/render/materialsystem/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp
index 6c7d64f3d..2dff5856f 100644
--- a/src/render/materialsystem/qshaderprogram.cpp
+++ b/src/render/materialsystem/qshaderprogram.cpp
@@ -37,7 +37,7 @@
 #include "qshaderprogram.h"
 #include "qshaderprogram_p.h"
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DCore/private/qurlhelper_p.h>
+#include <Qt3DRender/private/qurlhelper_p.h>
 #include <QDebug>
 #include <QFile>
 #include <QFileInfo>
@@ -256,7 +256,7 @@ static QByteArray deincludify(const QString &filePath)
 QByteArray QShaderProgram::loadSource(const QUrl &sourceUrl)
 {
     // TO DO: Handle remote path
-    return deincludify(Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(sourceUrl));
+    return deincludify(Qt3DRender::QUrlHelper::urlToLocalFileOrQrc(sourceUrl));
 }
 
 } // of namespace Qt3DRender
diff --git a/src/render/texture/qtextureimage.cpp b/src/render/texture/qtextureimage.cpp
index a069f6a56..761d26ae5 100644
--- a/src/render/texture/qtextureimage.cpp
+++ b/src/render/texture/qtextureimage.cpp
@@ -36,7 +36,7 @@
 
 #include "qtextureimage.h"
 #include "qabstracttextureimage_p.h"
-#include <Qt3DCore/private/qurlhelper_p.h>
+#include <Qt3DRender/private/qurlhelper_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -67,7 +67,7 @@ public:
     {
         QTexImageDataPtr dataPtr;
         if (m_url.isLocalFile() || m_url.scheme() == QStringLiteral("qrc")) {
-            QString source = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(m_url);
+            QString source = Qt3DRender::QUrlHelper::urlToLocalFileOrQrc(m_url);
             dataPtr.reset(new QTexImageData());
             if (dataPtr->setCompressedFile(source))
                 return dataPtr;
diff --git a/tests/auto/render/attribute/tst_attribute.cpp b/tests/auto/render/attribute/tst_attribute.cpp
index 6d09414e9..a22a142ff 100644
--- a/tests/auto/render/attribute/tst_attribute.cpp
+++ b/tests/auto/render/attribute/tst_attribute.cpp
@@ -56,7 +56,7 @@ private Q_SLOTS:
         attribute.setCount(427);
         attribute.setDivisor(305);
         attribute.setName(QStringLiteral("C3"));
-        attribute.setDataType(Qt3DCore::QAbstractAttribute::UnsignedShort);
+        attribute.setDataType(Qt3DRender::QAbstractAttribute::UnsignedShort);
         attribute.setDataSize(3);
 
         Qt3DRender::QBuffer buffer(Qt3DRender::QBuffer::IndexBuffer);
@@ -91,7 +91,7 @@ private Q_SLOTS:
         QVERIFY(renderAttribute.bufferId().isNull());
         QVERIFY(renderAttribute.name().isEmpty());
         QCOMPARE(renderAttribute.isDirty(), false);
-        QCOMPARE(renderAttribute.dataType(), Qt3DCore::QAbstractAttribute::Float);
+        QCOMPARE(renderAttribute.dataType(), Qt3DRender::QAbstractAttribute::Float);
         QCOMPARE(renderAttribute.dataSize(), 1U);
         QCOMPARE(renderAttribute.attributeType(), Qt3DRender::QAttribute::VertexAttribute);
         QCOMPARE(renderAttribute.byteOffset(), 0U);
@@ -107,7 +107,7 @@ private Q_SLOTS:
         attribute.setCount(427);
         attribute.setDivisor(305);
         attribute.setName(QStringLiteral("C3"));
-        attribute.setDataType(Qt3DCore::QAbstractAttribute::Double);
+        attribute.setDataType(Qt3DRender::QAbstractAttribute::Double);
         attribute.setDataSize(4);
         Qt3DRender::QBuffer buffer(Qt3DRender::QBuffer::IndexBuffer);
         buffer.setUsage(Qt3DRender::QBuffer::DynamicCopy);
@@ -123,7 +123,7 @@ private Q_SLOTS:
         QVERIFY(renderAttribute.bufferId().isNull());
         QVERIFY(renderAttribute.name().isEmpty());
         QCOMPARE(renderAttribute.isDirty(), false);
-        QCOMPARE(renderAttribute.dataType(), Qt3DCore::QAbstractAttribute::Float);
+        QCOMPARE(renderAttribute.dataType(), Qt3DRender::QAbstractAttribute::Float);
         QCOMPARE(renderAttribute.dataSize(), 1U);
         QCOMPARE(renderAttribute.attributeType(), Qt3DRender::QAttribute::VertexAttribute);
         QCOMPARE(renderAttribute.byteOffset(), 0U);
@@ -141,12 +141,12 @@ private Q_SLOTS:
 
         // WHEN
         Qt3DCore::QScenePropertyChangePtr updateChange(new Qt3DCore::QScenePropertyChange(Qt3DCore::NodeUpdated, Qt3DCore::QSceneChange::Node, Qt3DCore::QNodeId()));
-        updateChange->setValue(static_cast<int>(Qt3DCore::QAbstractAttribute::Int));
+        updateChange->setValue(static_cast<int>(Qt3DRender::QAbstractAttribute::Int));
         updateChange->setPropertyName("dataType");
         renderAttribute.sceneChangeEvent(updateChange);
 
         // THEN
-        QCOMPARE(renderAttribute.dataType(), Qt3DCore::QAbstractAttribute::Int);
+        QCOMPARE(renderAttribute.dataType(), Qt3DRender::QAbstractAttribute::Int);
         QVERIFY(renderAttribute.isDirty());
 
         renderAttribute.unsetDirty();
diff --git a/tests/auto/render/qattribute/tst_qattribute.cpp b/tests/auto/render/qattribute/tst_qattribute.cpp
index 1880e5091..acc3f8cbb 100644
--- a/tests/auto/render/qattribute/tst_qattribute.cpp
+++ b/tests/auto/render/qattribute/tst_qattribute.cpp
@@ -51,7 +51,7 @@ class tst_QAttribute: public Qt3DCore::QNode
 public:
     tst_QAttribute()
     {
-        qRegisterMetaType<Qt3DCore::QAbstractBuffer*>("Qt3DCore::QAbstractBuffer*");
+        qRegisterMetaType<Qt3DRender::QAbstractBuffer*>("Qt3DCore::QAbstractBuffer*");
     }
 
     ~tst_QAttribute()
@@ -71,7 +71,7 @@ private Q_SLOTS:
         Qt3DRender::QAttribute *customVertex = new Qt3DRender::QAttribute();
         Qt3DRender::QBuffer *buffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::VertexBuffer);
         customVertex->setBuffer(buffer);
-        customVertex->setAttributeType(Qt3DCore::QAbstractAttribute::VertexAttribute);
+        customVertex->setAttributeType(Qt3DRender::QAbstractAttribute::VertexAttribute);
         customVertex->setCount(454);
         customVertex->setByteStride(427);
         customVertex->setByteOffset(305);
@@ -84,7 +84,7 @@ private Q_SLOTS:
         Qt3DRender::QAttribute *customIndex = new Qt3DRender::QAttribute();
         Qt3DRender::QBuffer *indexBuffer = new Qt3DRender::QBuffer(Qt3DRender::QBuffer::IndexBuffer);
         customIndex->setBuffer(indexBuffer);
-        customIndex->setAttributeType(Qt3DCore::QAbstractAttribute::IndexAttribute);
+        customIndex->setAttributeType(Qt3DRender::QAbstractAttribute::IndexAttribute);
         customIndex->setCount(383);
         customIndex->setByteStride(350);
         customIndex->setByteOffset(327);
@@ -222,14 +222,14 @@ private Q_SLOTS:
         arbiter.events.clear();
 
         // WHEN
-        attribute->setAttributeType(Qt3DCore::QAbstractAttribute::IndexAttribute);
+        attribute->setAttributeType(Qt3DRender::QAbstractAttribute::IndexAttribute);
         QCoreApplication::processEvents();
 
         // THEN
         QCOMPARE(arbiter.events.size(), 1);
         change = arbiter.events.first().staticCast<Qt3DCore::QScenePropertyChange>();
         QCOMPARE(change->propertyName(), "attributeType");
-        QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DCore::QAbstractAttribute::IndexAttribute));
+        QCOMPARE(change->value().value<int>(), static_cast<int>(Qt3DRender::QAbstractAttribute::IndexAttribute));
         QCOMPARE(change->type(), Qt3DCore::NodeUpdated);
 
         arbiter.events.clear();