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 | |
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>
-rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 3 | ||||
-rw-r--r-- | tests/auto/qtquick2/qquickcanvasitem/data/tst_drawimage.qml | 7 |
2 files changed, 8 insertions, 2 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())); } } /*! diff --git a/tests/auto/qtquick2/qquickcanvasitem/data/tst_drawimage.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_drawimage.qml index 3752f528be..102217dc0c 100644 --- a/tests/auto/qtquick2/qquickcanvasitem/data/tst_drawimage.qml +++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_drawimage.qml @@ -129,6 +129,8 @@ Canvas { function test_self() { var ctx = canvas.getContext('2d'); ctx.reset(); + ignoreWarning("QImage::scaled: Image is a null image"); + ignoreWarning("QImage::scaled: Image is a null image"); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 50, 50); @@ -258,7 +260,10 @@ Canvas { function test_nonfinite() { var ctx = canvas.getContext('2d'); ctx.reset(); - + ignoreWarning("QImage::scaled: Image is a null image"); + ignoreWarning("QImage::scaled: Image is a null image"); + ignoreWarning("QImage::scaled: Image is a null image"); + ignoreWarning("QImage::scaled: Image is a null image"); ctx.fillStyle = '#0f0'; ctx.fillRect(0, 0, 100, 50); var red = 'red.png'; |