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/qabstracttextureimage.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/qabstracttextureimage.cpp')
| -rw-r--r-- | src/render/texture/qabstracttextureimage.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/render/texture/qabstracttextureimage.cpp b/src/render/texture/qabstracttextureimage.cpp index d2c8ad748..0f8af8d58 100644 --- a/src/render/texture/qabstracttextureimage.cpp +++ b/src/render/texture/qabstracttextureimage.cpp @@ -65,7 +65,7 @@ namespace Qt3DRender { \brief Encapsulates the necessary information to create an OpenGL texture image. QAbstractTextureImage should be used as the means of providing image data to a - QAbstractTextureProvider. It contains the necessary information: mipmap + QAbstractTexture. It contains the necessary information: mipmap level, layer, cube face load at the proper place data into an OpenGL texture. The actual data is provided through a QTextureImageDataGenerator that will be @@ -141,8 +141,8 @@ int QAbstractTextureImage::layer() const \value CubeMapNegativeZ 0x851A GL_TEXTURE_CUBE_MAP_NEGATIVE_Z \note The cube map face has a meaning only for - \l [CPP] {Qt3DRender::QAbstractTextureProvider::}{TargetCubeMap} and - \l [CPP] {Qt3DRender::QAbstractTextureProvider::}{TargetCubeMapArray}. + \l [CPP] {Qt3DRender::QAbstractTexture::}{TargetCubeMap} and + \l [CPP] {Qt3DRender::QAbstractTexture::}{TargetCubeMapArray}. */ /*! @@ -151,10 +151,10 @@ int QAbstractTextureImage::layer() const Holds the cube map face of the texture image. \note The cube map face has a meaning only for - \l {QAbstractTextureProvider::}{TargetCubeMap} and - \l {QAbstractTextureProvider::}{TargetCubeMapArray}. + \l {QAbstractTexture::}{TargetCubeMap} and + \l {QAbstractTexture::}{TargetCubeMapArray}. */ -QAbstractTextureProvider::CubeMapFace QAbstractTextureImage::face() const +QAbstractTexture::CubeMapFace QAbstractTextureImage::face() const { Q_D(const QAbstractTextureImage); return d->m_face; @@ -178,7 +178,7 @@ void QAbstractTextureImage::setLayer(int layer) } } -void QAbstractTextureImage::setFace(QAbstractTextureProvider::CubeMapFace face) +void QAbstractTextureImage::setFace(QAbstractTexture::CubeMapFace face) { Q_D(QAbstractTextureImage); if (face != d->m_face) { |