summaryrefslogtreecommitdiffstats
path: root/src/webengine/api/qquickwebengineprofile.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2014-11-28 12:00:08 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-02-05 13:56:10 +0000
commit4ef5831a398280cc26cbf359dcbb9878e77ab7fb (patch)
treeadb8b7ac7a42b8130b178d1001a5c008c430d325 /src/webengine/api/qquickwebengineprofile.cpp
parentfaec509a21b4700dbf271c4dcbb3a993f1c4042f (diff)
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>
Diffstat (limited to 'src/webengine/api/qquickwebengineprofile.cpp')
-rw-r--r--src/webengine/api/qquickwebengineprofile.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebengineprofile.cpp b/src/webengine/api/qquickwebengineprofile.cpp
index faae850f7..791f39263 100644
--- a/src/webengine/api/qquickwebengineprofile.cpp
+++ b/src/webengine/api/qquickwebengineprofile.cpp
@@ -39,9 +39,12 @@
#include "qquickwebenginedownloaditem_p.h"
#include "qquickwebenginedownloaditem_p_p.h"
#include "qquickwebengineprofile_p_p.h"
+#include "qquickwebenginesettings_p.h"
+
#include <QQmlEngine>
#include "browser_context_adapter.h"
+#include "web_engine_settings.h"
QT_BEGIN_NAMESPACE
@@ -62,12 +65,14 @@ static inline QQuickWebEngineDownloadItem::DownloadState toDownloadState(int sta
}
QQuickWebEngineProfilePrivate::QQuickWebEngineProfilePrivate(BrowserContextAdapter* browserContext, bool ownsContext)
- : m_browserContext(browserContext)
+ : m_settings(new QQuickWebEngineSettings())
+ , m_browserContext(browserContext)
{
if (ownsContext)
m_browserContextRef = browserContext;
m_browserContext->setClient(this);
+ m_settings->d_ptr->initDefaults(browserContext->isOffTheRecord());
}
QQuickWebEngineProfilePrivate::~QQuickWebEngineProfilePrivate()
@@ -394,4 +399,10 @@ QQuickWebEngineProfile *QQuickWebEngineProfile::defaultProfile()
return &profile;
}
+QQuickWebEngineSettings *QQuickWebEngineProfile::settings() const
+{
+ const Q_D(QQuickWebEngineProfile);
+ return d->settings();
+}
+
QT_END_NAMESPACE