diff options
| author | Charles Yin <charles.yin@nokia.com> | 2011-12-07 13:04:20 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-07 04:21:06 +0100 |
| commit | 65b2bcf4e6317d29294a389531e8d63d33f2a5b8 (patch) | |
| tree | 87b6d2b95b69504d65b0882c995ee2861bc0142c /src/quick/items/context2d | |
| parent | 2b0d21a27763f065ea91632f00019c6629edd7d1 (diff) | |
Remove warning messages for canvasitem tests
1) The null image warnings can be safely ignored as the images are
expected to be null
2) Check the isLoading() before calling QDeclarativePixmap::connectFinished()
Change-Id: I58339f40495fb62c73b217aca35cdd7effd8c917
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src/quick/items/context2d')
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index 32809babed..e8decdc4ed 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -577,7 +577,8 @@ void QQuickCanvasItem::loadImage(const QUrl& url) pix->load(qmlEngine(this) , fullPathUrl , QDeclarativePixmap::Cache | QDeclarativePixmap::Asynchronous); - pix->connectFinished(this, SIGNAL(imageLoaded())); + if (pix->isLoading()) + pix->connectFinished(this, SIGNAL(imageLoaded())); } } /*! |