summaryrefslogtreecommitdiffstats
path: root/src/render/texture/qtextureimage.cpp
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.cpp
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.cpp')
-rw-r--r--src/render/texture/qtextureimage.cpp27
1 files changed, 15 insertions, 12 deletions
diff --git a/src/render/texture/qtextureimage.cpp b/src/render/texture/qtextureimage.cpp
index 7b07c0dc1..02d1a5b5e 100644
--- a/src/render/texture/qtextureimage.cpp
+++ b/src/render/texture/qtextureimage.cpp
@@ -45,18 +45,6 @@ QT_BEGIN_NAMESPACE
namespace Qt3DRender {
-class QTextureImagePrivate : public QAbstractTextureImagePrivate
-{
-public:
- QTextureImagePrivate()
- : QAbstractTextureImagePrivate()
- {
- }
-
- Q_DECLARE_PUBLIC(QTextureImage)
- QUrl m_source;
-};
-
/*!
\class Qt3DRender::QTextureImage
\inmodule Qt3DRender
@@ -103,6 +91,12 @@ QUrl QTextureImage::source() const
return d->m_source;
}
+QTextureImage::Status QTextureImage::status() const
+{
+ Q_D(const QTextureImage);
+ return d->m_status;
+}
+
/*!
\property Qt3DRender::QTextureImage::source
@@ -131,6 +125,15 @@ void QTextureImage::setSource(const QUrl &source)
}
}
+void QTextureImage::setStatus(Status status)
+{
+ Q_D(QTextureImage);
+ if (status != d->m_status) {
+ d->m_status = status;
+ emit statusChanged(status);
+ }
+}
+
/*!
Returns the Qt3DRender::QTextureImageDataGeneratorPtr functor to be used by the
backend to load the texture image data into an OpenGL texture object.