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>

5 files changed, 9 insertions, 4 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);
diff --git a/src/core/web_engine_settings.h b/src/core/web_engine_settings.h
index e8b268094..9673b9558 100644
--- a/src/core/web_engine_settings.h
+++ b/src/core/web_engine_settings.h
@@ -86,7 +86,8 @@ public:
         SerifFont,
         SansSerifFont,
         CursiveFont,
-        FantasyFont
+        FantasyFont,
+        PictographFont
     };
 
     // Must match the values from the public API in qwebenginesettings.h.
diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/webenginewidgets/api/qwebenginesettings.cpp
index 80047da63..ba372d465 100644
--- a/src/webenginewidgets/api/qwebenginesettings.cpp
+++ b/src/webenginewidgets/api/qwebenginesettings.cpp
@@ -123,6 +123,7 @@ ASSERT_ENUMS_MATCH(WebEngineSettings::SerifFont, QWebEngineSettings::SerifFont)
 ASSERT_ENUMS_MATCH(WebEngineSettings::SansSerifFont, QWebEngineSettings::SansSerifFont)
 ASSERT_ENUMS_MATCH(WebEngineSettings::CursiveFont, QWebEngineSettings::CursiveFont)
 ASSERT_ENUMS_MATCH(WebEngineSettings::FantasyFont, QWebEngineSettings::FantasyFont)
+ASSERT_ENUMS_MATCH(WebEngineSettings::PictographFont, QWebEngineSettings::PictographFont)
 
 void QWebEngineSettings::setFontFamily(QWebEngineSettings::FontFamily which, const QString &family)
 {
diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h
index 8bf303a8f..f236abe94 100644
--- a/src/webenginewidgets/api/qwebenginesettings.h
+++ b/src/webenginewidgets/api/qwebenginesettings.h
@@ -43,7 +43,8 @@ public:
         SerifFont,
         SansSerifFont,
         CursiveFont,
-        FantasyFont
+        FantasyFont,
+        PictographFont
     };
     enum WebAttribute {
         AutoLoadImages,
diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
index 82a425d2f..6b518a1f2 100644
--- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
@@ -66,6 +66,8 @@
     \value SansSerifFont
     \value CursiveFont
     \value FantasyFont
+    \value PictographFont
+           (added in Qt 5.7)
 */
 
 /*!