diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-22 18:36:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-22 18:36:23 (GMT) |
| commit | 8e2d924c9f68c1994b68a4a5bcf67f9ef0159cdc (patch) | |
| tree | 6f0d784efbda4964f75cc7014be622843771e23c | |
| parent | 315ea8d679d4c600db8ca85aad37c99590d090bc (diff) | |
| parent | 2dc7fa153b39f7d3b5e88a50122d2135d55b4ea9 (diff) | |
| download | Qt-8e2d924c9f68c1994b68a4a5bcf67f9ef0159cdc.zip Qt-8e2d924c9f68c1994b68a4a5bcf67f9ef0159cdc.tar.gz Qt-8e2d924c9f68c1994b68a4a5bcf67f9ef0159cdc.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix merge of qtextureglyphcache.cpp
| -rw-r--r-- | src/gui/painting/qtextureglyphcache.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index bf57460..631a9cf 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -140,7 +140,6 @@ void QTextureGlyphCache::populate(QFontEngine *fontEngine, int numGlyphs, const // no room on the current line, start new glyph strip m_cx = 0; m_cy += m_currentRowHeight + paddingDoubled; - m_cy += rowHeight; m_currentRowHeight = 0; // New row } if (m_cy + c.h > m_h) { |