summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-11-03 13:05:31 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-11-03 13:07:23 (GMT)
commit4d0735b98a9bd6b440adf63725e6062b601ed442 (patch)
treeda41b73861ce7bd7ee635846b7100a4643307196
parent4c011468bb93a3d0b8e5cc0d9dd16e7528079119 (diff)
downloadQt-4d0735b98a9bd6b440adf63725e6062b601ed442.zip
Qt-4d0735b98a9bd6b440adf63725e6062b601ed442.tar.gz
Qt-4d0735b98a9bd6b440adf63725e6062b601ed442.tar.bz2
Check for QPixmap::isNull() in QPainter::drawPixmap()
Reviewed-by: Samuel
-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 8d6cad3..cbae5b6 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -5164,7 +5164,7 @@ void QPainter::drawPixmap(const QPointF &p, const QPixmap &pm)
Q_D(QPainter);
- if (!d->engine)
+ if (!d->engine || pm.isNull())
return;
#ifndef QT_NO_DEBUG