Move QAbstractTextureImage, QTextureImage to dedicated files

Change-Id: I4650ecad1b4c07531c8cd56c11976005bb543aed
Note: qtexture.h is now just a convenience include.
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

7 files changed, 428 insertions, 224 deletions

diff --git a/src/render/frontend/qtexture.cpp b/src/render/frontend/qabstracttextureimage.cpp
index 65ef9a895..5f0561017 100644
--- a/src/render/frontend/qtexture.cpp
+++ b/src/render/frontend/qabstracttextureimage.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB).
+** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the Qt3D module of the Qt Toolkit.
@@ -39,38 +39,13 @@
 **
 ****************************************************************************/
 
-#include "qtexture.h"
-
-#include <texturedata.h>
-
-#include <QImage>
-#include <QDebug>
-#include <Qt3DCore/private/qnode_p.h>
-#include <Qt3DCore/qscenepropertychange.h>
+#include "qabstracttextureimage.h"
+#include "qabstracttextureimage_p.h"
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QAbstractTextureImagePrivate : public QNodePrivate
-{
-public:
-    QAbstractTextureImagePrivate(QAbstractTextureImage *qq)
-        : QNodePrivate(qq)
-        , m_mipmapLevel(0)
-        , m_layer(0)
-        , m_face(QAbstractTextureProvider::CubeMapPositiveX)
-    {
-    }
-
-    Q_DECLARE_PUBLIC(QAbstractTextureImage)
-
-    int m_mipmapLevel;
-    int m_layer;
-    QAbstractTextureProvider::CubeMapFace m_face;
-    QUrl m_source;
-};
-
 /*!
     \class Qt3D::QAbstractTextureImage
     \since 5.5
@@ -178,101 +153,6 @@ QAbstractTextureImage::QAbstractTextureImage(QAbstractTextureImagePrivate &dd, Q
 {
 }
 
-class QTextureImagePrivate: public QAbstractTextureImagePrivate
-{
-public:
-    QTextureImagePrivate(QTextureImage *qq)
-        : QAbstractTextureImagePrivate(qq)
-    {
-    }
-
-    Q_DECLARE_PUBLIC(QTextureImage)
-    QUrl m_source;
-};
-
-class QImageTextureDataFunctor : public QTextureDataFunctor
-{
-public:
-    QImageTextureDataFunctor(const QUrl &url)
-        : QTextureDataFunctor()
-        , m_url(url)
-    {}
-
-    // Will be executed from within a QAspectJob
-    TexImageDataPtr operator ()() Q_DECL_FINAL
-    {
-        return TexImageDataPtr();
-    }
-
-    bool operator ==(const QTextureDataFunctor &other) const Q_DECL_FINAL
-    {
-        const QImageTextureDataFunctor *otherFunctor = dynamic_cast<const QImageTextureDataFunctor*>(&other);
-        return (otherFunctor != Q_NULLPTR && otherFunctor->m_url == m_url);
-    }
-
-private:
-    QUrl m_url;
-};
-
-/*!
-    \class Qt3D::QTextureImage
-    \since 5.5
-    \brief Encapsulates the necessary information to create an OpenGL texture
-    image from an image source.
-
-    It contains the necessary information mipmap level, layer, cube face and
-    source URL to load at the proper place data into an OpenGL texture.
- */
-
-/*!
-    Constructs a new Qt3D::QTextureImage instance with \a parent as parent.
- */
-QTextureImage::QTextureImage(QNode *parent)
-    : QAbstractTextureImage(*new QTextureImagePrivate(this), parent)
-{
-}
-
-QTextureImage::~QTextureImage()
-{
-}
-
-/*!
-    \return the source url from which data will be loaded of the texture image.
- */
-QUrl QTextureImage::source() const
-{
-    Q_D(const QTextureImage);
-    return d->m_source;
-}
-
-/*!
-    Sets the source url of the texture image to \a source.
- */
-void QTextureImage::setSource(const QUrl &source)
-{
-    Q_D(QTextureImage);
-    if (source != d->m_source) {
-        d->m_source = source;
-        emit sourceChanged();
-    }
-}
-
-/*!
-    \returns the a Qt3D::QTextureDataFunctorPtr functor to be used by the
-    backend to load the texture image data into an OpenGL texture object.
- */
-QTextureDataFunctorPtr QTextureImage::dataFunctor() const
-{
-    return QTextureDataFunctorPtr(new QImageTextureDataFunctor(source()));
-}
-
-void QTextureImage::copy(const QNode *ref)
-{
-    QAbstractTextureImage::copy(ref);
-    const QTextureImage *img = static_cast<const QTextureImage *>(ref);
-    d_func()->m_source = img->source();
-}
-
-} // namespace Qt3D
+} // Qt3D
 
 QT_END_NAMESPACE
diff --git a/src/render/frontend/qabstracttextureimage.h b/src/render/frontend/qabstracttextureimage.h
new file mode 100644
index 000000000..8fb3c343d
--- /dev/null
+++ b/src/render/frontend/qabstracttextureimage.h
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT3D_QABSTRACTTEXTUREIMAGE_H
+#define QT3D_QABSTRACTTEXTUREIMAGE_H
+
+#include <Qt3DRenderer/qabstracttextureprovider.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3D {
+
+// TO DO TexImageDataPtr -> QImageDataPtr + d_ptr
+// 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:
+    virtual ~QTextureDataFunctor() {}
+    virtual TexImageDataPtr operator()() = 0;
+    virtual bool operator ==(const QTextureDataFunctor &other) const = 0;
+};
+
+typedef QSharedPointer<QTextureDataFunctor> QTextureDataFunctorPtr;
+
+class QAbstractTextureImagePrivate;
+
+class QT3DRENDERERSHARED_EXPORT QAbstractTextureImage : public 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(Qt3D::QAbstractTextureProvider::CubeMapFace cubeMapFace READ cubeMapFace WRITE setCubeMapFace NOTIFY cubeMapFaceChanged)
+public:
+    explicit QAbstractTextureImage(QNode *parent = 0);
+    virtual ~QAbstractTextureImage();
+
+    int mipmapLevel() const;
+    int layer() const;
+    QAbstractTextureProvider::CubeMapFace cubeMapFace() const;
+
+    void setMipmapLevel(int level);
+    void setLayer(int layer);
+    void setCubeMapFace(QAbstractTextureProvider::CubeMapFace face);
+
+    virtual QTextureDataFunctorPtr dataFunctor() const = 0;
+
+Q_SIGNALS:
+    void mipmapLevelChanged();
+    void layerChanged();
+    void cubeMapFaceChanged();
+
+protected:
+    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+    QAbstractTextureImage(QAbstractTextureImagePrivate &dd, QNode *parent = 0);
+
+private:
+    Q_DECLARE_PRIVATE(QAbstractTextureImage)
+};
+
+} // Qt3D
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(Qt3D::QTextureDataFunctorPtr)
+
+#endif // QT3D_QABSTRACTTEXTUREIMAGE_H
diff --git a/src/render/frontend/qabstracttextureimage_p.h b/src/render/frontend/qabstracttextureimage_p.h
new file mode 100644
index 000000000..629253c26
--- /dev/null
+++ b/src/render/frontend/qabstracttextureimage_p.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT3D_QABSTRACTTEXTUREIMAGE_P_H
+#define QT3D_QABSTRACTTEXTUREIMAGE_P_H
+
+#include <Qt3DCore/private/qnode_p.h>
+#include <Qt3DRenderer/private/qt3drenderer_global_p.h>
+#include <Qt3DRenderer/qabstracttextureprovider.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3D {
+
+class QAbstractTextureImage;
+
+class QT3DRENDERERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public QNodePrivate
+{
+public:
+    QAbstractTextureImagePrivate(QAbstractTextureImage *qq)
+        : QNodePrivate(qq)
+        , m_mipmapLevel(0)
+        , m_layer(0)
+        , m_face(QAbstractTextureProvider::CubeMapPositiveX)
+    {
+    }
+
+    Q_DECLARE_PUBLIC(QAbstractTextureImage)
+
+    int m_mipmapLevel;
+    int m_layer;
+    QAbstractTextureProvider::CubeMapFace m_face;
+};
+
+} // Qt3D
+
+QT_END_NAMESPACE
+
+#endif // QT3D_QABSTRACTTEXTUREIMAGE_P_H
+
diff --git a/src/render/frontend/qtexture.h b/src/render/frontend/qtexture.h
index 6682b15f3..73a7005f6 100644
--- a/src/render/frontend/qtexture.h
+++ b/src/render/frontend/qtexture.h
@@ -44,104 +44,8 @@
 
 #include <QOpenGLTexture>
 #include <Qt3DRenderer/texturedata.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DRenderer/qwrapmode.h>
 #include <Qt3DRenderer/qabstracttextureprovider.h>
-#include <Qt3DCore/qnode.h>
-#include <QUrl>
-
-QT_BEGIN_NAMESPACE
-
-namespace Qt3D {
-
-
-
-
-// TO DO TexImageDataPtr -> QImageDataPtr + d_ptr
-// 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:
-    virtual ~QTextureDataFunctor() {}
-    virtual TexImageDataPtr operator()() = 0;
-    virtual bool operator ==(const QTextureDataFunctor &other) const = 0;
-};
-
-typedef QSharedPointer<QTextureDataFunctor> QTextureDataFunctorPtr;
-
-class QAbstractTextureImagePrivate;
-
-class QT3DRENDERERSHARED_EXPORT QAbstractTextureImage : public 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(Qt3D::QAbstractTextureProvider::CubeMapFace cubeMapFace READ cubeMapFace WRITE setCubeMapFace NOTIFY cubeMapFaceChanged)
-public:
-    explicit QAbstractTextureImage(QNode *parent = 0);
-    virtual ~QAbstractTextureImage();
-
-    int mipmapLevel() const;
-    int layer() const;
-    QAbstractTextureProvider::CubeMapFace cubeMapFace() const;
-
-    void setMipmapLevel(int level);
-    void setLayer(int layer);
-    void setCubeMapFace(QAbstractTextureProvider::CubeMapFace face);
-
-    virtual QTextureDataFunctorPtr dataFunctor() const = 0;
-
-Q_SIGNALS:
-    void mipmapLevelChanged();
-    void layerChanged();
-    void cubeMapFaceChanged();
-
-protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
-    QAbstractTextureImage(QAbstractTextureImagePrivate &dd, QNode *parent = 0);
-
-private:
-    Q_DECLARE_PRIVATE(QAbstractTextureImage)
-};
-
-class QTextureImagePrivate;
-
-class QT3DRENDERERSHARED_EXPORT QTextureImage : public QAbstractTextureImage
-{
-    Q_OBJECT
-    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
-
-public:
-    explicit QTextureImage(QNode *parent = 0);
-    ~QTextureImage();
-
-    QUrl source() const;
-    void setSource(const QUrl &source);
-
-    QTextureDataFunctorPtr dataFunctor() const Q_DECL_OVERRIDE;
-
-Q_SIGNALS:
-    void sourceChanged();
-
-protected:
-    void copy(const QNode *ref) Q_DECL_OVERRIDE;
-
-private:
-    Q_DECLARE_PRIVATE(QTextureImage)
-    QT3D_CLONEABLE(QTextureImage)
-};
-
-} // namespace Qt3D
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(Qt3D::QAbstractTextureProvider*)
-Q_DECLARE_METATYPE(Qt3D::QTextureWrapMode*)
-Q_DECLARE_METATYPE(Qt3D::QTextureImage*)
-Q_DECLARE_METATYPE(Qt3D::QAbstractTextureProvider::ComparisonFunction)
-Q_DECLARE_METATYPE(Qt3D::QAbstractTextureProvider::ComparisonMode)
-Q_DECLARE_METATYPE(Qt3D::QTextureDataFunctorPtr)
+#include <Qt3DRenderer/qtextureimage.h>
 
 #endif // QT3D_QTEXTURE_H
diff --git a/src/render/frontend/qtextureimage.cpp b/src/render/frontend/qtextureimage.cpp
new file mode 100644
index 000000000..5a226bef3
--- /dev/null
+++ b/src/render/frontend/qtextureimage.cpp
@@ -0,0 +1,147 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qtextureimage.h"
+#include "qabstracttextureimage_p.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3D {
+
+class QTextureImagePrivate: public QAbstractTextureImagePrivate
+{
+public:
+    QTextureImagePrivate(QTextureImage *qq)
+        : QAbstractTextureImagePrivate(qq)
+    {
+    }
+
+    Q_DECLARE_PUBLIC(QTextureImage)
+    QUrl m_source;
+};
+
+class QImageTextureDataFunctor : public QTextureDataFunctor
+{
+public:
+    QImageTextureDataFunctor(const QUrl &url)
+        : QTextureDataFunctor()
+        , m_url(url)
+    {}
+
+    // Will be executed from within a QAspectJob
+    TexImageDataPtr operator ()() Q_DECL_FINAL
+    {
+        return TexImageDataPtr();
+    }
+
+    bool operator ==(const QTextureDataFunctor &other) const Q_DECL_FINAL
+    {
+        const QImageTextureDataFunctor *otherFunctor = dynamic_cast<const QImageTextureDataFunctor*>(&other);
+        return (otherFunctor != Q_NULLPTR && otherFunctor->m_url == m_url);
+    }
+
+private:
+    QUrl m_url;
+};
+
+/*!
+    \class Qt3D::QTextureImage
+    \since 5.5
+    \brief Encapsulates the necessary information to create an OpenGL texture
+    image from an image source.
+
+    It contains the necessary information mipmap level, layer, cube face and
+    source URL to load at the proper place data into an OpenGL texture.
+ */
+
+/*!
+    Constructs a new Qt3D::QTextureImage instance with \a parent as parent.
+ */
+QTextureImage::QTextureImage(QNode *parent)
+    : QAbstractTextureImage(*new QTextureImagePrivate(this), parent)
+{
+}
+
+QTextureImage::~QTextureImage()
+{
+}
+
+/*!
+    \return the source url from which data will be loaded of the texture image.
+ */
+QUrl QTextureImage::source() const
+{
+    Q_D(const QTextureImage);
+    return d->m_source;
+}
+
+/*!
+    Sets the source url of the texture image to \a source.
+ */
+void QTextureImage::setSource(const QUrl &source)
+{
+    Q_D(QTextureImage);
+    if (source != d->m_source) {
+        d->m_source = source;
+        emit sourceChanged();
+    }
+}
+
+/*!
+    \returns the a Qt3D::QTextureDataFunctorPtr functor to be used by the
+    backend to load the texture image data into an OpenGL texture object.
+ */
+QTextureDataFunctorPtr QTextureImage::dataFunctor() const
+{
+    return QTextureDataFunctorPtr(new QImageTextureDataFunctor(source()));
+}
+
+void QTextureImage::copy(const QNode *ref)
+{
+    QAbstractTextureImage::copy(ref);
+    const QTextureImage *img = static_cast<const QTextureImage *>(ref);
+    d_func()->m_source = img->source();
+}
+
+} // Qt3D
+
+QT_END_NAMESPACE
+
diff --git a/src/render/frontend/qtextureimage.h b/src/render/frontend/qtextureimage.h
new file mode 100644
index 000000000..3615dbd2f
--- /dev/null
+++ b/src/render/frontend/qtextureimage.h
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QT3D_QTEXTUREIMAGE_H
+#define QT3D_QTEXTUREIMAGE_H
+
+#include <QUrl>
+#include <Qt3DRenderer/qabstracttextureimage.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3D {
+
+class QTextureImagePrivate;
+
+class QT3DRENDERERSHARED_EXPORT QTextureImage : public QAbstractTextureImage
+{
+    Q_OBJECT
+    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+
+public:
+    explicit QTextureImage(QNode *parent = 0);
+    ~QTextureImage();
+
+    QUrl source() const;
+    void setSource(const QUrl &source);
+
+    QTextureDataFunctorPtr dataFunctor() const Q_DECL_OVERRIDE;
+
+Q_SIGNALS:
+    void sourceChanged();
+
+protected:
+    void copy(const QNode *ref) Q_DECL_OVERRIDE;
+
+private:
+    Q_DECLARE_PRIVATE(QTextureImage)
+    QT3D_CLONEABLE(QTextureImage)
+};
+
+} // Qt3D
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(Qt3D::QTextureImage*)
+
+#endif // QT3D_QTEXTUREIMAGE_H
diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri
index f8868e57d..e9da27adc 100644
--- a/src/render/frontend/render-frontend.pri
+++ b/src/render/frontend/render-frontend.pri
@@ -70,7 +70,10 @@ HEADERS += \
     $$PWD/qcolormask.h \
     $$PWD/qabstracttextureprovider.h \
     $$PWD/qabstracttextureprovider_p.h \
-    $$PWD/qwrapmode.h
+    $$PWD/qwrapmode.h \
+    $$PWD/qabstracttextureimage.h \
+    $$PWD/qabstracttextureimage_p.h \
+    $$PWD/qtextureimage.h
 
 SOURCES += \
     $$PWD/qmaterial.cpp \
@@ -79,7 +82,6 @@ SOURCES += \
     $$PWD/qshaderprogram.cpp \
     $$PWD/qtechnique.cpp \
     $$PWD/qitemmodelbuffer.cpp \
-    $$PWD/qtexture.cpp \
     $$PWD/sphere.cpp \
     $$PWD/qabstractsceneloader.cpp \
     $$PWD/qeffect.cpp \
@@ -117,4 +119,6 @@ SOURCES += \
     $$PWD/qpolygonoffset.cpp \
     $$PWD/qcolormask.cpp \
     $$PWD/qabstracttextureprovider.cpp \
-    $$PWD/qwrapmode.cpp
+    $$PWD/qwrapmode.cpp \
+    $$PWD/qabstracttextureimage.cpp \
+    $$PWD/qtextureimage.cpp