diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-27 00:39:02 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-11-27 00:39:02 (GMT) |
| commit | 0f9ab237626adbd83c29cf6579aeb74f101d22ea (patch) | |
| tree | 6b4a1f345d7643f17b6eed5a6e5d18fd9394e711 | |
| parent | 318df8e82c231eccb7d22b5e9bc2e1cba51551f4 (diff) | |
| parent | ee0690cdf553b6cf22432488ea113209203fe1ce (diff) | |
| download | Qt-0f9ab237626adbd83c29cf6579aeb74f101d22ea.zip Qt-0f9ab237626adbd83c29cf6579aeb74f101d22ea.tar.gz Qt-0f9ab237626adbd83c29cf6579aeb74f101d22ea.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 97f3dd4..d048d51 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -5182,7 +5182,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 |