summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2010-01-27 13:58:29 (GMT)
committerSami Merila <sami.merila@nokia.com>2010-01-27 13:58:29 (GMT)
commitc82f5cc9f281fcac3c1f66d20c1e2690f7bc636e (patch)
tree23ade5eff0ae7306fd99adc34520a5c101b4f6f2 /src/gui
parent78bb23107d9fcde431cd2ba83c1a9e9886b6d51a (diff)
parent41ff82566a360a478766ee16e72958f5441947fc (diff)
downloadQt-c82f5cc9f281fcac3c1f66d20c1e2690f7bc636e.zip
Qt-c82f5cc9f281fcac3c1f66d20c1e2690f7bc636e.tar.gz
Qt-c82f5cc9f281fcac3c1f66d20c1e2690f7bc636e.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/gui')
-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;