From b78e81f7c23a557a31ad649b33d85eed9a697281 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 20 Aug 2014 10:13:44 +0200 Subject: [PATCH] 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 Reviewed-by: Lars Knoll --- src/gui/text/qfontengine_ft.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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;