diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 14:25:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-18 14:25:36 (GMT) |
| commit | e31fd006d30f4b45cc592b2bb549b63d2c7e6832 (patch) | |
| tree | 0eb64e35b49013d6298983ef9b75a2bd93c6c503 /src/gui | |
| parent | b7be5ff78bb45ed6c0a24fc0f9398c581382d9a0 (diff) | |
| parent | c354bc1d567874dd58db6abecf9d5796dfd721be (diff) | |
| download | Qt-e31fd006d30f4b45cc592b2bb549b63d2c7e6832.zip Qt-e31fd006d30f4b45cc592b2bb549b63d2c7e6832.tar.gz Qt-e31fd006d30f4b45cc592b2bb549b63d2c7e6832.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 broken drawing with large fonts using QStaticText and FreeType
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index c74ecc8..c4e89d5 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -909,7 +909,7 @@ QFontEngineFT::Glyph *QFontEngineFT::loadGlyph(QGlyphSet *set, uint glyph, Glyph } } - if (default_hint_style == HintNone) + if (default_hint_style == HintNone || set->outline_drawing) load_flags |= FT_LOAD_NO_HINTING; else load_flags |= load_target; |