diff options
| author | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-02-12 20:17:40 +0100 |
|---|---|---|
| committer | Pierre Rossi <pierre.rossi@theqtcompany.com> | 2015-02-18 13:17:45 +0000 |
| commit | 6717d58192a9e4fb87b4721a34f3715766863851 (patch) | |
| tree | 9014acec9ccde3cd2c36a89725ed8bbb215f0d82 /src/webengine/api/qquickwebengineview_p_p.h | |
| parent | 4bac2cb5084c68354e43fb456e4d20d4f70b223a (diff) | |
Move navigationHistory out of experimental
Add an offset role to the models.
Implement goBackAndForward that uses this offset.
Also add a complete model, items, that includes current
navigation entry (at offset 0) to allow for the Firefox-style
single menu, and add that one to the nano browser example.
The models are now instantiated lazily as it's unlikely the
three models will be used by the same app.
Change-Id: Ib551738611497c7eb9c501f045cda315968a2ada
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 14770282e..a3b29af19 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -50,7 +50,6 @@ class WebContentsAdapter; class UIDelegatesManager; QT_BEGIN_NAMESPACE -class QQuickWebEngineHistory; class QQuickWebEngineView; class QQmlComponent; class QQmlContext; @@ -79,7 +78,6 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineViewExperimental : public QObjec Q_PROPERTY(QQuickWebEngineViewport *viewport READ viewport) 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_ENUMS(Feature) Q_FLAGS(FindFlags) @@ -102,11 +100,8 @@ public: QQuickWebEngineViewport *viewport() const; void setExtraContextMenuEntriesComponent(QQmlComponent *); QQmlComponent *extraContextMenuEntriesComponent() const; - QQuickWebEngineHistory *navigationHistory() const; public Q_SLOTS: - void goBackTo(int index); - void goForwardTo(int index); void findText(const QString&, FindFlags, const QJSValue & = QJSValue()); void grantFeaturePermission(const QUrl &securityOrigin, Feature, bool granted); |