Add settings for FaviconManager's icon download modes

Change-Id: I8e4b11089de29623ed39ec6b13fe30be734baa3e
Task-number: QTBUG-51179
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

2 files changed, 52 insertions, 2 deletions

diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp
index 921a31816..56d4119cd 100644
--- a/src/webengine/api/qquickwebenginesettings.cpp
+++ b/src/webengine/api/qquickwebenginesettings.cpp
@@ -289,6 +289,32 @@ bool QQuickWebEngineSettings::accelerated2dCanvasEnabled() const
 }
 
 /*!
+  \qmlproperty bool WebEngineSettings::autoLoadIconsForPage
+  \since QtWebEngine 1.3
+
+  Automatically downloads icons for web pages.
+
+  Enabled by default.
+*/
+bool QQuickWebEngineSettings::autoLoadIconsForPage() const
+{
+    return d_ptr->testAttribute(WebEngineSettings::AutoLoadIconsForPage);
+}
+
+/*!
+  \qmlproperty bool WebEngineSettings::touchIconsEnabled
+  \since QtWebEngine 1.3
+
+  Enables support for touch icons and precomposed touch icons.
+
+  Disabled by default.
+*/
+bool QQuickWebEngineSettings::touchIconsEnabled() const
+{
+    return d_ptr->testAttribute(WebEngineSettings::TouchIconsEnabled);
+}
+
+/*!
     \qmlproperty QString WebEngineSettings::defaultTextEncoding
 
     Sets the default encoding. The value must be a string describing an encoding such as "utf-8" or
@@ -440,6 +466,22 @@ void QQuickWebEngineSettings::setAccelerated2dCanvasEnabled(bool on)
         Q_EMIT accelerated2dCanvasEnabledChanged();
 }
 
+void QQuickWebEngineSettings::setAutoLoadIconsForPage(bool on)
+{
+    bool wasOn = d_ptr->testAttribute(WebEngineSettings::AutoLoadIconsForPage);
+    d_ptr->setAttribute(WebEngineSettings::AutoLoadIconsForPage, on);
+    if (wasOn != on)
+        Q_EMIT autoLoadIconsForPageChanged();
+}
+
+void QQuickWebEngineSettings::setTouchIconsEnabled(bool on)
+{
+    bool wasOn = d_ptr->testAttribute(WebEngineSettings::TouchIconsEnabled);
+    d_ptr->setAttribute(WebEngineSettings::TouchIconsEnabled, on);
+    if (wasOn != on)
+        Q_EMIT touchIconsEnabledChanged();
+}
+
 void QQuickWebEngineSettings::setDefaultTextEncoding(QString encoding)
 {
     const QString oldDefaultTextEncoding = d_ptr->defaultTextEncoding();
diff --git a/src/webengine/api/qquickwebenginesettings_p.h b/src/webengine/api/qquickwebenginesettings_p.h
index a870f7b0b..6a5fd290e 100644
--- a/src/webengine/api/qquickwebenginesettings_p.h
+++ b/src/webengine/api/qquickwebenginesettings_p.h
@@ -81,6 +81,8 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineSettings : public QObject {
     Q_PROPERTY(bool webGLEnabled READ webGLEnabled WRITE setWebGLEnabled NOTIFY webGLEnabledChanged REVISION 2)
     Q_PROPERTY(bool webAudioEnabled READ webAudioEnabled WRITE setWebAudioEnabled NOTIFY webAudioEnabledChanged REVISION 2)
     Q_PROPERTY(bool accelerated2dCanvasEnabled READ accelerated2dCanvasEnabled WRITE setAccelerated2dCanvasEnabled NOTIFY accelerated2dCanvasEnabledChanged REVISION 2)
+    Q_PROPERTY(bool autoLoadIconsForPage READ autoLoadIconsForPage WRITE setAutoLoadIconsForPage NOTIFY autoLoadIconsForPageChanged REVISION 2)
+    Q_PROPERTY(bool touchIconsEnabled READ touchIconsEnabled WRITE setTouchIconsEnabled NOTIFY touchIconsEnabledChanged REVISION 2)
 
 public:
     ~QQuickWebEngineSettings();
@@ -98,11 +100,13 @@ public:
     bool errorPageEnabled() const;
     bool pluginsEnabled() const;
     bool fullScreenSupportEnabled() const;
+    QString defaultTextEncoding() const;
     bool screenCaptureEnabled() const;
     bool webGLEnabled() const;
     bool webAudioEnabled() const;
     bool accelerated2dCanvasEnabled() const;
-    QString defaultTextEncoding() const;
+    bool autoLoadIconsForPage() const;
+    bool touchIconsEnabled() const;
 
     void setAutoLoadImages(bool on);
     void setJavascriptEnabled(bool on);
@@ -117,11 +121,13 @@ public:
     void setErrorPageEnabled(bool on);
     void setPluginsEnabled(bool on);
     void setFullScreenSupportEnabled(bool on);
+    void setDefaultTextEncoding(QString encoding);
     void setScreenCaptureEnabled(bool on);
     void setWebGLEnabled(bool on);
     void setWebAudioEnabled(bool on);
     void setAccelerated2dCanvasEnabled(bool on);
-    void setDefaultTextEncoding(QString encoding);
+    void setAutoLoadIconsForPage(bool on);
+    void setTouchIconsEnabled(bool on);
 
 signals:
     void autoLoadImagesChanged();
@@ -142,6 +148,8 @@ signals:
     Q_REVISION(2) void webGLEnabledChanged();
     Q_REVISION(2) void webAudioEnabledChanged();
     Q_REVISION(2) void accelerated2dCanvasEnabledChanged();
+    Q_REVISION(2) void autoLoadIconsForPageChanged();
+    Q_REVISION(2) void touchIconsEnabledChanged();
 
 private:
     explicit QQuickWebEngineSettings(QQuickWebEngineSettings *parentSettings = 0);