diff options
| author | aavit <qt-info@nokia.com> | 2011-06-09 07:36:34 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-06-09 07:36:34 (GMT) |
| commit | 161fd33b199c96a92fbda4b009e85f910f73acc0 (patch) | |
| tree | 736e139d09f8cf8fee5fa4315fb3381d5c4f492b /src/gui/text/qfontengine_ft.cpp | |
| parent | 809fc41c9b19388a21ee8e23601156579780cda3 (diff) | |
| parent | 3916feefc5ebadba3320029a29ecf02d8934e879 (diff) | |
| download | Qt-161fd33b199c96a92fbda4b009e85f910f73acc0.zip Qt-161fd33b199c96a92fbda4b009e85f910f73acc0.tar.gz Qt-161fd33b199c96a92fbda4b009e85f910f73acc0.tar.bz2 | |
Merge remote branch 'qt-mainline/4.8'
Diffstat (limited to 'src/gui/text/qfontengine_ft.cpp')
| -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 776615c..39abbd6 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -795,7 +795,7 @@ int QFontEngineFT::loadFlags(QGlyphSet *set, GlyphFormat format, int flags, if (set && set->outline_drawing) load_flags = FT_LOAD_NO_BITMAP; - if (default_hint_style == HintNone || (flags & HB_ShaperFlag_UseDesignMetrics)) + if (default_hint_style == HintNone || (flags & HB_ShaperFlag_UseDesignMetrics) || set->outline_drawing) load_flags |= FT_LOAD_NO_HINTING; else load_flags |= load_target; |