diff options
| author | Zeno Albisser <zeno.albisser@theqtcompany.com> | 2015-01-21 10:42:47 +0200 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@digia.com> | 2015-03-30 12:08:09 +0000 |
| commit | 3ed2314133cca326363b8bef1a5927dfb685e2a0 (patch) | |
| tree | c40eb10a8c771eebd288bd999e5460f331a4b2f6 /src/core/web_engine_settings.cpp | |
| parent | dac590ce0d0b40af8332209c402639a5e14e4b6b (diff) | |
Add support for Shockwave Flash plugin.
We will try to load the pepper flash plugin from
the places where it is most commonly located.
Alternatively the location and flash version
can be passed on the command line.
Change-Id: I41367586462157e722661aab3630357d6caf6a81
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/web_engine_settings.cpp')
| -rw-r--r-- | src/core/web_engine_settings.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp index 74c60b778..f907f6e00 100644 --- a/src/core/web_engine_settings.cpp +++ b/src/core/web_engine_settings.cpp @@ -213,6 +213,7 @@ void WebEngineSettings::initDefaults(bool offTheRecord) m_attributes.insert(HyperlinkAuditingEnabled, false); m_attributes.insert(ScrollAnimatorEnabled, false); m_attributes.insert(ErrorPageEnabled, true); + m_attributes.insert(PluginsEnabled, false); // Default fonts QFont defaultFont; @@ -277,6 +278,7 @@ void WebEngineSettings::applySettingsToWebPreferences(content::WebPreferences *p prefs->hyperlink_auditing_enabled = testAttribute(HyperlinkAuditingEnabled); prefs->enable_scroll_animator = testAttribute(ScrollAnimatorEnabled); prefs->enable_error_page = testAttribute(ErrorPageEnabled); + prefs->plugins_enabled = testAttribute(PluginsEnabled); // Fonts settings. prefs->standard_font_family_map[content::kCommonScript] = toString16(fontFamily(StandardFont)); |