diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2015-01-28 08:31:29 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2015-02-08 11:15:35 +0000 |
| commit | bfc4432f4deccb6b1287e4cc0d4aa8e34ea810c1 (patch) | |
| tree | 62031b56bb903796df11f84a6df8215effe9ea8c /src/render/frontend/qmaterial.h | |
| parent | f49cabe35cbd89bd4e5a0e91100a96afdb5d8401 (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/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 b65034b27..36a15d401 100644 --- a/src/render/frontend/qmaterial.h +++ b/src/render/frontend/qmaterial.h @@ -51,11 +51,11 @@ QT_BEGIN_NAMESPACE namespace Qt3D { -class QTexture; +class QAbstractTextureProvider; class QParameter; class QMaterialPrivate; class QEffect; -typedef QMap<QString, QTexture*> TextureDict; +typedef QMap<QString, QAbstractTextureProvider*> TextureDict; class QT3DRENDERERSHARED_EXPORT QMaterial : public QComponent { @@ -74,7 +74,7 @@ public: TextureDict textureValues() const; - void setTextureParameter(QString name, QTexture* tex); + void setTextureParameter(QString name, QAbstractTextureProvider* tex); Q_SIGNALS: void effectChanged(); |