diff options
author | Liang Qi <liang.qi@qt.io> | 2017-09-22 12:34:40 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-09-22 12:44:57 +0200 |
commit | 05c6c1b59d59113b81fcb4a5a0388ef98d39ed40 (patch) | |
tree | af152f5ace10bdc5996ac0fb7cc7fd897928d60a /src/core/web_engine_settings.cpp | |
parent | 73eb8fb2ddaa44cd0e8a5dac68cbc1b66f618e0e (diff) | |
parent | 9fdc847c639ef7060a13b10d9fe704e40357a0a8 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/webengine/api/qquickwebenginesettings_p.h
src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc
Change-Id: I9cac7059557084a575af02782af886f55a8d404f
Diffstat (limited to 'src/core/web_engine_settings.cpp')
-rw-r--r-- | src/core/web_engine_settings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp index 7b9c1225d..44ecaf2ef 100644 --- a/src/core/web_engine_settings.cpp +++ b/src/core/web_engine_settings.cpp @@ -248,7 +248,7 @@ void WebEngineSettings::initDefaults() s_defaultAttributes.insert(PluginsEnabled, false); s_defaultAttributes.insert(FullScreenSupportEnabled, false); s_defaultAttributes.insert(ScreenCaptureEnabled, false); - s_defaultAttributes.insert(HideScrollbars, false); + s_defaultAttributes.insert(ShowScrollBars, true); // The following defaults matches logic in render_view_host_impl.cc // But first we must ensure the WebContext has been initialized QtWebEngineCore::WebEngineContext::current(); @@ -352,7 +352,7 @@ void WebEngineSettings::applySettingsToWebPreferences(content::WebPreferences *p prefs->should_print_backgrounds = testAttribute(PrintElementBackgrounds); prefs->allow_running_insecure_content = testAttribute(AllowRunningInsecureContent); prefs->allow_geolocation_on_insecure_origins = testAttribute(AllowGeolocationOnInsecureOrigins); - prefs->hide_scrollbars = testAttribute(HideScrollbars); + prefs->hide_scrollbars = !testAttribute(ShowScrollBars); // Fonts settings. prefs->standard_font_family_map[content::kCommonScript] = toString16(fontFamily(StandardFont)); |