summaryrefslogtreecommitdiffstats
path: root/src/core/web_engine_settings.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-12-08 17:02:50 +0100
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-12-11 14:26:59 +0000
commit6414f93b39c57b2718a622430f7e0329b3512c8b (patch)
tree373654c277c4ea32d7231d932592eadebe62557e /src/core/web_engine_settings.cpp
parent9d18f8d02b73c2c9310b772c972ea1e0d1356102 (diff)
Add pictograph font family setting
Use the same default font as Serif since that is what Chromium does. Change-Id: Ie83cf114b516c6a1ae0d78ab768c1713144074ac Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/core/web_engine_settings.cpp')
-rw-r--r--src/core/web_engine_settings.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp
index e12fda584..160ed9693 100644
--- a/src/core/web_engine_settings.cpp
+++ b/src/core/web_engine_settings.cpp
@@ -242,6 +242,7 @@ void WebEngineSettings::initDefaults(bool offTheRecord)
defaultFont.setStyleHint(QFont::Serif);
s_defaultFontFamilies.insert(StandardFont, defaultFont.defaultFamily());
s_defaultFontFamilies.insert(SerifFont, defaultFont.defaultFamily());
+ s_defaultFontFamilies.insert(PictographFont, defaultFont.defaultFamily());
defaultFont.setStyleHint(QFont::Fantasy);
s_defaultFontFamilies.insert(FantasyFont, defaultFont.defaultFamily());
@@ -315,8 +316,7 @@ void WebEngineSettings::applySettingsToWebPreferences(content::WebPreferences *p
prefs->sans_serif_font_family_map[content::kCommonScript] = toString16(fontFamily(SansSerifFont));
prefs->cursive_font_family_map[content::kCommonScript] = toString16(fontFamily(CursiveFont));
prefs->fantasy_font_family_map[content::kCommonScript] = toString16(fontFamily(FantasyFont));
- // FIXME: add pictograph?
- // prefs.pictograph_font_family_map[content::kCommonScript] = toString16(fontFamily());
+ prefs->pictograph_font_family_map[content::kCommonScript] = toString16(fontFamily(PictographFont));
prefs->default_font_size = fontSize(DefaultFontSize);
prefs->default_fixed_font_size = fontSize(DefaultFixedFontSize);
prefs->minimum_font_size = fontSize(MinimumFontSize);