summaryrefslogtreecommitdiffstats
path: root/src/render/texture/qtextureimage.h
diff options
context:
space:
mode:
authorRobert Brock <robert.brock@kdab.com>2016-04-05 14:00:50 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-04-16 14:45:07 +0000
commit8eca0d465e6d30283fb41ba631f60c03d5047ef2 (patch)
treead8110ee37bcbd01b6c4a3bb970c73884ade8a30 /src/render/texture/qtextureimage.h
parent4e7201f5e2983bce2dfb672a03e2cec38b074b34 (diff)
QTextureImage changes and added property
Status property added (added None) Made dataGenerator private Change-Id: Id8de22911a119ed266708a77aa188a7ef1b2d41c Task-number: QTBUG-51429 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/texture/qtextureimage.h')
-rw-r--r--src/render/texture/qtextureimage.h15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h
index 7dfb517cc..c678d25f5 100644
--- a/src/render/texture/qtextureimage.h
+++ b/src/render/texture/qtextureimage.h
@@ -53,25 +53,36 @@ class QT3DRENDERSHARED_EXPORT QTextureImage : public QAbstractTextureImage
{
Q_OBJECT
Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+ Q_PROPERTY(Status status READ status NOTIFY statusChanged)
public:
explicit QTextureImage(Qt3DCore::QNode *parent = 0);
~QTextureImage();
- QUrl source() const;
+ enum Status {
+ None = 0,
+ Loading,
+ Ready,
+ Error
+ };
+ Q_ENUM(Status)
- QTextureImageDataGeneratorPtr dataGenerator() const Q_DECL_OVERRIDE;
+ QUrl source() const;
+ Status status() const;
public Q_SLOTS:
void setSource(const QUrl &source);
Q_SIGNALS:
void sourceChanged(const QUrl &source);
+ void statusChanged(Status status);
protected:
void copy(const Qt3DCore::QNode *ref) Q_DECL_OVERRIDE;
+ void setStatus(Status status);
private:
+ QTextureImageDataGeneratorPtr dataGenerator() const Q_DECL_OVERRIDE;
Q_DECLARE_PRIVATE(QTextureImage)
QT3D_CLONEABLE(QTextureImage)
};