From: Alan Alpert Date: Tue, 1 May 2012 06:19:06 +0000 (+1000) Subject: Print sprite errors only once X-Git-Tag: upstream/5.2.1~1888 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f2502e261155685ac7a4a2ec085c4524e23db278;p=platform%2Fupstream%2Fqtdeclarative.git Print sprite errors only once Change-Id: I1dfb829d47cfdb5c5af3f3bc5956483ea6ef6314 Reviewed-by: Michael Brasser --- diff --git a/src/quick/items/qquickspriteengine.cpp b/src/quick/items/qquickspriteengine.cpp index 1763d7a..724d134 100644 --- a/src/quick/items/qquickspriteengine.cpp +++ b/src/quick/items/qquickspriteengine.cpp @@ -348,6 +348,7 @@ void QQuickSpriteEngine::startAssemblingImage() if (m_startedImageAssembly) return; m_loaded = false; + m_errorsPrinted = false; //This could also trigger the start of the image loading in Sprites, however that currently happens in Sprite::setSource @@ -370,10 +371,12 @@ void QQuickSpriteEngine::startAssemblingImage() QImage QQuickSpriteEngine::assembledImage() { QQuickPixmap::Status stat = status(); - if (stat == QQuickPixmap::Error) + if (!m_errorsPrinted && stat == QQuickPixmap::Error) { foreach (QQuickSprite* s, m_sprites) if (s->m_pix.isError()) qmlInfo(s) << s->m_pix.error(); + m_errorsPrinted = true; + } if (stat != QQuickPixmap::Ready) return QImage(); diff --git a/src/quick/items/qquickspriteengine_p.h b/src/quick/items/qquickspriteengine_p.h index d78a103..996ed5e 100644 --- a/src/quick/items/qquickspriteengine_p.h +++ b/src/quick/items/qquickspriteengine_p.h @@ -295,6 +295,7 @@ private: QList m_sprites; bool m_startedImageAssembly; bool m_loaded; + bool m_errorsPrinted; }; //Common use is to have your own list property which is transparently an engine