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_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_p.h')
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index d7785092f..48eb25cb3 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -55,7 +55,6 @@ class QQuickWebEngineView; class QQmlComponent; class QQmlContext; class QQuickWebEngineSettings; -class QQmlWebChannel; class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineViewport : public QObject { Q_OBJECT @@ -81,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(QQmlWebChannel *webChannel READ webChannel WRITE setWebChannel) Q_ENUMS(Feature) Q_FLAGS(FindFlags) @@ -105,9 +103,6 @@ public: void setExtraContextMenuEntriesComponent(QQmlComponent *); QQmlComponent *extraContextMenuEntriesComponent() const; QQuickWebEngineHistory *navigationHistory() const; - QQuickWebEngineSettings *settings() const; - QQmlWebChannel *webChannel() const; - void setWebChannel(QQmlWebChannel *); public Q_SLOTS: void goBackTo(int index); |