QTexture renamed to QAbstractTextureProvider

This is done prior to the whole texture API refactoring.

Doc was also added, might need improvement later on but a base is present at
least.

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

12 files changed, 87 insertions, 87 deletions

diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp
index d32633cc0..8b16b8f4a 100644
--- a/src/render/defaults/qdiffusemapmaterial.cpp
+++ b/src/render/defaults/qdiffusemapmaterial.cpp
@@ -60,7 +60,7 @@ namespace Qt3D {
 QDiffuseMapMaterialPrivate::QDiffuseMapMaterialPrivate(QDiffuseMapMaterial *qq)
     : QMaterialPrivate(qq)
     , m_diffuseMapEffect(new QEffect())
-    , m_diffuseTexture(new QTexture(QTexture::Target2D))
+    , m_diffuseTexture(new QAbstractTextureProvider(QAbstractTextureProvider::Target2D))
     , m_ambientParameter(new QParameter(QStringLiteral("ka"), QColor::fromRgbF(0.05f, 0.05f, 0.05f, 1.0f)))
     , m_diffuseParameter(new QParameter(QStringLiteral("diffuseTexture"), m_diffuseTexture))
     , m_specularParameter(new QParameter(QStringLiteral("ks"), QColor::fromRgbF(0.95f, 0.95f, 0.95f, 1.0f)))
@@ -77,8 +77,8 @@ QDiffuseMapMaterialPrivate::QDiffuseMapMaterialPrivate(QDiffuseMapMaterial *qq)
     , m_diffuseMapGL3Shader(new QShaderProgram())
     , m_diffuseMapGL2ES2Shader(new QShaderProgram())
  {
-    m_diffuseTexture->setMagnificationFilter(QTexture::Linear);
-    m_diffuseTexture->setMinificationFilter(QTexture::LinearMipMapLinear);
+    m_diffuseTexture->setMagnificationFilter(QAbstractTextureProvider::Linear);
+    m_diffuseTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear);
     m_diffuseTexture->setWrapMode(QTextureWrapMode(QTextureWrapMode::Repeat));
     m_diffuseTexture->setGenerateMipMaps(true);
     m_diffuseTexture->setMaximumAnisotropy(16.0f);
@@ -209,10 +209,10 @@ float QDiffuseMapMaterial::shininess() const
     the wrap mode is repeat, the maximum anisotropy is set to 16.0
     and mipmapping is enabled.
  */
-QTexture *QDiffuseMapMaterial::diffuse() const
+QAbstractTextureProvider *QDiffuseMapMaterial::diffuse() const
 {
     Q_D(const QDiffuseMapMaterial);
-    return d->m_diffuseParameter->value().value<QTexture *>();
+    return d->m_diffuseParameter->value().value<QAbstractTextureProvider *>();
 }
 
 /*!
@@ -259,7 +259,7 @@ void QDiffuseMapMaterial::setShininess(float shininess)
     \fn Qt3D::QDiffuseMapMaterial::setDiffuse(QTexture *diffuseMap)
     Sets the current diffuse map to \a diffuseMap.
  */
-void QDiffuseMapMaterial::setDiffuse(QTexture *diffuseMap)
+void QDiffuseMapMaterial::setDiffuse(QAbstractTextureProvider *diffuseMap)
 {
     Q_D(QDiffuseMapMaterial);
     d->m_diffuseParameter->setValue(QVariant::fromValue(diffuseMap));
diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/render/defaults/qdiffusemapmaterial.h
index 69eb0d33f..0f3d9cf51 100644
--- a/src/render/defaults/qdiffusemapmaterial.h
+++ b/src/render/defaults/qdiffusemapmaterial.h
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D {
 
 class QDiffuseMapMaterialPrivate;
-class QTexture;
+class QAbstractTextureProvider;
 
 class QT3DRENDERERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial
 {
@@ -58,7 +58,7 @@ class QT3DRENDERERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial
     Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged)
     Q_PROPERTY(QColor specular READ specular WRITE setSpecular NOTIFY specularChanged)
     Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged)
-    Q_PROPERTY(QTexture *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged)
+    Q_PROPERTY(QAbstractTextureProvider *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged)
     Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged)
 
 public:
@@ -68,13 +68,13 @@ public:
     QColor ambient() const;
     QColor specular() const;
     float shininess() const;
-    QTexture *diffuse() const;
+    QAbstractTextureProvider *diffuse() const;
     float textureScale() const;
 
     void setAmbient(const QColor &color);
     void setSpecular(const QColor &specular);
     void setShininess(float shininess);
-    void setDiffuse(QTexture *diffuse);
+    void setDiffuse(QAbstractTextureProvider *diffuse);
     void setTextureScale(float textureScale);
 
 Q_SIGNALS:
diff --git a/src/render/defaults/qdiffusemapmaterial_p.h b/src/render/defaults/qdiffusemapmaterial_p.h
index 538128668..515094a3e 100644
--- a/src/render/defaults/qdiffusemapmaterial_p.h
+++ b/src/render/defaults/qdiffusemapmaterial_p.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D {
 
 class QEffect;
-class QTexture;
+class QAbstractTextureProvider;
 class QTechnique;
 class QParameter;
 class QShaderProgram;
@@ -65,7 +65,7 @@ class QDiffuseMapMaterialPrivate : public QMaterialPrivate
     void init();
 
     QEffect *m_diffuseMapEffect;
-    QTexture *m_diffuseTexture;
+    QAbstractTextureProvider *m_diffuseTexture;
     QParameter *m_ambientParameter;
     QParameter *m_diffuseParameter;
     QParameter *m_specularParameter;
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp
index 864d1ed22..ce0abe9f2 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp
@@ -61,8 +61,8 @@ namespace Qt3D {
 QDiffuseSpecularMapMaterialPrivate::QDiffuseSpecularMapMaterialPrivate(QDiffuseSpecularMapMaterial *qq)
     : QMaterialPrivate(qq)
     , m_diffuseSpecularMapEffect(new QEffect())
-    , m_diffuseTexture(new QTexture(QTexture::Target2D))
-    , m_specularTexture(new QTexture(QTexture::Target2D))
+    , m_diffuseTexture(new QAbstractTextureProvider(QAbstractTextureProvider::Target2D))
+    , m_specularTexture(new QAbstractTextureProvider(QAbstractTextureProvider::Target2D))
     , m_ambientParameter(new QParameter(QStringLiteral("ka"), QColor::fromRgbF(0.05f, 0.05f, 0.05f, 1.0f)))
     , m_diffuseParameter(new QParameter(QStringLiteral("diffuseTexture"), m_diffuseTexture))
     , m_specularParameter(new QParameter(QStringLiteral("specularTexture"), m_specularTexture))
@@ -79,14 +79,14 @@ QDiffuseSpecularMapMaterialPrivate::QDiffuseSpecularMapMaterialPrivate(QDiffuseS
     , m_diffuseSpecularMapGL3Shader(new QShaderProgram())
     , m_diffuseSpecularMapGL2ES2Shader(new QShaderProgram())
 {
-    m_diffuseTexture->setMagnificationFilter(QTexture::Linear);
-    m_diffuseTexture->setMinificationFilter(QTexture::LinearMipMapLinear);
+    m_diffuseTexture->setMagnificationFilter(QAbstractTextureProvider::Linear);
+    m_diffuseTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear);
     m_diffuseTexture->setWrapMode(QTextureWrapMode(QTextureWrapMode::Repeat));
     m_diffuseTexture->setGenerateMipMaps(true);
     m_diffuseTexture->setMaximumAnisotropy(16.0f);
 
-    m_specularTexture->setMagnificationFilter(QTexture::Linear);
-    m_specularTexture->setMinificationFilter(QTexture::LinearMipMapLinear);
+    m_specularTexture->setMagnificationFilter(QAbstractTextureProvider::Linear);
+    m_specularTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear);
     m_specularTexture->setWrapMode(QTextureWrapMode(QTextureWrapMode::Repeat));
     m_specularTexture->setGenerateMipMaps(true);
     m_specularTexture->setMaximumAnisotropy(16.0f);
@@ -196,10 +196,10 @@ QColor QDiffuseSpecularMapMaterial::ambient() const
     the wrap mode is repeat, the maximum anisotropy is set to 16.0
     and mipmapping is enabled.
  */
-QTexture *QDiffuseSpecularMapMaterial::diffuse() const
+QAbstractTextureProvider *QDiffuseSpecularMapMaterial::diffuse() const
 {
     Q_D(const QDiffuseSpecularMapMaterial);
-    return d->m_diffuseParameter->value().value<QTexture *>();
+    return d->m_diffuseParameter->value().value<QAbstractTextureProvider *>();
 }
 
 /*!
@@ -210,10 +210,10 @@ QTexture *QDiffuseSpecularMapMaterial::diffuse() const
     the wrap mode is repeat, the maximum anisotropy is set to 16.0
     and mipmapping is enabled.
  */
-QTexture *QDiffuseSpecularMapMaterial::specular() const
+QAbstractTextureProvider *QDiffuseSpecularMapMaterial::specular() const
 {
     Q_D(const QDiffuseSpecularMapMaterial);
-    return d->m_specularParameter->value().value<QTexture *>();
+    return d->m_specularParameter->value().value<QAbstractTextureProvider *>();
 }
 
 /*!
@@ -250,7 +250,7 @@ void QDiffuseSpecularMapMaterial::setAmbient(const QColor &ambient)
     \fn Qt3D::QDiffuseSpecularMapMaterial::setDiffuse(QTexture *diffuse)
     Sets the current diffuse map to \a diffuse.
  */
-void QDiffuseSpecularMapMaterial::setDiffuse(QTexture *diffuse)
+void QDiffuseSpecularMapMaterial::setDiffuse(QAbstractTextureProvider *diffuse)
 {
     Q_D(QDiffuseSpecularMapMaterial);
     d->m_diffuseParameter->setValue(QVariant::fromValue(diffuse));
@@ -260,7 +260,7 @@ void QDiffuseSpecularMapMaterial::setDiffuse(QTexture *diffuse)
     \fn Qt3D::QDiffuseSpecularMapMaterial::setSpecular(QTexture *specular)
     Sets the current specular map to \a specular.
  */
-void QDiffuseSpecularMapMaterial::setSpecular(QTexture *specular)
+void QDiffuseSpecularMapMaterial::setSpecular(QAbstractTextureProvider *specular)
 {
     Q_D(QDiffuseSpecularMapMaterial);
     d->m_specularParameter->setValue(QVariant::fromValue(specular));
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.h b/src/render/defaults/qdiffusespecularmapmaterial.h
index bcaa5b37e..06c184ce0 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial.h
+++ b/src/render/defaults/qdiffusespecularmapmaterial.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QTexture;
+class QAbstractTextureProvider;
 class QDiffuseSpecularMapMaterialPrivate;
 
 class QT3DRENDERERSHARED_EXPORT QDiffuseSpecularMapMaterial : public QMaterial
@@ -57,8 +57,8 @@ class QT3DRENDERERSHARED_EXPORT QDiffuseSpecularMapMaterial : public QMaterial
     Q_OBJECT
     Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged)
     Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged)
-    Q_PROPERTY(QTexture *specular READ specular WRITE setSpecular NOTIFY specularChanged)
-    Q_PROPERTY(QTexture *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged)
+    Q_PROPERTY(QAbstractTextureProvider *specular READ specular WRITE setSpecular NOTIFY specularChanged)
+    Q_PROPERTY(QAbstractTextureProvider *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged)
     Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged)
 
 public:
@@ -66,14 +66,14 @@ public:
     ~QDiffuseSpecularMapMaterial();
 
     QColor ambient() const;
-    QTexture *diffuse() const;
-    QTexture *specular() const;
+    QAbstractTextureProvider *diffuse() const;
+    QAbstractTextureProvider *specular() const;
     float shininess() const;
     float textureScale() const;
 
     void setAmbient(const QColor &ambient);
-    void setDiffuse(QTexture *diffuse);
-    void setSpecular(QTexture *specular);
+    void setDiffuse(QAbstractTextureProvider *diffuse);
+    void setSpecular(QAbstractTextureProvider *specular);
     void setShininess(float shininess);
     void setTextureScale(float textureScale);
 
diff --git a/src/render/defaults/qdiffusespecularmapmaterial_p.h b/src/render/defaults/qdiffusespecularmapmaterial_p.h
index 8dc642443..4636d4cdd 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial_p.h
+++ b/src/render/defaults/qdiffusespecularmapmaterial_p.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D {
 
 class QEffect;
-class QTexture;
+class QAbstractTextureProvider;
 class QTechnique;
 class QParameter;
 class QShaderProgram;
@@ -66,8 +66,8 @@ public:
     void init();
 
     QEffect *m_diffuseSpecularMapEffect;
-    QTexture *m_diffuseTexture;
-    QTexture *m_specularTexture;
+    QAbstractTextureProvider *m_diffuseTexture;
+    QAbstractTextureProvider *m_specularTexture;
     QParameter *m_ambientParameter;
     QParameter *m_diffuseParameter;
     QParameter *m_specularParameter;
diff --git a/src/render/defaults/qnormaldiffusemapmaterial.cpp b/src/render/defaults/qnormaldiffusemapmaterial.cpp
index 896de08b7..cead0c51a 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial.cpp
+++ b/src/render/defaults/qnormaldiffusemapmaterial.cpp
@@ -61,8 +61,8 @@ namespace Qt3D {
 QNormalDiffuseMapMaterialPrivate::QNormalDiffuseMapMaterialPrivate(QNormalDiffuseMapMaterial *qq)
     : QMaterialPrivate(qq)
     , m_normalDiffuseEffect(new QEffect())
-    , m_diffuseTexture(new QTexture(QTexture::Target2D))
-    , m_normalTexture(new QTexture(QTexture::Target2D))
+    , m_diffuseTexture(new QAbstractTextureProvider(QAbstractTextureProvider::Target2D))
+    , m_normalTexture(new QAbstractTextureProvider(QAbstractTextureProvider::Target2D))
     , m_ambientParameter(new QParameter(QStringLiteral("ka"), QColor::fromRgbF(0.1f, 0.1f, 0.1f, 1.0f)))
     , m_diffuseParameter(new QParameter(QStringLiteral("diffuseTexture"), m_diffuseTexture))
     , m_normalParameter(new QParameter(QStringLiteral("normalTexture"), m_normalTexture))
@@ -80,14 +80,14 @@ QNormalDiffuseMapMaterialPrivate::QNormalDiffuseMapMaterialPrivate(QNormalDiffus
     , m_normalDiffuseGL3Shader(new QShaderProgram())
     , m_normalDiffuseGL2ES2Shader(new QShaderProgram())
 {
-    m_diffuseTexture->setMagnificationFilter(QTexture::Linear);
-    m_diffuseTexture->setMinificationFilter(QTexture::LinearMipMapLinear);
+    m_diffuseTexture->setMagnificationFilter(QAbstractTextureProvider::Linear);
+    m_diffuseTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear);
     m_diffuseTexture->setWrapMode(QTextureWrapMode(QTextureWrapMode::Repeat));
     m_diffuseTexture->setGenerateMipMaps(true);
     m_diffuseTexture->setMaximumAnisotropy(16.0f);
 
-    m_normalTexture->setMagnificationFilter(QTexture::Linear);
-    m_normalTexture->setMinificationFilter(QTexture::Linear);
+    m_normalTexture->setMagnificationFilter(QAbstractTextureProvider::Linear);
+    m_normalTexture->setMinificationFilter(QAbstractTextureProvider::Linear);
     m_normalTexture->setWrapMode(QTextureWrapMode(QTextureWrapMode::Repeat));
     m_normalTexture->setMaximumAnisotropy(16.0f);
 }
@@ -221,10 +221,10 @@ QColor QNormalDiffuseMapMaterial::specular() const
     the wrap mode is repeat, the maximum anisotropy is set to 16.0
     and mipmapping is enabled.
  */
-QTexture *QNormalDiffuseMapMaterial::diffuse() const
+QAbstractTextureProvider *QNormalDiffuseMapMaterial::diffuse() const
 {
     Q_D(const QNormalDiffuseMapMaterial);
-    return d->m_diffuseParameter->value().value<QTexture *>();
+    return d->m_diffuseParameter->value().value<QAbstractTextureProvider *>();
 }
 
 /*!
@@ -234,10 +234,10 @@ QTexture *QNormalDiffuseMapMaterial::diffuse() const
     and magnification filters, the wrap mode is repeat and maximum anisotropy
     is set to 16.0.
  */
-QTexture *QNormalDiffuseMapMaterial::normal() const
+QAbstractTextureProvider *QNormalDiffuseMapMaterial::normal() const
 {
     Q_D(const QNormalDiffuseMapMaterial);
-    return d->m_normalParameter->value().value<QTexture *>();
+    return d->m_normalParameter->value().value<QAbstractTextureProvider *>();
 }
 
 /*!
@@ -284,7 +284,7 @@ void QNormalDiffuseMapMaterial::setSpecular(const QColor &specular)
     \fn Qt3D::QNormalDiffuseMapMaterial::setDiffuse(QTexture *diffuse)
     Sets the current diffuse map to \a diffuse.
  */
-void QNormalDiffuseMapMaterial::setDiffuse(QTexture *diffuse)
+void QNormalDiffuseMapMaterial::setDiffuse(QAbstractTextureProvider *diffuse)
 {
     Q_D(QNormalDiffuseMapMaterial);
     d->m_diffuseParameter->setValue(QVariant::fromValue(diffuse));
@@ -294,7 +294,7 @@ void QNormalDiffuseMapMaterial::setDiffuse(QTexture *diffuse)
     \fn Qt3D::QNormalDiffuseMapMaterial::setNormal(QTexture *normal)
     Sets the current normal map to \a normal.
  */
-void QNormalDiffuseMapMaterial::setNormal(QTexture *normal)
+void QNormalDiffuseMapMaterial::setNormal(QAbstractTextureProvider *normal)
 {
     Q_D(QNormalDiffuseMapMaterial);
     d->m_normalParameter->setValue(QVariant::fromValue(normal));
diff --git a/src/render/defaults/qnormaldiffusemapmaterial.h b/src/render/defaults/qnormaldiffusemapmaterial.h
index 34c1cf7c3..5c6320113 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial.h
+++ b/src/render/defaults/qnormaldiffusemapmaterial.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QTexture;
+class QAbstractTextureProvider;
 class QNormalDiffuseMapMaterialPrivate;
 
 class QT3DRENDERERSHARED_EXPORT QNormalDiffuseMapMaterial : public QMaterial
@@ -57,8 +57,8 @@ class QT3DRENDERERSHARED_EXPORT QNormalDiffuseMapMaterial : public QMaterial
     Q_OBJECT
     Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged)
     Q_PROPERTY(QColor specular READ specular WRITE setSpecular NOTIFY specularChanged)
-    Q_PROPERTY(QTexture *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged)
-    Q_PROPERTY(QTexture *normal READ normal WRITE setNormal NOTIFY normalChanged)
+    Q_PROPERTY(QAbstractTextureProvider *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged)
+    Q_PROPERTY(QAbstractTextureProvider *normal READ normal WRITE setNormal NOTIFY normalChanged)
     Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged)
     Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged)
 
@@ -68,15 +68,15 @@ public:
 
     QColor ambient() const;
     QColor specular() const;
-    QTexture *diffuse() const;
-    QTexture *normal() const;
+    QAbstractTextureProvider *diffuse() const;
+    QAbstractTextureProvider *normal() const;
     float shininess() const;
     float textureScale() const;
 
     void setAmbient(const QColor &ambient);
     void setSpecular(const QColor &specular);
-    void setDiffuse(QTexture *diffuse);
-    void setNormal(QTexture *normal);
+    void setDiffuse(QAbstractTextureProvider *diffuse);
+    void setNormal(QAbstractTextureProvider *normal);
     void setShininess(float shininess);
     void setTextureScale(float textureScale);
 
diff --git a/src/render/defaults/qnormaldiffusemapmaterial_p.h b/src/render/defaults/qnormaldiffusemapmaterial_p.h
index eaa9ff496..7b4e3d90d 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial_p.h
+++ b/src/render/defaults/qnormaldiffusemapmaterial_p.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D {
 
 class QEffect;
-class QTexture;
+class QAbstractTextureProvider;
 class QTechnique;
 class QParameter;
 class QShaderProgram;
@@ -66,8 +66,8 @@ public:
     virtual void init();
 
     QEffect *m_normalDiffuseEffect;
-    QTexture *m_diffuseTexture;
-    QTexture *m_normalTexture;
+    QAbstractTextureProvider *m_diffuseTexture;
+    QAbstractTextureProvider *m_normalTexture;
     QParameter *m_ambientParameter;
     QParameter *m_diffuseParameter;
     QParameter *m_normalParameter;
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
index 0b21a4bb7..fb9d2fa97 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
@@ -60,9 +60,9 @@ namespace Qt3D {
 QNormalDiffuseSpecularMapMaterialPrivate::QNormalDiffuseSpecularMapMaterialPrivate(QNormalDiffuseSpecularMapMaterial *qq)
     : QMaterialPrivate(qq)
     , m_normalDiffuseSpecularEffect(new QEffect())
-    , m_diffuseTexture(new QTexture(QTexture::Target2D))
-    , m_normalTexture(new QTexture(QTexture::Target2D))
-    , m_specularTexture(new QTexture(QTexture::Target2D))
+    , m_diffuseTexture(new QAbstractTextureProvider(QAbstractTextureProvider::Target2D))
+    , m_normalTexture(new QAbstractTextureProvider(QAbstractTextureProvider::Target2D))
+    , m_specularTexture(new QAbstractTextureProvider(QAbstractTextureProvider::Target2D))
     , m_ambientParameter(new QParameter(QStringLiteral("ka"), QColor::fromRgbF(0.05f, 0.05f, 0.05f, 1.0f)))
     , m_diffuseParameter(new QParameter(QStringLiteral("diffuseTexture"), m_diffuseTexture))
     , m_normalParameter(new QParameter(QStringLiteral("normalTexture"), m_normalTexture))
@@ -80,19 +80,19 @@ QNormalDiffuseSpecularMapMaterialPrivate::QNormalDiffuseSpecularMapMaterialPriva
     , m_normalDiffuseSpecularGL3Shader(new QShaderProgram())
     , m_normalDiffuseSpecularGL2ES2Shader(new QShaderProgram())
 {
-    m_diffuseTexture->setMagnificationFilter(QTexture::Linear);
-    m_diffuseTexture->setMinificationFilter(QTexture::LinearMipMapLinear);
+    m_diffuseTexture->setMagnificationFilter(QAbstractTextureProvider::Linear);
+    m_diffuseTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear);
     m_diffuseTexture->setWrapMode(QTextureWrapMode(QTextureWrapMode::Repeat));
     m_diffuseTexture->setGenerateMipMaps(true);
     m_diffuseTexture->setMaximumAnisotropy(16.0f);
 
-    m_normalTexture->setMagnificationFilter(QTexture::Linear);
-    m_normalTexture->setMinificationFilter(QTexture::Linear);
+    m_normalTexture->setMagnificationFilter(QAbstractTextureProvider::Linear);
+    m_normalTexture->setMinificationFilter(QAbstractTextureProvider::Linear);
     m_normalTexture->setWrapMode(QTextureWrapMode(QTextureWrapMode::Repeat));
     m_normalTexture->setMaximumAnisotropy(16.0f);
 
-    m_specularTexture->setMagnificationFilter(QTexture::Linear);
-    m_specularTexture->setMinificationFilter(QTexture::LinearMipMapLinear);
+    m_specularTexture->setMagnificationFilter(QAbstractTextureProvider::Linear);
+    m_specularTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear);
     m_specularTexture->setWrapMode(QTextureWrapMode(QTextureWrapMode::Repeat));
     m_specularTexture->setGenerateMipMaps(true);
     m_specularTexture->setMaximumAnisotropy(16.0f);
@@ -218,10 +218,10 @@ QColor QNormalDiffuseSpecularMapMaterial::ambient() const
     the wrap mode is repeat, the maximum anisotropy is set to 16.0
     and mipmapping is enabled.
  */
-QTexture *QNormalDiffuseSpecularMapMaterial::diffuse() const
+QAbstractTextureProvider *QNormalDiffuseSpecularMapMaterial::diffuse() const
 {
     Q_D(const QNormalDiffuseSpecularMapMaterial);
-    return d->m_diffuseParameter->value().value<QTexture *>();
+    return d->m_diffuseParameter->value().value<QAbstractTextureProvider *>();
 }
 
 /*!
@@ -231,10 +231,10 @@ QTexture *QNormalDiffuseSpecularMapMaterial::diffuse() const
     and magnification filters, the wrap mode is repeat and maximum anisotropy
     is set to 16.0.
  */
-QTexture *QNormalDiffuseSpecularMapMaterial::normal() const
+QAbstractTextureProvider *QNormalDiffuseSpecularMapMaterial::normal() const
 {
     Q_D(const QNormalDiffuseSpecularMapMaterial);
-    return d->m_normalParameter->value().value<QTexture *>();
+    return d->m_normalParameter->value().value<QAbstractTextureProvider *>();
 }
 
 /*!
@@ -245,10 +245,10 @@ QTexture *QNormalDiffuseSpecularMapMaterial::normal() const
     the wrap mode is repeat, the maximum anisotropy is set to 16.0
     and mipmapping is enabled.
  */
-QTexture *QNormalDiffuseSpecularMapMaterial::specular() const
+QAbstractTextureProvider *QNormalDiffuseSpecularMapMaterial::specular() const
 {
     Q_D(const QNormalDiffuseSpecularMapMaterial);
-    return d->m_specularParameter->value().value<QTexture *>();
+    return d->m_specularParameter->value().value<QAbstractTextureProvider *>();
 }
 
 /*!
@@ -285,7 +285,7 @@ void QNormalDiffuseSpecularMapMaterial::setAmbient(const QColor &ambient)
     \fn Qt3D::QNormalDiffuseSpecularMapMaterial::setDiffuse(QTexture *diffuse)
     Sets the current diffuse map to \a diffuse.
  */
-void QNormalDiffuseSpecularMapMaterial::setDiffuse(QTexture *diffuse)
+void QNormalDiffuseSpecularMapMaterial::setDiffuse(QAbstractTextureProvider *diffuse)
 {
     Q_D(QNormalDiffuseSpecularMapMaterial);
     d->m_diffuseParameter->setValue(QVariant::fromValue(diffuse));
@@ -295,7 +295,7 @@ void QNormalDiffuseSpecularMapMaterial::setDiffuse(QTexture *diffuse)
     \fn Qt3D::QNormalDiffuseSpecularMapMaterial::setNormal(QTexture *normal)
     Sets the current normal map to \a normal.
  */
-void QNormalDiffuseSpecularMapMaterial::setNormal(QTexture *normal)
+void QNormalDiffuseSpecularMapMaterial::setNormal(QAbstractTextureProvider *normal)
 {
     Q_D(QNormalDiffuseSpecularMapMaterial);
     d->m_normalParameter->setValue(QVariant::fromValue(normal));
@@ -305,7 +305,7 @@ void QNormalDiffuseSpecularMapMaterial::setNormal(QTexture *normal)
     \fn Qt3D::QNormalDiffuseSpecularMapMaterial::setSpecular(QTexture *specular)
     Sets the current specular map to \a specular.
  */
-void QNormalDiffuseSpecularMapMaterial::setSpecular(QTexture *specular)
+void QNormalDiffuseSpecularMapMaterial::setSpecular(QAbstractTextureProvider *specular)
 {
     Q_D(QNormalDiffuseSpecularMapMaterial);
     d->m_specularParameter->setValue(QVariant::fromValue(specular));
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.h b/src/render/defaults/qnormaldiffusespecularmapmaterial.h
index 1694fe290..8e0dab80c 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial.h
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.h
@@ -55,9 +55,9 @@ class QT3DRENDERERSHARED_EXPORT QNormalDiffuseSpecularMapMaterial : public QMate
 {
     Q_OBJECT
     Q_PROPERTY(QColor ambient READ ambient WRITE setAmbient NOTIFY ambientChanged)
-    Q_PROPERTY(QTexture *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged)
-    Q_PROPERTY(QTexture *normal READ normal WRITE setNormal NOTIFY normalChanged)
-    Q_PROPERTY(QTexture *specular READ specular WRITE setSpecular NOTIFY specularChanged)
+    Q_PROPERTY(QAbstractTextureProvider *diffuse READ diffuse WRITE setDiffuse NOTIFY diffuseChanged)
+    Q_PROPERTY(QAbstractTextureProvider *normal READ normal WRITE setNormal NOTIFY normalChanged)
+    Q_PROPERTY(QAbstractTextureProvider *specular READ specular WRITE setSpecular NOTIFY specularChanged)
     Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged)
     Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged)
 
@@ -66,16 +66,16 @@ public:
     ~QNormalDiffuseSpecularMapMaterial();
 
     QColor ambient() const;
-    QTexture *diffuse() const;
-    QTexture *normal() const;
-    QTexture *specular() const;
+    QAbstractTextureProvider *diffuse() const;
+    QAbstractTextureProvider *normal() const;
+    QAbstractTextureProvider *specular() const;
     float shininess() const;
     float textureScale() const;
 
     void setAmbient(const QColor &ambient);
-    void setDiffuse(QTexture *diffuse);
-    void setNormal(QTexture *normal);
-    void setSpecular(QTexture *specular);
+    void setDiffuse(QAbstractTextureProvider *diffuse);
+    void setNormal(QAbstractTextureProvider *normal);
+    void setSpecular(QAbstractTextureProvider *specular);
     void setShininess(float shininess);
     void setTextureScale(float textureScale);
 
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h
index 0aa2ec2d9..529875c31 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial_p.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D {
 
 class QEffect;
-class QTexture;
+class QAbstractTextureProvider;
 class QTechnique;
 class QParameter;
 class QShaderProgram;
@@ -66,9 +66,9 @@ public:
     void init();
 
     QEffect *m_normalDiffuseSpecularEffect;
-    QTexture *m_diffuseTexture;
-    QTexture *m_normalTexture;
-    QTexture *m_specularTexture;
+    QAbstractTextureProvider *m_diffuseTexture;
+    QAbstractTextureProvider *m_normalTexture;
+    QAbstractTextureProvider *m_specularTexture;
     QParameter *m_ambientParameter;
     QParameter *m_diffuseParameter;
     QParameter *m_normalParameter;