summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine.cpp
diff options
context:
space:
mode:
authorA-Team <ateam@pad.test.qt.nokia.com>2010-09-13 22:00:15 (GMT)
committerA-Team <ateam@pad.test.qt.nokia.com>2010-09-13 22:00:15 (GMT)
commit8399cce50eb11db885e67a52055505951309cae8 (patch)
tree56518186c2835fadec353feef725328f85ba4e25 /src/gui/text/qfontengine.cpp
parent0e4083ba5bf1bbc581d072b016fb977fb1f846c1 (diff)
parent870ecb5b44a56b29d16a4819c2d92298801cf98f (diff)
downloadQt-8399cce50eb11db885e67a52055505951309cae8.zip
Qt-8399cce50eb11db885e67a52055505951309cae8.tar.gz
Qt-8399cce50eb11db885e67a52055505951309cae8.tar.bz2
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/gui/text/qfontengine.cpp')
-rw-r--r--src/gui/text/qfontengine.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index 569853c..0dfd295 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -631,10 +631,10 @@ QImage QFontEngine::alphaMapForGlyph(glyph_t glyph)
if (glyph_width <= 0 || glyph_height <= 0)
return QImage();
QFixedPoint pt;
- pt.x = 0;
+ pt.x = -glyph_x;
pt.y = -glyph_y; // the baseline
QPainterPath path;
- QImage im(glyph_width + qAbs(glyph_x) + 4, glyph_height, QImage::Format_ARGB32_Premultiplied);
+ QImage im(glyph_width + 4, glyph_height, QImage::Format_ARGB32_Premultiplied);
im.fill(Qt::transparent);
QPainter p(&im);
p.setRenderHint(QPainter::Antialiasing);