diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-04-22 13:38:28 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-04-22 13:38:28 (GMT) |
| commit | e102acd25673f0fd6e281f3244093200c8802c90 (patch) | |
| tree | 78a1b011561326ec4e030fd43c679ffe0f6f2582 /src | |
| parent | 1ffc19d083a82c3f717e4f091a3af7b0241b6a6d (diff) | |
| download | Qt-e102acd25673f0fd6e281f3244093200c8802c90.zip Qt-e102acd25673f0fd6e281f3244093200c8802c90.tar.gz Qt-e102acd25673f0fd6e281f3244093200c8802c90.tar.bz2 | |
Fix merge of qtextureglyphcache.cpp
The merge in 1ffc19d083a82c3f717e4f091a3af7b0241b6a6d introdcued
two different versions of the m_cy calculation simultaneously. Remove
the older version and keep the new.
Reviewed-by: TrustMe
Diffstat (limited to 'src')
| -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) { |