aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/scenegraph
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2011-05-12 15:43:29 +1000
committerAlan Alpert <alan.alpert@nokia.com>2011-05-12 15:43:29 +1000
commit108f7cec20c105c07a34cded24fc1632b86e15c2 (patch)
tree38c012d199484a666a9d39f6715d39935066e6d4 /src/declarative/scenegraph
parentf7d3d68c60f247f9b44ece7c9c41e51baf927b99 (diff)
Upgrade Flickr demo to QtQuick 2.
And throw in particle effects. Includes a variety of fixes to modelparticle and picture affector which were arrived at during this demo.
Diffstat (limited to 'src/declarative/scenegraph')
-rw-r--r--src/declarative/scenegraph/util/qsgtexture_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/scenegraph/util/qsgtexture_p.h b/src/declarative/scenegraph/util/qsgtexture_p.h
index 2c142f5746..d504732f35 100644
--- a/src/declarative/scenegraph/util/qsgtexture_p.h
+++ b/src/declarative/scenegraph/util/qsgtexture_p.h
@@ -89,6 +89,7 @@ public:
bool hasMipmaps() const { return m_has_mipmaps; }
void setImage(const QImage &image);
+ const QImage &image() { return m_image; }
virtual void bind();