diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-22 09:56:54 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-22 09:56:54 +0200 |
| commit | 1ffc19d083a82c3f717e4f091a3af7b0241b6a6d (patch) | |
| tree | eefe2453f2eac59051c6897398b3315a5e7a9a19 /src/gui/painting/qtextureglyphcache.cpp | |
| parent | a7fa1c6b5de21cbfeb3c6637b3d0bca9ca9d00ba (diff) | |
| parent | eb7fad0afd164bb9b56ed47990eaa66cad0c2641 (diff) | |
Merge branch 'master' of git:qt/oslo-staging-2
Conflicts:
src/gui/painting/qtextureglyphcache.cpp
Diffstat (limited to 'src/gui/painting/qtextureglyphcache.cpp')
| -rw-r--r-- | src/gui/painting/qtextureglyphcache.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index 631a9cf8fa..bf57460239 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -140,6 +140,7 @@ 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) { |