diff options
author | Pierre Rossi <pierre.rossi@digia.com> | 2014-03-06 20:46:19 +0100 |
---|---|---|
committer | Pierre Rossi <pierre.rossi@gmail.com> | 2014-09-02 10:02:07 +0200 |
commit | 33a0ed37321edf6f1d9e89fa55e820800cec031c (patch) | |
tree | 52cede0b50f2f854b9f4543ec14e9b5cc82addb1 /src/webengine/api/qquickwebengineview.cpp | |
parent | c6c1da2f4c71e523213aa8ee961d8fec779f62e2 (diff) |
Settings for Qt quick
Expose settings in experimental for now.
Simply use the global/per-view mechanism as a group level
in between seems like overkill.
Change-Id: I7610e9c7765ccb41674702acdd24a52b87716da8
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
-rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index e08232e78..c9faa1a78 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -43,6 +43,8 @@ #include "qquickwebengineloadrequest_p.h" #include "qquickwebenginenavigationrequest_p.h" #include "qquickwebenginenewviewrequest_p.h" +#include "qquickwebenginesettings_p.h" +#include "qquickwebenginesettings_p_p.h" #include "render_widget_host_view_qt_delegate_quick.h" #include "render_widget_host_view_qt_delegate_quickwindow.h" #include "ui_delegates_manager.h" @@ -75,6 +77,7 @@ QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate() , e(new QQuickWebEngineViewExperimental(this)) , v(new QQuickWebEngineViewport(this)) , m_history(new QQuickWebEngineHistory(this)) + , m_settings(new QQuickWebEngineSettings) , contextMenuExtraItems(0) , loadProgress(0) , inspectable(false) @@ -393,28 +396,9 @@ QObject *QQuickWebEngineViewPrivate::accessibilityParentObject() return q; } -namespace { -class DummySettingsDelegate : public WebEngineSettingsDelegate { -public: - DummySettingsDelegate() - : settings(0) {} - void apply() { } - WebEngineSettings* fallbackSettings() const { return settings; } - WebEngineSettings *settings; -}; - -}// anonymous namespace - WebEngineSettings *QQuickWebEngineViewPrivate::webEngineSettings() const { - static WebEngineSettings *dummySettings = 0; - if (!dummySettings) { - DummySettingsDelegate *dummyDelegate = new DummySettingsDelegate; - dummySettings = new WebEngineSettings(dummyDelegate); - dummyDelegate->settings = dummySettings; - dummySettings->initDefaults(); - } - return dummySettings; + return m_settings->d_func()->coreSettings.data(); } void QQuickWebEngineViewPrivate::setDevicePixelRatio(qreal devicePixelRatio) @@ -667,6 +651,11 @@ QQmlComponent *QQuickWebEngineViewExperimental::extraContextMenuEntriesComponent return d_ptr->contextMenuExtraItems; } +QQuickWebEngineSettings *QQuickWebEngineViewExperimental::settings() const +{ + return d_ptr->m_settings.data(); +} + void QQuickWebEngineViewExperimental::findText(const QString &subString, FindFlags options, const QJSValue &callback) { if (subString.isEmpty()) { |