diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-11-28 12:00:08 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-02-05 13:56:10 +0000 |
| commit | 4ef5831a398280cc26cbf359dcbb9878e77ab7fb (patch) | |
| tree | adb8b7ac7a42b8130b178d1001a5c008c430d325 /src/webenginewidgets/api/qwebenginepage.cpp | |
| parent | faec509a21b4700dbf271c4dcbb3a993f1c4042f (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/webenginewidgets/api/qwebenginepage.cpp')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index aceac91e3..a59165e8b 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -31,7 +31,6 @@ #include "qwebengineprofile.h" #include "qwebengineprofile_p.h" #include "qwebenginesettings.h" -#include "qwebenginesettings_p.h" #include "qwebengineview.h" #include "qwebengineview_p.h" #include "render_widget_host_view_qt_delegate_widget.h" @@ -173,7 +172,7 @@ QWebEnginePagePrivate::QWebEnginePagePrivate(QWebEngineProfile *_profile) : adapter(new WebContentsAdapter) , history(new QWebEngineHistory(new QWebEngineHistoryPrivate(this))) , profile(_profile ? _profile : QWebEngineProfile::defaultProfile()) - , settings(new QWebEngineSettings) + , settings(new QWebEngineSettings(profile->settings())) , view(0) , isLoading(false) { @@ -857,7 +856,7 @@ void QWebEnginePagePrivate::runFileChooser(WebContentsAdapterClient::FileChooser WebEngineSettings *QWebEnginePagePrivate::webEngineSettings() const { - return settings->d_func()->coreSettings.data(); + return settings->d_func(); } void QWebEnginePage::load(const QUrl& url) |