diff options
| author | Trond Kjernåsen <trond.kjernasen@nokia.com> | 2010-09-01 10:33:55 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-03 03:22:27 (GMT) |
| commit | 1c119d7ba29cd034f57d32752e09cadfe0f58298 (patch) | |
| tree | 1ef4b11e1a7f14853497fa2b148b1d0f57fd617c | |
| parent | 6268e104ba84761ab8e8fb633ff61a27a9524844 (diff) | |
| download | Qt-1c119d7ba29cd034f57d32752e09cadfe0f58298.zip Qt-1c119d7ba29cd034f57d32752e09cadfe0f58298.tar.gz Qt-1c119d7ba29cd034f57d32752e09cadfe0f58298.tar.bz2 | |
Fix a crash when passing a null pixmap to QPainter::drawPixmapFragments().
Task-number: QTBUG-13331
Reviewed-by: Samuel
(cherry picked from commit dcb98430f6add24c9d54253bd35d35010cc75c23)
| -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 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 |