From 65b2bcf4e6317d29294a389531e8d63d33f2a5b8 Mon Sep 17 00:00:00 2001 From: Charles Yin Date: Wed, 7 Dec 2011 13:04:20 +1000 Subject: 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 --- tests/auto/qtquick2/qquickcanvasitem/data/tst_drawimage.qml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tests/auto/qtquick2/qquickcanvasitem/data/tst_drawimage.qml') 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'; -- cgit v1.2.3