diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-08-30 15:08:48 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-02 06:03:21 (GMT) |
| commit | 806282f3f9c5d3ed26a0bfae2c512f9346186971 (patch) | |
| tree | b14fec8d044adfbf416a04cafaa51be327c08716 /src/gui | |
| parent | 704e71882d09e30cef4d620cebba60ba1c0d85c0 (diff) | |
| download | Qt-806282f3f9c5d3ed26a0bfae2c512f9346186971.zip Qt-806282f3f9c5d3ed26a0bfae2c512f9346186971.tar.gz Qt-806282f3f9c5d3ed26a0bfae2c512f9346186971.tar.bz2 | |
Fix QStaticText with OpenGL1 engine
Like OpenGL2 and OpenVG, the OpenGL1 paint engine also transforms text
coordinates itself and does not require QStaticText to use device
coordinates.
Task-number: QTBUG-13228
Reviewed-by: Samuel
(cherry picked from commit d0f1f569e27f7f34f3bfc03bd759f28f7b567997)
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index ee590a4..4e10671 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; |