aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickspriteimage.cpp
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-01-25 19:18:25 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-09 07:32:07 +0100
commit298b86b95bd42d12e15e8d8a137cd9bee21d6094 (patch)
tree6ac8ee1d463f419966d64756452849d36913a885 /src/quick/items/qquickspriteimage.cpp
parent3233e8052d2d25fd36567f67f9cd314cf0eaef92 (diff)
Use QDeclarativePixmap in the Particle System
This allows for source URLs to come from network sources. Change-Id: I416edca010e77e507598eaf4eead4291f044f379 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/qquickspriteimage.cpp')
-rw-r--r--src/quick/items/qquickspriteimage.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/quick/items/qquickspriteimage.cpp b/src/quick/items/qquickspriteimage.cpp
index 755c41d031..1b3b57710a 100644
--- a/src/quick/items/qquickspriteimage.cpp
+++ b/src/quick/items/qquickspriteimage.cpp
@@ -49,6 +49,7 @@
#include <QtQuick/qsgtexturematerial.h>
#include <QtQuick/qsgtexture.h>
#include <QtQuick/qquickcanvas.h>
+#include <QtDeclarative/qdeclarativeinfo.h>
#include <QFile>
#include <cmath>
#include <qmath.h>
@@ -324,7 +325,14 @@ static QSGGeometry::AttributeSet SpriteImage_AttributeSet =
QSGGeometryNode* QQuickSpriteImage::buildNode()
{
if (!m_spriteEngine) {
- qWarning() << "SpriteImage: No sprite engine...";
+ qmlInfo(this) << "No sprite engine...";
+ return 0;
+ } else if (m_spriteEngine->status() == QDeclarativePixmap::Null) {
+ m_spriteEngine->startAssemblingImage();
+ update();//Schedule another update, where we will check again
+ return 0;
+ } else if (m_spriteEngine->status() == QDeclarativePixmap::Loading) {
+ update();//Schedule another update, where we will check again
return 0;
}