Move settings out of experimental.

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

3 files changed, 10 insertions, 7 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);
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index 983cc90a6..b8f2fb896 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -47,6 +47,7 @@ class QQuickWebEngineLoadRequest;
 class QQuickWebEngineNavigationRequest;
 class QQuickWebEngineNewViewRequest;
 class QQuickWebEngineProfile;
+class QQuickWebEngineSettings;
 class QQuickWebEngineViewExperimental;
 class QQuickWebEngineViewPrivate;
 
@@ -61,6 +62,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
     Q_PROPERTY(bool canGoForward READ canGoForward NOTIFY urlChanged)
     Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged)
     Q_PROPERTY(QQuickWebEngineProfile *profile READ profile WRITE setProfile FINAL)
+    Q_PROPERTY(QQuickWebEngineSettings *settings READ settings REVISION 1)
     Q_ENUMS(NavigationRequestAction);
     Q_ENUMS(NavigationType);
     Q_ENUMS(LoadStatus);
@@ -139,6 +141,8 @@ public:
     QQuickWebEngineProfile *profile() const;
     void setProfile(QQuickWebEngineProfile *);
 
+    QQuickWebEngineSettings *settings() const;
+
 public Q_SLOTS:
     void runJavaScript(const QString&, const QJSValue & = QJSValue());
     void loadHtml(const QString &html, const QUrl &baseUrl = QUrl());
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index 28c8ff44e..48eb25cb3 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -80,7 +80,6 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineViewExperimental : public QObjec
     Q_PROPERTY(QQmlComponent *extraContextMenuEntriesComponent READ extraContextMenuEntriesComponent WRITE setExtraContextMenuEntriesComponent NOTIFY extraContextMenuEntriesComponentChanged)
     Q_PROPERTY(bool isFullScreen READ isFullScreen WRITE setIsFullScreen NOTIFY isFullScreenChanged)
     Q_PROPERTY(QQuickWebEngineHistory *navigationHistory READ navigationHistory CONSTANT FINAL)
-    Q_PROPERTY(QQuickWebEngineSettings *settings READ settings)
     Q_ENUMS(Feature)
     Q_FLAGS(FindFlags)
 
@@ -104,7 +103,6 @@ public:
     void setExtraContextMenuEntriesComponent(QQmlComponent *);
     QQmlComponent *extraContextMenuEntriesComponent() const;
     QQuickWebEngineHistory *navigationHistory() const;
-    QQuickWebEngineSettings *settings() const;
 
 public Q_SLOTS:
     void goBackTo(int index);