diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-08-19 09:34:17 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-08-19 13:02:27 +0200 |
| commit | 87a07e40e65f2a2540c9fdf579205e3d479d50e4 (patch) | |
| tree | 1bc637920fb765c136d390c0559ca76f9bd7183a /src/render/frontend/qmaterial.h | |
| parent | 977863dd3e6a7a40f60db1f9777500d21762d404 (diff) | |
Texture renamed to QTexture
Change-Id: I6f5570ce042b8d3ef44aa76c1fd8ce3a1dde4d3c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/frontend/qmaterial.h')
| -rw-r--r-- | src/render/frontend/qmaterial.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/frontend/qmaterial.h b/src/render/frontend/qmaterial.h index c5f2bc27f..bbf4d4890 100644 --- a/src/render/frontend/qmaterial.h +++ b/src/render/frontend/qmaterial.h @@ -55,10 +55,10 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class Texture; +class QTexture; class QParameter; class QMaterialPrivate; -typedef QMap<QString, Texture*> TextureDict; +typedef QMap<QString, QTexture*> TextureDict; class QT3DRENDERERSHARED_EXPORT QMaterial : public QAbstractMaterial { @@ -77,7 +77,7 @@ public: TextureDict textureValues() const; - void setTextureParameter(QString name, Texture* tex); + void setTextureParameter(QString name, QTexture* tex); protected: Q_DECLARE_PRIVATE(QMaterial) |