diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-03 06:54:51 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-09-03 06:54:51 (GMT) |
| commit | e7935dc46fcc062b28cc3aa385f389fa3842b190 (patch) | |
| tree | 1559e188c8a4f3f149d5880e52f31ee996f4be2b /src/gui/painting/qpainter.cpp | |
| parent | 54796e0d3150df7dd94e715c095c21fb227139ee (diff) | |
| parent | fc4d386f2cc8984b98957d83d8cdb57c1105890f (diff) | |
| download | Qt-e7935dc46fcc062b28cc3aa385f389fa3842b190.zip Qt-e7935dc46fcc062b28cc3aa385f389fa3842b190.tar.gz Qt-e7935dc46fcc062b28cc3aa385f389fa3842b190.tar.bz2 | |
Merge commit 'staging-1/4.7' into doc-4.7
Diffstat (limited to 'src/gui/painting/qpainter.cpp')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index b7eaf85..12be93e 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -5863,7 +5863,8 @@ void QPainter::drawStaticText(const QPointF &topLeftPosition, const QStaticText } bool paintEngineSupportsTransformations = d->extended->type() == QPaintEngine::OpenGL2 - || d->extended->type() == QPaintEngine::OpenVG; + || d->extended->type() == QPaintEngine::OpenVG + || d->extended->type() == QPaintEngine::OpenGL; if (paintEngineSupportsTransformations && !staticText_d->untransformedCoordinates) { staticText_d->untransformedCoordinates = true; @@ -9027,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 |