diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-03-18 10:41:10 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-04-06 15:30:27 +0000 |
| commit | e6741fa7d5b2afb27138b2eadcc9f16c43d854aa (patch) | |
| tree | 9b0b26a52a3cdc8185ab9802b8c7648a12cc7063 /src/render/defaults/qdiffusemapmaterial.cpp | |
| parent | 854f14cfa59b5ad8f3c7f9146c01c753ce6d4481 (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/qdiffusemapmaterial.cpp')
| -rw-r--r-- | src/render/defaults/qdiffusemapmaterial.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp index cfca526e5..985b6c569 100644 --- a/src/render/defaults/qdiffusemapmaterial.cpp +++ b/src/render/defaults/qdiffusemapmaterial.cpp @@ -75,8 +75,8 @@ QDiffuseMapMaterialPrivate::QDiffuseMapMaterialPrivate() , m_diffuseMapGL2ES2Shader(new QShaderProgram()) , m_filterKey(new QFilterKey) { - m_diffuseTexture->setMagnificationFilter(QAbstractTextureProvider::Linear); - m_diffuseTexture->setMinificationFilter(QAbstractTextureProvider::LinearMipMapLinear); + m_diffuseTexture->setMagnificationFilter(QAbstractTexture::Linear); + m_diffuseTexture->setMinificationFilter(QAbstractTexture::LinearMipMapLinear); m_diffuseTexture->setWrapMode(QTextureWrapMode(QTextureWrapMode::Repeat)); m_diffuseTexture->setGenerateMipMaps(true); m_diffuseTexture->setMaximumAnisotropy(16.0f); @@ -154,7 +154,7 @@ void QDiffuseMapMaterialPrivate::handleAmbientChanged(const QVariant &var) void QDiffuseMapMaterialPrivate::handleDiffuseChanged(const QVariant &var) { Q_Q(QDiffuseMapMaterial); - emit q->diffuseChanged(var.value<QAbstractTextureProvider *>()); + emit q->diffuseChanged(var.value<QAbstractTexture *>()); } void QDiffuseMapMaterialPrivate::handleSpecularChanged(const QVariant &var) @@ -261,10 +261,10 @@ float QDiffuseMapMaterial::shininess() const \li Maximum anisotropy of 16.0 \endlist */ -QAbstractTextureProvider *QDiffuseMapMaterial::diffuse() const +QAbstractTexture *QDiffuseMapMaterial::diffuse() const { Q_D(const QDiffuseMapMaterial); - return d->m_diffuseParameter->value().value<QAbstractTextureProvider *>(); + return d->m_diffuseParameter->value().value<QAbstractTexture *>(); } /*! @@ -297,7 +297,7 @@ void QDiffuseMapMaterial::setShininess(float shininess) d->m_shininessParameter->setValue(shininess); } -void QDiffuseMapMaterial::setDiffuse(QAbstractTextureProvider *diffuseMap) +void QDiffuseMapMaterial::setDiffuse(QAbstractTexture *diffuseMap) { Q_D(QDiffuseMapMaterial); d->m_diffuseParameter->setValue(QVariant::fromValue(diffuseMap)); |