summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorJoona Petrell <joona.t.petrell@nokia.com>2010-11-30 01:37:09 (GMT)
committerJoona Petrell <joona.t.petrell@nokia.com>2010-11-30 02:08:20 (GMT)
commit282441f72a7704aadc5525a360430d0c3d49aea6 (patch)
tree45e07dd72accbcaf5c75550f7e7b292010f13a56 /src/declarative
parente960316477982d21061ca8894109f1f8426b2dec (diff)
downloadQt-282441f72a7704aadc5525a360430d0c3d49aea6.zip
Qt-282441f72a7704aadc5525a360430d0c3d49aea6.tar.gz
Qt-282441f72a7704aadc5525a360430d0c3d49aea6.tar.bz2
Don't draw null pixmap in QDeclarativeImage paint function
Task-number: QTBUG-15690 Reviewed-by: Martin Jones
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/graphicsitems/qdeclarativeimage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index 3b08a9b..aa74716 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -461,7 +461,7 @@ QRectF QDeclarativeImage::boundingRect() const
void QDeclarativeImage::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
{
Q_D(QDeclarativeImage);
- if (d->pix.isNull())
+ if (d->pix.pixmap().isNull() )
return;
bool oldAA = p->testRenderHint(QPainter::Antialiasing);