diff options
author | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-03-02 09:51:53 +0100 |
---|---|---|
committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2016-03-25 14:12:27 +0000 |
commit | bd3d10a4a892166c79563e0ef37b3065420f99d0 (patch) | |
tree | cd2c79bc29e628c87f933fd405f27772f79e034c /src/webenginewidgets | |
parent | 7a49313c84ccd4779e396b7bc8341a331d90f96f (diff) |
Add settings for FaviconManager's icon download modes
Change-Id: I8e4b11089de29623ed39ec6b13fe30be734baa3e
Task-number: QTBUG-51179
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/webenginewidgets')
-rw-r--r-- | src/webenginewidgets/api/qwebenginesettings.cpp | 4 | ||||
-rw-r--r-- | src/webenginewidgets/api/qwebenginesettings.h | 4 | ||||
-rw-r--r-- | src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/webenginewidgets/api/qwebenginesettings.cpp index 3a2f585f2..d1caa4ca5 100644 --- a/src/webenginewidgets/api/qwebenginesettings.cpp +++ b/src/webenginewidgets/api/qwebenginesettings.cpp @@ -87,6 +87,10 @@ static WebEngineSettings::Attribute toWebEngineAttribute(QWebEngineSettings::Web return WebEngineSettings::WebAudioEnabled; case QWebEngineSettings::Accelerated2dCanvasEnabled: return WebEngineSettings::Accelerated2dCanvasEnabled; + case QWebEngineSettings::AutoLoadIconsForPage: + return WebEngineSettings::AutoLoadIconsForPage; + case QWebEngineSettings::TouchIconsEnabled: + return WebEngineSettings::TouchIconsEnabled; default: return WebEngineSettings::UnsupportedInCoreSettings; } diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h index f236abe94..ea18cf020 100644 --- a/src/webenginewidgets/api/qwebenginesettings.h +++ b/src/webenginewidgets/api/qwebenginesettings.h @@ -65,7 +65,9 @@ public: ScreenCaptureEnabled, WebGLEnabled, WebAudioEnabled, - Accelerated2dCanvasEnabled + Accelerated2dCanvasEnabled, + AutoLoadIconsForPage, + TouchIconsEnabled }; enum FontSize { diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index 461af086a..a19f36951 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -141,6 +141,11 @@ \value Accelerated2dCanvasEnabled Specifies whether the HTML5 2D canvas should be a OpenGL framebuffer. This makes many painting operations faster, but slows down pixel access. Enabled by default if available. + \value AutoLoadIconsForPage + Automatically downloads icons for web pages. Enabled by default. + \value TouchIconsEnabled + Enables support for touch icons and precomposed touch icons. + Disabled by default. */ /*! |