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/texture/textureimage.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/texture/textureimage.cpp')
| -rw-r--r-- | src/render/texture/textureimage.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp index 734cdc92d..5db481fea 100644 --- a/src/render/texture/textureimage.cpp +++ b/src/render/texture/textureimage.cpp @@ -53,7 +53,7 @@ TextureImage::TextureImage() : BackendNode() , m_layer(0) , m_mipLevel(0) - , m_face(QAbstractTextureProvider::CubeMapPositiveX) + , m_face(QAbstractTexture::CubeMapPositiveX) , m_dirty(true) , m_textureManager(Q_NULLPTR) , m_textureImageManager(Q_NULLPTR) @@ -67,7 +67,7 @@ void TextureImage::cleanup() m_layer = 0; m_mipLevel = 0; m_dirty = true; - m_face = QAbstractTextureProvider::CubeMapPositiveX; + m_face = QAbstractTexture::CubeMapPositiveX; m_generator.reset(); m_textureManager = Q_NULLPTR; m_textureImageManager = Q_NULLPTR; @@ -85,7 +85,7 @@ void TextureImage::updateFromPeer(Qt3DCore::QNode *peer) m_generator = textureImage->dataGenerator(); // Notify the Texture that we are one of its TextureImage if (!peer->parentNode()) { - qWarning() << "Not QAbstractTextureProvider parent found"; + qWarning() << "Not QAbstractTexture parent found"; } else { m_textureProviderId = peer->parentNode()->id(); m_textureProvider = m_textureManager->lookupHandle(m_textureProviderId); @@ -109,7 +109,7 @@ void TextureImage::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) m_mipLevel = propertyChange->value().toInt(); m_dirty = true; } else if (propertyChange->propertyName() == QByteArrayLiteral("face")) { - m_face = static_cast<QAbstractTextureProvider::CubeMapFace>(propertyChange->value().toInt()); + m_face = static_cast<QAbstractTexture::CubeMapFace>(propertyChange->value().toInt()); m_dirty = true; } else if (propertyChange->propertyName() == QByteArrayLiteral("dataFunctor")) { m_generator = propertyChange->value().value<QTextureImageDataGeneratorPtr>(); |