summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-08-30 15:08:48 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-08-30 15:16:49 (GMT)
commitd0f1f569e27f7f34f3bfc03bd759f28f7b567997 (patch)
treeec3206d045f5cdb51ff98245d30988f64d9dbbad
parentd17a1cd32b4577a96245ac9894f678486443a516 (diff)
downloadQt-d0f1f569e27f7f34f3bfc03bd759f28f7b567997.zip
Qt-d0f1f569e27f7f34f3bfc03bd759f28f7b567997.tar.gz
Qt-d0f1f569e27f7f34f3bfc03bd759f28f7b567997.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
-rw-r--r--src/gui/painting/qpainter.cpp3
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;