summaryrefslogtreecommitdiffstats
path: root/src/render/defaults/qdiffusespecularmapmaterial_p.h
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2015-01-28 08:31:29 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-02-08 11:15:35 +0000
commitbfc4432f4deccb6b1287e4cc0d4aa8e34ea810c1 (patch)
tree62031b56bb903796df11f84a6df8215effe9ea8c /src/render/defaults/qdiffusespecularmapmaterial_p.h
parentf49cabe35cbd89bd4e5a0e91100a96afdb5d8401 (diff)
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>
Diffstat (limited to 'src/render/defaults/qdiffusespecularmapmaterial_p.h')
-rw-r--r--src/render/defaults/qdiffusespecularmapmaterial_p.h6
1 files changed, 3 insertions, 3 deletions
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;