summaryrefslogtreecommitdiffstats
path: root/src/render/defaults/qnormaldiffusemapmaterial_p.h
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-03-18 10:41:10 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-04-06 15:30:27 +0000
commite6741fa7d5b2afb27138b2eadcc9f16c43d854aa (patch)
tree9b0b26a52a3cdc8185ab9802b8c7648a12cc7063 /src/render/defaults/qnormaldiffusemapmaterial_p.h
parent854f14cfa59b5ad8f3c7f9146c01c753ce6d4481 (diff)
QAbstractTextureProvider renamed to QAbstractTexture
Change-Id: If8ea2c9806e28f6d97eb3fb852686647c0c04d8f Task-number: QTBUG-51504 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/defaults/qnormaldiffusemapmaterial_p.h')
-rw-r--r--src/render/defaults/qnormaldiffusemapmaterial_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/defaults/qnormaldiffusemapmaterial_p.h b/src/render/defaults/qnormaldiffusemapmaterial_p.h
index d1831c13d..a446faa13 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial_p.h
+++ b/src/render/defaults/qnormaldiffusemapmaterial_p.h
@@ -59,7 +59,7 @@ namespace Qt3DRender {
class QFilterKey;
class QEffect;
-class QAbstractTextureProvider;
+class QAbstractTexture;
class QTechnique;
class QParameter;
class QShaderProgram;
@@ -82,8 +82,8 @@ public:
void handleTextureScaleChanged(const QVariant &var);
QEffect *m_normalDiffuseEffect;
- QAbstractTextureProvider *m_diffuseTexture;
- QAbstractTextureProvider *m_normalTexture;
+ QAbstractTexture *m_diffuseTexture;
+ QAbstractTexture *m_normalTexture;
QParameter *m_ambientParameter;
QParameter *m_diffuseParameter;
QParameter *m_normalParameter;