Move Qt3DCore into Qt3DCore namespace

Update other aspects, tests and examples accordingly.

Change-Id: Ib1bcf0bdf4f5aec4422dc0c80bfc32b27fb1a317
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

15 files changed, 77 insertions, 77 deletions

diff --git a/src/render/texture/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp
index 5f44090d4..e19c2fe8d 100644
--- a/src/render/texture/qabstracttextureimage.cpp
+++ b/src/render/texture/qabstracttextureimage.cpp
@@ -40,18 +40,18 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
 /*!
-    \class Qt3D::QAbstractTextureImagePrivate
+    \class Qt3DCore::QAbstractTextureImagePrivate
     \internal
 */
 
 /*!
     \qmltype AbstractTextureImage
-    \instantiates Qt3D::QAbstractTextureImage
+    \instantiates Qt3DCore::QAbstractTextureImage
     \inherits Node
     \inqmlmodule Qt3D.Renderer
     \qmlabstract
@@ -79,7 +79,7 @@ namespace Qt3DRender {
  */
 
 /*!
-    Constructs a new Qt3D::QAbstractTextureImage instance with \a parent as parent.
+    Constructs a new Qt3DCore::QAbstractTextureImage instance with \a parent as parent.
  */
 QAbstractTextureImage::QAbstractTextureImage(QNode *parent)
     : QNode(*new QAbstractTextureImagePrivate, parent)
@@ -91,7 +91,7 @@ QAbstractTextureImage::QAbstractTextureImage(QNode *parent)
  */
 QAbstractTextureImage::~QAbstractTextureImage()
 {
-    Q_ASSERT_X(Qt3D::QNodePrivate::get(this)->m_wasCleanedUp, Q_FUNC_INFO, "QNode::cleanup should have been called by now. A Qt3DRender::QAbstractTextureImage 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::QAbstractTextureImage subclass didn't call QNode::cleanup in its destructor");
 }
 
 
@@ -102,7 +102,7 @@ QAbstractTextureImage::~QAbstractTextureImage()
  */
 
 /*!
-    \property Qt3D::QAbstractTextureImage::mipmapLevel
+    \property Qt3DCore::QAbstractTextureImage::mipmapLevel
 
     Holds the mipmap level of the texture image.
  */
@@ -119,7 +119,7 @@ int QAbstractTextureImage::mipmapLevel() const
  */
 
 /*!
-    \property Qt3D::QAbstractTextureImage::layer
+    \property Qt3DCore::QAbstractTextureImage::layer
 
     Holds the layer of the texture image.
  */
@@ -147,7 +147,7 @@ int QAbstractTextureImage::layer() const
  */
 
 /*!
-    \property Qt3D::QAbstractTextureImage::cubeMapFace
+    \property Qt3DCore::QAbstractTextureImage::cubeMapFace
 
     Holds the cube map face of the texture image.
 
diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h
index 24efd2508..a7eed7d91 100644
--- a/src/render/texture/qabstracttextureimage.h
+++ b/src/render/texture/qabstracttextureimage.h
@@ -48,7 +48,7 @@ namespace Qt3DRender {
 // We might also get rid of the layer, face, mipmap level from
 // TexImageDataPtr and store that in the functor directly
 // or use the QTextureImage instead
-class QT3DRENDERERSHARED_EXPORT QTextureDataFunctor : public Qt3D::QAbstractFunctor
+class QT3DRENDERERSHARED_EXPORT QTextureDataFunctor : public Qt3DCore::QAbstractFunctor
 {
 public:
     virtual ~QTextureDataFunctor() {}
@@ -60,14 +60,14 @@ typedef QSharedPointer<QTextureDataFunctor> QTextureDataFunctorPtr;
 
 class QAbstractTextureImagePrivate;
 
-class QT3DRENDERERSHARED_EXPORT QAbstractTextureImage : public Qt3D::QNode
+class QT3DRENDERERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(int mipmapLevel READ mipmapLevel WRITE setMipmapLevel NOTIFY mipmapLevelChanged)
     Q_PROPERTY(int layer READ layer WRITE setLayer NOTIFY layerChanged)
     Q_PROPERTY(Qt3DRender::QAbstractTextureProvider::CubeMapFace cubeMapFace READ cubeMapFace WRITE setCubeMapFace NOTIFY cubeMapFaceChanged)
 public:
-    explicit QAbstractTextureImage(Qt3D::QNode *parent = 0);
+    explicit QAbstractTextureImage(Qt3DCore::QNode *parent = 0);
     virtual ~QAbstractTextureImage();
 
     int mipmapLevel() const;
@@ -87,8 +87,8 @@ Q_SIGNALS:
     void cubeMapFaceChanged();
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
-    QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Qt3D::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
+    QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Qt3DCore::QNode *parent = 0);
 
 private:
     Q_DECLARE_PRIVATE(QAbstractTextureImage)
diff --git a/src/render/texture/qabstracttextureimage_p.h b/src/render/texture/qabstracttextureimage_p.h
index 02c762e9e..abd95e302 100644
--- a/src/render/texture/qabstracttextureimage_p.h
+++ b/src/render/texture/qabstracttextureimage_p.h
@@ -58,7 +58,7 @@ namespace Qt3DRender {
 
 class QAbstractTextureImage;
 
-class QT3DRENDERERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3D::QNodePrivate
+class QT3DRENDERERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QAbstractTextureImagePrivate()
diff --git a/src/render/texture/qabstracttextureprovider.cpp b/src/render/texture/qabstracttextureprovider.cpp
index 34259b511..bed56a14b 100644
--- a/src/render/texture/qabstracttextureprovider.cpp
+++ b/src/render/texture/qabstracttextureprovider.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 
@@ -237,7 +237,7 @@ int QAbstractTextureProvider::maximumLayers() const
     By default the renderer based on the attributes of texture providers is
     able to compare them and detect duplicates (same size, format and image
     sources) and smartly avoid unnecessary computations. In some cases however
-    (texture providers used as Qt3D::RenderTarget attachments) you don't want
+    (texture providers used as Qt3DCore::RenderTarget attachments) you don't want
     the renderer to perform these comparison, in which case you can set is
     unique to true.
  */
@@ -318,9 +318,9 @@ QAbstractTextureProvider::Target QAbstractTextureProvider::target() const
 }
 
 /*!
-    Adds a new Qt3D::QAbstractTextureImage \a textureImage to the texture provider.
+    Adds a new Qt3DCore::QAbstractTextureImage \a textureImage to the texture provider.
 
-    \note Qt3D::QAbstractTextureImage should never be shared between multiple
+    \note Qt3DCore::QAbstractTextureImage should never be shared between multiple
     Qt3DRender::QAbstractTextureProvider instances.
  */
 void QAbstractTextureProvider::addTextureImage(QAbstractTextureImage *textureImage)
@@ -349,7 +349,7 @@ void QAbstractTextureProvider::addTextureImage(QAbstractTextureImage *textureIma
 }
 
 /*!
-    Removes a Qt3D::QAbstractTextureImage \a textureImage from the texture provider.
+    Removes a Qt3DCore::QAbstractTextureImage \a textureImage from the texture provider.
  */
 void QAbstractTextureProvider::removeTextureImage(QAbstractTextureImage *textureImage)
 {
diff --git a/src/render/texture/qabstracttextureprovider.h b/src/render/texture/qabstracttextureprovider.h
index 4a8e3adde..96d4f403c 100644
--- a/src/render/texture/qabstracttextureprovider.h
+++ b/src/render/texture/qabstracttextureprovider.h
@@ -49,7 +49,7 @@ class QAbstractTextureProviderPrivate;
 class QTextureWrapMode;
 class QAbstractTextureImage;
 
-class QT3DRENDERERSHARED_EXPORT QAbstractTextureProvider : public Qt3D::QNode
+class QT3DRENDERERSHARED_EXPORT QAbstractTextureProvider : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(Target target READ target CONSTANT)
@@ -326,10 +326,10 @@ Q_SIGNALS:
     void uniqueChanged();
 
 protected:
-    explicit QAbstractTextureProvider(Qt3D::QNode *parent = 0);
-    explicit QAbstractTextureProvider(Target target, Qt3D::QNode *parent = 0);
-    QAbstractTextureProvider(QAbstractTextureProviderPrivate &dd, Qt3D::QNode *parent = 0);
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    explicit QAbstractTextureProvider(Qt3DCore::QNode *parent = 0);
+    explicit QAbstractTextureProvider(Target target, Qt3DCore::QNode *parent = 0);
+    QAbstractTextureProvider(QAbstractTextureProviderPrivate &dd, Qt3DCore::QNode *parent = 0);
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
     void setStatus(Status status);
 
 private:
diff --git a/src/render/texture/qabstracttextureprovider_p.h b/src/render/texture/qabstracttextureprovider_p.h
index c7bfe078c..c1df87de9 100644
--- a/src/render/texture/qabstracttextureprovider_p.h
+++ b/src/render/texture/qabstracttextureprovider_p.h
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QAbstractTextureProviderPrivate : public Qt3D::QNodePrivate
+class QAbstractTextureProviderPrivate : public Qt3DCore::QNodePrivate
 {
 public :
     QAbstractTextureProviderPrivate();
diff --git a/src/render/texture/qtextureimage.cpp b/src/render/texture/qtextureimage.cpp
index 3d8a58b3e..fd2f6524c 100644
--- a/src/render/texture/qtextureimage.cpp
+++ b/src/render/texture/qtextureimage.cpp
@@ -67,7 +67,7 @@ public:
     {
         TexImageDataPtr dataPtr;
         if (m_url.isLocalFile() || m_url.scheme() == QStringLiteral("qrc")) {
-            QString source = Qt3D::QUrlHelper::urlToLocalFileOrQrc(m_url);
+            QString source = Qt3DCore::QUrlHelper::urlToLocalFileOrQrc(m_url);
             dataPtr.reset(new TexImageData());
             if (dataPtr->setCompressedFile(source))
                 return dataPtr;
diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h
index f77c2d47e..51a612f37 100644
--- a/src/render/texture/qtextureimage.h
+++ b/src/render/texture/qtextureimage.h
@@ -52,7 +52,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureImage : public QAbstractTextureImage
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
 
 public:
-    explicit QTextureImage(Qt3D::QNode *parent = 0);
+    explicit QTextureImage(Qt3DCore::QNode *parent = 0);
     ~QTextureImage();
 
     QUrl source() const;
@@ -64,7 +64,7 @@ Q_SIGNALS:
     void sourceChanged();
 
 protected:
-    void copy(const Qt3D::QNode *ref) Q_DECL_OVERRIDE;
+    void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
 
 private:
     Q_DECLARE_PRIVATE(QTextureImage)
diff --git a/src/render/texture/qtextureproviders.h b/src/render/texture/qtextureproviders.h
index dc54b7999..4cf2f7289 100644
--- a/src/render/texture/qtextureproviders.h
+++ b/src/render/texture/qtextureproviders.h
@@ -47,7 +47,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture1D : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
-    explicit QTexture1D(Qt3D::QNode *parent = 0);
+    explicit QTexture1D(Qt3DCore::QNode *parent = 0);
     ~QTexture1D();
 };
 
@@ -55,7 +55,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture1DArray : public QAbstractTextureProvide
 {
     Q_OBJECT
 public:
-    explicit QTexture1DArray(Qt3D::QNode *parent = 0);
+    explicit QTexture1DArray(Qt3DCore::QNode *parent = 0);
     ~QTexture1DArray();
 };
 
@@ -63,7 +63,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture2D : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
-    explicit QTexture2D(Qt3D::QNode *parent = 0);
+    explicit QTexture2D(Qt3DCore::QNode *parent = 0);
     ~QTexture2D();
 };
 
@@ -71,7 +71,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture2DArray : public QAbstractTextureProvide
 {
     Q_OBJECT
 public:
-    explicit QTexture2DArray(Qt3D::QNode *parent = 0);
+    explicit QTexture2DArray(Qt3DCore::QNode *parent = 0);
     ~QTexture2DArray();
 };
 
@@ -79,7 +79,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture3D : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
-    explicit QTexture3D(Qt3D::QNode *parent = 0);
+    explicit QTexture3D(Qt3DCore::QNode *parent = 0);
     ~QTexture3D();
 };
 
@@ -87,7 +87,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureCubeMap : public QAbstractTextureProvide
 {
     Q_OBJECT
 public:
-    explicit QTextureCubeMap(Qt3D::QNode *parent = 0);
+    explicit QTextureCubeMap(Qt3DCore::QNode *parent = 0);
     ~QTextureCubeMap();
 };
 
@@ -95,7 +95,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureCubeMapArray : public QAbstractTexturePr
 {
     Q_OBJECT
 public:
-    explicit QTextureCubeMapArray(Qt3D::QNode *parent = 0);
+    explicit QTextureCubeMapArray(Qt3DCore::QNode *parent = 0);
     ~QTextureCubeMapArray();
 };
 
@@ -103,7 +103,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture2DMultisample : public QAbstractTextureP
 {
     Q_OBJECT
 public:
-    explicit QTexture2DMultisample(Qt3D::QNode *parent = 0);
+    explicit QTexture2DMultisample(Qt3DCore::QNode *parent = 0);
     ~QTexture2DMultisample();
 };
 
@@ -111,7 +111,7 @@ class QT3DRENDERERSHARED_EXPORT QTexture2DMultisampleArray : public QAbstractTex
 {
     Q_OBJECT
 public:
-    explicit QTexture2DMultisampleArray(Qt3D::QNode *parent = 0);
+    explicit QTexture2DMultisampleArray(Qt3DCore::QNode *parent = 0);
     ~QTexture2DMultisampleArray();
 };
 
@@ -119,7 +119,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureRectangle : public QAbstractTextureProvi
 {
     Q_OBJECT
 public:
-    explicit QTextureRectangle(Qt3D::QNode *parent = 0);
+    explicit QTextureRectangle(Qt3DCore::QNode *parent = 0);
     ~QTextureRectangle();
 };
 
@@ -127,7 +127,7 @@ class QT3DRENDERERSHARED_EXPORT QTextureBuffer : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
-    explicit QTextureBuffer(Qt3D::QNode *parent = 0);
+    explicit QTextureBuffer(Qt3DCore::QNode *parent = 0);
     ~QTextureBuffer();
 };
 
diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp
index 9ac0966ce..edbf26b68 100644
--- a/src/render/texture/texture.cpp
+++ b/src/render/texture/texture.cpp
@@ -50,7 +50,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -123,7 +123,7 @@ void Texture::cleanup()
 }
 
 // AspectThread
-void Texture::updateFromPeer(Qt3D::QNode *peer)
+void Texture::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QAbstractTextureProvider *texture = static_cast<QAbstractTextureProvider *>(peer);
 
@@ -412,7 +412,7 @@ void Texture::setFormat(QAbstractTextureProvider::TextureFormat format)
 }
 
 // ChangeArbiter/Aspect Thread
-void Texture::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Texture::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     // The QOpenGLTexture has to be manipulated from the RenderThread only
     QMutexLocker lock(m_lock);
@@ -579,7 +579,7 @@ TextureFunctor::TextureFunctor(TextureManager *textureManager,
 {
 }
 
-Qt3D::QBackendNode *TextureFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *TextureFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
 {
     Texture *backend = m_textureManager->getOrCreateResource(frontend->id());
     backend->setFactory(factory);
@@ -590,12 +590,12 @@ Qt3D::QBackendNode *TextureFunctor::create(Qt3D::QNode *frontend, const Qt3D::QB
     return backend;
 }
 
-Qt3D::QBackendNode *TextureFunctor::get(const Qt3D::QNodeId &id) const
+Qt3DCore::QBackendNode *TextureFunctor::get(const Qt3DCore::QNodeId &id) const
 {
     return m_textureManager->lookupResource(id);
 }
 
-void TextureFunctor::destroy(const Qt3D::QNodeId &id) const
+void TextureFunctor::destroy(const Qt3DCore::QNodeId &id) const
 {
     m_textureManager->releaseResource(id);
 }
diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h
index d520afae7..313dc40b0 100644
--- a/src/render/texture/texture_p.h
+++ b/src/render/texture/texture_p.h
@@ -71,14 +71,14 @@ class TextureDataManager;
 
 typedef uint TextureDNA;
 
-class Texture : public Qt3D::QBackendNode
+class Texture : public Qt3DCore::QBackendNode
 {
 public:
     Texture();
     ~Texture();
     void cleanup();
 
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
 
     QOpenGLTexture* getOrCreateGLTexture() ;
 
@@ -86,7 +86,7 @@ public:
 
     bool isTextureReset() const;
 
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     TextureDNA dna() const;
 
     void setTextureManager(TextureManager *manager);
@@ -145,16 +145,16 @@ private:
     void updateDNA();
 };
 
-class TextureFunctor : public Qt3D::QBackendNodeFunctor
+class TextureFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit TextureFunctor(TextureManager *textureManager,
                                   TextureImageManager *textureImageManager,
                                   TextureDataManager *textureDataManager);
 
-    Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL;
-    Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL;
-    void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
 
 private:
     TextureManager *m_textureManager;
diff --git a/src/render/texture/texturedatamanager.cpp b/src/render/texture/texturedatamanager.cpp
index 3e77179f6..313a2fe0a 100644
--- a/src/render/texture/texturedatamanager.cpp
+++ b/src/render/texture/texturedatamanager.cpp
@@ -48,7 +48,7 @@ TextureDataManager::TextureDataManager()
 {}
 
 // Called from AspectThread sync
-void TextureDataManager::addToPendingTextures(const Qt3D::QNodeId &textureId)
+void TextureDataManager::addToPendingTextures(const Qt3DCore::QNodeId &textureId)
 {
     // This simple check ensures that we won't be having n jobs
     // for one mesh, in case n Materials are referencing the said
@@ -58,9 +58,9 @@ void TextureDataManager::addToPendingTextures(const Qt3D::QNodeId &textureId)
 }
 
 // Called from AspectThread prepare jobs
-QVector<Qt3D::QNodeId> TextureDataManager::texturesPending()
+QVector<Qt3DCore::QNodeId> TextureDataManager::texturesPending()
 {
-    QVector<Qt3D::QNodeId> textureIds = m_texturesPending;
+    QVector<Qt3DCore::QNodeId> textureIds = m_texturesPending;
     m_texturesPending.clear();
     return textureIds;
 }
diff --git a/src/render/texture/texturedatamanager_p.h b/src/render/texture/texturedatamanager_p.h
index f15c5be98..fcdabebce 100644
--- a/src/render/texture/texturedatamanager_p.h
+++ b/src/render/texture/texturedatamanager_p.h
@@ -65,17 +65,17 @@ namespace Render {
 typedef QPair<QTextureDataFunctorPtr, QVector<HTextureImage> > FunctorImageHandlesPair;
 typedef QPair<QTextureDataFunctorPtr, HTextureData> FunctorTextureDataPair;
 
-class TextureDataManager : public Qt3D::QResourceManager<TexImageData,
-                                                         Qt3D::QNodeId,
+class TextureDataManager : public Qt3DCore::QResourceManager<TexImageData,
+                                                         Qt3DCore::QNodeId,
                                                          16,
-                                                         Qt3D::ArrayAllocatingPolicy,
-                                                         Qt3D::ObjectLevelLockingPolicy>
+                                                         Qt3DCore::ArrayAllocatingPolicy,
+                                                         Qt3DCore::ObjectLevelLockingPolicy>
 {
 public:
     TextureDataManager();
-    void addToPendingTextures(const Qt3D::QNodeId &textureId);
+    void addToPendingTextures(const Qt3DCore::QNodeId &textureId);
 
-    QVector<Qt3D::QNodeId> texturesPending();
+    QVector<Qt3DCore::QNodeId> texturesPending();
 
     HTextureData textureDataFromFunctor(const QTextureDataFunctorPtr &functor) const;
     void addTextureDataForFunctor(HTextureData textureDataHandle, const QTextureDataFunctorPtr &functor);
@@ -87,7 +87,7 @@ public:
     void cleanup();
 
 private:
-    QVector<Qt3D::QNodeId> m_texturesPending;
+    QVector<Qt3DCore::QNodeId> m_texturesPending;
     QVector<FunctorTextureDataPair > m_textureDataFunctors;
     QVector<FunctorImageHandlesPair > m_texturesImagesPerFunctor;
     mutable QMutex m_mutex;
diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp
index 4625586bf..96c6cbd3e 100644
--- a/src/render/texture/textureimage.cpp
+++ b/src/render/texture/textureimage.cpp
@@ -41,7 +41,7 @@
 
 QT_BEGIN_NAMESPACE
 
-using namespace Qt3D;
+using namespace Qt3DCore;
 
 namespace Qt3DRender {
 namespace Render {
@@ -73,7 +73,7 @@ void TextureImage::cleanup()
     m_dna = 0;
 }
 
-void TextureImage::updateFromPeer(Qt3D::QNode *peer)
+void TextureImage::updateFromPeer(Qt3DCore::QNode *peer)
 {
     QAbstractTextureImage *textureImage = static_cast<QAbstractTextureImage *>(peer);
     m_layer = textureImage->layer();
@@ -94,7 +94,7 @@ void TextureImage::updateFromPeer(Qt3D::QNode *peer)
     }
 }
 
-void TextureImage::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void TextureImage::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
 
@@ -161,7 +161,7 @@ TextureImageFunctor::TextureImageFunctor(TextureManager *textureManager,
 {
 }
 
-Qt3D::QBackendNode *TextureImageFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
+Qt3DCore::QBackendNode *TextureImageFunctor::create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const
 {
     TextureImage *backend = m_textureImageManager->getOrCreateResource(frontend->id());
     backend->setFactory(factory);
@@ -172,12 +172,12 @@ Qt3D::QBackendNode *TextureImageFunctor::create(Qt3D::QNode *frontend, const Qt3
     return backend;
 }
 
-Qt3D::QBackendNode *TextureImageFunctor::get(const Qt3D::QNodeId &id) const
+Qt3DCore::QBackendNode *TextureImageFunctor::get(const Qt3DCore::QNodeId &id) const
 {
     return m_textureImageManager->lookupResource(id);
 }
 
-void TextureImageFunctor::destroy(const Qt3D::QNodeId &id) const
+void TextureImageFunctor::destroy(const Qt3DCore::QNodeId &id) const
 {
     m_textureImageManager->releaseResource(id);
 }
diff --git a/src/render/texture/textureimage_p.h b/src/render/texture/textureimage_p.h
index 8b81a6756..bde1e58ca 100644
--- a/src/render/texture/textureimage_p.h
+++ b/src/render/texture/textureimage_p.h
@@ -66,13 +66,13 @@ class TextureDataManager;
 
 typedef uint TextureImageDNA;
 
-class TextureImage : public Qt3D::QBackendNode
+class TextureImage : public Qt3DCore::QBackendNode
 {
 public:
     TextureImage();
     void cleanup();
-    void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
-    void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
+    void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
+    void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
     int m_layer;
     int m_mipmapLevel;
@@ -105,22 +105,22 @@ private:
     TextureManager *m_textureManager;
     TextureImageManager *m_textureImageManager;
     TextureDataManager *m_textureDataManager;
-    QList<Qt3D::QNodeId> m_referencedTextures;
+    QList<Qt3DCore::QNodeId> m_referencedTextures;
     HTexture m_textureProvider;
-    Qt3D::QNodeId m_textureProviderId;
+    Qt3DCore::QNodeId m_textureProviderId;
     TextureImageDNA m_dna;
 };
 
-class TextureImageFunctor : public Qt3D::QBackendNodeFunctor
+class TextureImageFunctor : public Qt3DCore::QBackendNodeFunctor
 {
 public:
     explicit TextureImageFunctor(TextureManager *textureManager,
                                   TextureImageManager *textureImageManager,
                                   TextureDataManager *textureDataManager);
 
-    Qt3D::QBackendNode *create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const Q_DECL_FINAL;
-    Qt3D::QBackendNode *get(const Qt3D::QNodeId &id) const Q_DECL_FINAL;
-    void destroy(const Qt3D::QNodeId &id) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend, const Qt3DCore::QBackendNodeFactory *factory) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
+    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
 
 private:
     TextureManager *m_textureManager;