summaryrefslogtreecommitdiffstats
path: root/src/webengine/api/qquickwebengineview_p.h
diff options
context:
space:
mode:
authorMichael BrĂ¼ning <michael.bruning@theqtcompany.com>2015-02-05 18:09:06 +0100
committerMichael BrĂ¼ning <michael.bruning@theqtcompany.com>2015-02-06 11:09:19 +0000
commit32766eb94eb06bec449a3bd8d518b6a638f79400 (patch)
treef93ad2d7312b20e89a463207f56d17a35a6fcba1 /src/webengine/api/qquickwebengineview_p.h
parenta3b361dc34c58645f564a93c63fd211f6e761947 (diff)
Move settings out of experimental.
Change-Id: Ida74680a4180f4366746874a656041364563d548 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/webengine/api/qquickwebengineview_p.h')
-rw-r--r--src/webengine/api/qquickwebengineview_p.h4
1 files changed, 4 insertions, 0 deletions
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());