summaryrefslogtreecommitdiffstats
path: root/src/render/texture/qabstracttextureimage.h
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-03-18 10:41:10 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-04-06 15:30:27 +0000
commite6741fa7d5b2afb27138b2eadcc9f16c43d854aa (patch)
tree9b0b26a52a3cdc8185ab9802b8c7648a12cc7063 /src/render/texture/qabstracttextureimage.h
parent854f14cfa59b5ad8f3c7f9146c01c753ce6d4481 (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.h')
-rw-r--r--src/render/texture/qabstracttextureimage.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h
index f0194f989..5a88efc7b 100644
--- a/src/render/texture/qabstracttextureimage.h
+++ b/src/render/texture/qabstracttextureimage.h
@@ -41,7 +41,7 @@
#define QT3DRENDER_QABSTRACTTEXTUREIMAGE_H
#include <Qt3DRender/qabstractfunctor.h>
-#include <Qt3DRender/qabstracttextureprovider.h>
+#include <Qt3DRender/qabstracttexture.h>
QT_BEGIN_NAMESPACE
@@ -72,24 +72,24 @@ class QT3DRENDERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::QNode
Q_OBJECT
Q_PROPERTY(int mipLevel READ mipLevel WRITE setMipLevel NOTIFY mipLevelChanged)
Q_PROPERTY(int layer READ layer WRITE setLayer NOTIFY layerChanged)
- Q_PROPERTY(Qt3DRender::QAbstractTextureProvider::CubeMapFace face READ face WRITE setFace NOTIFY faceChanged)
+ Q_PROPERTY(Qt3DRender::QAbstractTexture::CubeMapFace face READ face WRITE setFace NOTIFY faceChanged)
public:
explicit QAbstractTextureImage(Qt3DCore::QNode *parent = 0);
virtual ~QAbstractTextureImage();
int mipLevel() const;
int layer() const;
- QAbstractTextureProvider::CubeMapFace face() const;
+ QAbstractTexture::CubeMapFace face() const;
public Q_SLOTS:
void setMipLevel(int level);
void setLayer(int layer);
- void setFace(QAbstractTextureProvider::CubeMapFace face);
+ void setFace(QAbstractTexture::CubeMapFace face);
Q_SIGNALS:
void mipLevelChanged(int mipLevel);
void layerChanged(int layer);
- void faceChanged(QAbstractTextureProvider::CubeMapFace face);
+ void faceChanged(QAbstractTexture::CubeMapFace face);
protected:
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;