Add settings to WebEngineProfiles

This patch adds settings to profiles so common settings might be shared
among all pages in a profile. The former global settings are now replaced
by the settings of the default profile.

Change-Id: I544420e07beeb52ef29b2360bc7929402650cd07
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

1 files changed, 16 insertions, 1 deletions

diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp
index 8c4dcb59f..64876bf1a 100644
--- a/src/webenginewidgets/api/qwebengineprofile.cpp
+++ b/src/webenginewidgets/api/qwebengineprofile.cpp
@@ -40,9 +40,11 @@
 #include "qwebenginedownloaditem_p.h"
 #include "qwebenginepage.h"
 #include "qwebengineprofile_p.h"
+#include "qwebenginesettings.h"
 
 #include "browser_context_adapter.h"
 #include "web_engine_visited_links_manager.h"
+#include "web_engine_settings.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -97,16 +99,20 @@ QT_BEGIN_NAMESPACE
 */
 
 QWebEngineProfilePrivate::QWebEngineProfilePrivate(BrowserContextAdapter* browserContext, bool ownsContext)
-        : m_browserContext(browserContext)
+        : m_settings(new QWebEngineSettings())
+        , m_browserContext(browserContext)
 {
     if (ownsContext)
         m_browserContextRef = browserContext;
 
     m_browserContext->setClient(this);
+    m_settings->d_ptr->initDefaults(browserContext->isOffTheRecord());
 }
 
 QWebEngineProfilePrivate::~QWebEngineProfilePrivate()
 {
+    delete m_settings;
+    m_settings = 0;
     m_browserContext->setClient(0);
 
     Q_FOREACH (QWebEngineDownloadItem* download, m_ongoingDownloads) {
@@ -438,4 +444,13 @@ QWebEngineProfile *QWebEngineProfile::defaultProfile()
     return &profile;
 }
 
+/*!
+    Returns the default settings for all pages in this profile.
+*/
+QWebEngineSettings *QWebEngineProfile::settings() const
+{
+    const Q_D(QWebEngineProfile);
+    return d->settings();
+}
+
 QT_END_NAMESPACE