diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-08-20 10:13:44 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-08-21 17:31:33 +0200 |
| commit | b78e81f7c23a557a31ad649b33d85eed9a697281 (patch) | |
| tree | d14639d84e65548ab5d5ea480a0b2a0c43644b30 /src/gui | |
| parent | 6b12d781faf3802e336923ddc43a822da7546989 (diff) | |
Outline drawing should not override the default freetype loadflags
We set FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH as the default load flags
for freetype fonts, but due to using = instead of =| the default flags
gets overridden when outline drawing sets FT_LOAD_NO_BITMAP.
Change-Id: I26b45aa2bbf613689d278eb07ae028ef9757023c
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
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 eef316b039..cb3cb34d27 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -826,7 +826,7 @@ int QFontEngineFT::loadFlags(QGlyphSet *set, GlyphFormat format, int flags, } if (set && set->outline_drawing) - load_flags = FT_LOAD_NO_BITMAP; + load_flags |= FT_LOAD_NO_BITMAP; if (default_hint_style == HintNone || (flags & DesignMetrics) || (set && set->outline_drawing)) load_flags |= FT_LOAD_NO_HINTING; |