summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTrond Kjernåsen <trond.kjernasen@nokia.com>2010-09-01 10:33:55 (GMT)
committerTrond Kjernåsen <trond.kjernasen@nokia.com>2010-09-01 10:36:29 (GMT)
commitdcb98430f6add24c9d54253bd35d35010cc75c23 (patch)
tree6544e5fa12dfaa527ee13689357529a6afc547e2 /src
parentbc0c6e9bb53f935c659dda90c7968d7738705f38 (diff)
downloadQt-dcb98430f6add24c9d54253bd35d35010cc75c23.zip
Qt-dcb98430f6add24c9d54253bd35d35010cc75c23.tar.gz
Qt-dcb98430f6add24c9d54253bd35d35010cc75c23.tar.bz2
Fix a crash when passing a null pixmap to QPainter::drawPixmapFragments().
Task-number: QTBUG-13331 Reviewed-by: Samuel
Diffstat (limited to 'src')
-rw-r--r--src/gui/painting/qpainter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 4e10671..c6046ac 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -9028,7 +9028,7 @@ void QPainter::drawPixmapFragments(const PixmapFragment *fragments, int fragment
{
Q_D(QPainter);
- if (!d->engine)
+ if (!d->engine || pixmap.isNull())
return;
#ifndef QT_NO_DEBUG