diff options
| author | Michael Brüning <michael.bruning@theqtcompany.com> | 2015-02-05 18:09:06 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@theqtcompany.com> | 2015-02-06 11:09:19 +0000 |
| commit | 32766eb94eb06bec449a3bd8d518b6a638f79400 (patch) | |
| tree | f93ad2d7312b20e89a463207f56d17a35a6fcba1 /src/webengine/api/qquickwebengineview.cpp | |
| parent | a3b361dc34c58645f564a93c63fd211f6e761947 (diff) | |
Move settings out of experimental.
Change-Id: Ida74680a4180f4366746874a656041364563d548
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/webengine/api/qquickwebengineview.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index 85a36df50..c6c67ff01 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -661,6 +661,12 @@ void QQuickWebEngineView::setProfile(QQuickWebEngineProfile *profile) d->setProfile(profile); } +QQuickWebEngineSettings *QQuickWebEngineView::settings() const +{ + Q_D(const QQuickWebEngineView); + return d->m_settings.data(); +} + void QQuickWebEngineViewPrivate::setProfile(QQuickWebEngineProfile *profile) { if (profile == m_profile) @@ -781,11 +787,6 @@ 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) { Q_D(QQuickWebEngineView); |