summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qfontengine.cpp
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-01 15:36:05 (GMT)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>2010-02-01 15:36:05 (GMT)
commit7e8d20de90af2e5ea199b6a92830cc223cea777b (patch)
tree89364f787fad44c2fdea1de6358140c568a82e7a /src/gui/text/qfontengine.cpp
parentf3cf5dd98e321980984288a1768f3375a8349800 (diff)
parentafe0f17eb5974adbedd1bc1f2fcd98459d92df47 (diff)
downloadQt-7e8d20de90af2e5ea199b6a92830cc223cea777b.zip
Qt-7e8d20de90af2e5ea199b6a92830cc223cea777b.tar.gz
Qt-7e8d20de90af2e5ea199b6a92830cc223cea777b.tar.bz2
Merge branch '4.6' into qstatictext-4.6
Diffstat (limited to 'src/gui/text/qfontengine.cpp')
-rw-r--r--src/gui/text/qfontengine.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index 9343cb7..c000457 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -357,9 +357,6 @@ void QFontEngine::getGlyphPositions(const QGlyphLayout &glyphs, const QTransform
++i;
}
} else {
- positions.resize(glyphs.numGlyphs);
- glyphs_out.resize(glyphs.numGlyphs);
- int i = 0;
while (i < glyphs.numGlyphs) {
if (!glyphs.attributes[i].dontPrint) {
QFixed gpos_x = xpos + glyphs.offsets[i].x;