summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
diff options
context:
space:
mode:
authorJiang Jiang <jiang.jiang@nokia.com>2011-04-19 10:48:19 (GMT)
committerJiang Jiang <jiang.jiang@nokia.com>2011-04-19 11:00:26 (GMT)
commitb86c9120710bf1481df5f6541618169a82fd65b8 (patch)
treeb3fb5ae13b226dc9d5fb88b5a8cb9d8c12c71a8a /src/gui/painting
parent0201d5f5a8c95bd4f6b94726ed0db2b83cd3efc7 (diff)
downloadQt-b86c9120710bf1481df5f6541618169a82fd65b8.zip
Qt-b86c9120710bf1481df5f6541618169a82fd65b8.tar.gz
Qt-b86c9120710bf1481df5f6541618169a82fd65b8.tar.bz2
Don't transform glyph positions for Core Graphics paint engine
Since it already transformed text positions based on transform matrix on QPainter. Reviewed-by: Eskil
Diffstat (limited to 'src/gui/painting')
-rw-r--r--src/gui/painting/qpainter.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index cbd16ae..25bf6be 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -156,7 +156,8 @@ static bool qt_paintengine_supports_transformations(QPaintEngine::Type type)
{
return type == QPaintEngine::OpenGL2
|| type == QPaintEngine::OpenVG
- || type == QPaintEngine::OpenGL;
+ || type == QPaintEngine::OpenGL
+ || type == QPaintEngine::CoreGraphics;
}
#ifndef QT_NO_DEBUG
@@ -5817,7 +5818,7 @@ void QPainter::drawGlyphs(const QPointF &position, const QGlyphs &glyphs)
bool paintEngineSupportsTransformations =
d->extended != 0
? qt_paintengine_supports_transformations(d->extended->type())
- : false;
+ : qt_paintengine_supports_transformations(d->engine->type());
for (int i=0; i<count; ++i) {
QPointF processedPosition = position + glyphPositions.at(i);
if (!paintEngineSupportsTransformations)