diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-25 19:34:42 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-25 19:34:42 (GMT) |
| commit | c2f6fe50c06e4285085db17ea3a9d9254cf21f48 (patch) | |
| tree | c16d1e4c72d8cac087b193a605d04918c497b73b /src/gui | |
| parent | 482437316b5deb6ff10577283016fb713cf92efc (diff) | |
| parent | a51a29e9f7b63fcefcdf9e9069e219726db1250e (diff) | |
| download | Qt-c2f6fe50c06e4285085db17ea3a9d9254cf21f48.zip Qt-c2f6fe50c06e4285085db17ea3a9d9254cf21f48.tar.gz Qt-c2f6fe50c06e4285085db17ea3a9d9254cf21f48.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix possible artifacts under glyphs in texture glyph cache
Fix QTBUG-13928 non flat mode for project files in VS2010.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qtextureglyphcache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index 2daa1f0..eab9cf6 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -143,7 +143,7 @@ bool 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_currentRowHeight = 0; // New row + m_currentRowHeight = c.h + margin * 2; // New row } } if (m_cy + c.h > m_h) { |