diff options
author | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-02-12 16:43:23 +0100 |
---|---|---|
committer | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-02-13 14:11:31 +0000 |
commit | ebe4b5da40d8784351821ae0ba173f357bb519f8 (patch) | |
tree | f4a6d76a9ac536d71db046f511383da3ae5ffc03 /src/webengine/api/qquickwebengineview_p.h | |
parent | 53876e63be3a5aa1de038e3ecd593fdac721b78d (diff) |
Move webChannel property out of experimental
Add a notify signal to go with the setter.
Parent the default-provided channel to the view.
Comes with basic documentation.
Change-Id: I2bde8153df5928fc92ac36b7fa4d4b3b1da22f53
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.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index 56a1b47ab..3057cc9a4 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -42,6 +42,7 @@ QT_BEGIN_NAMESPACE +class QQmlWebChannel; class QQuickWebEngineCertificateError; class QQuickWebEngineLoadRequest; class QQuickWebEngineNavigationRequest; @@ -63,6 +64,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem { Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor NOTIFY zoomFactorChanged REVISION 1) Q_PROPERTY(QQuickWebEngineProfile *profile READ profile WRITE setProfile FINAL REVISION 1) Q_PROPERTY(QQuickWebEngineSettings *settings READ settings REVISION 1) + Q_PROPERTY(QQmlWebChannel *webChannel READ webChannel WRITE setWebChannel NOTIFY webChannelChanged REVISION 1) Q_ENUMS(NavigationRequestAction); Q_ENUMS(NavigationType); Q_ENUMS(LoadStatus); @@ -143,6 +145,8 @@ public: void setProfile(QQuickWebEngineProfile *); QQuickWebEngineSettings *settings() const; + QQmlWebChannel *webChannel(); + void setWebChannel(QQmlWebChannel *); public Q_SLOTS: void runJavaScript(const QString&, const QJSValue & = QJSValue()); @@ -164,6 +168,8 @@ Q_SIGNALS: Q_REVISION(1) void certificateError(QQuickWebEngineCertificateError *error); Q_REVISION(1) void newViewRequested(QQuickWebEngineNewViewRequest *request); Q_REVISION(1) void zoomFactorChanged(qreal arg); + Q_REVISION(1) void webChannelChanged(); + protected: void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); |