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>

1 files changed, 13 insertions, 8 deletions

diff --git a/src/webengine/api/qquickwebenginehistory_p_p.h b/src/webengine/api/qquickwebenginehistory_p_p.h
index ad9b1ffaf..2ad2af26f 100644
--- a/src/webengine/api/qquickwebenginehistory_p_p.h
+++ b/src/webengine/api/qquickwebenginehistory_p_p.h
@@ -48,8 +48,9 @@ public:
     QQuickWebEngineHistoryListModelPrivate(QQuickWebEngineViewPrivate*);
     virtual ~QQuickWebEngineHistoryListModelPrivate();
 
-    virtual int count() const = 0;
-    virtual int index(int) const = 0;
+    virtual int count() const;
+    virtual int index(int) const;
+    virtual int offsetForIndex(int) const;
 
     WebContentsAdapter *adapter() const;
 
@@ -60,16 +61,18 @@ class QQuickWebEngineBackHistoryListModelPrivate : public QQuickWebEngineHistory
 public:
     QQuickWebEngineBackHistoryListModelPrivate(QQuickWebEngineViewPrivate*);
 
-    int count() const;
-    int index(int) const;
+    int count() const override;
+    int index(int) const override;
+    int offsetForIndex(int) const override;
 };
 
 class QQuickWebEngineForwardHistoryListModelPrivate : public QQuickWebEngineHistoryListModelPrivate {
 public:
     QQuickWebEngineForwardHistoryListModelPrivate(QQuickWebEngineViewPrivate*);
 
-    int count() const;
-    int index(int) const;
+    int count() const override;
+    int index(int) const override;
+    int offsetForIndex(int) const override;
 };
 
 class QQuickWebEngineHistoryPrivate {
@@ -77,8 +80,10 @@ public:
     QQuickWebEngineHistoryPrivate(QQuickWebEngineViewPrivate*);
     ~QQuickWebEngineHistoryPrivate();
 
-    QScopedPointer<QQuickWebEngineHistoryListModel> m_backNavigationModel;
-    QScopedPointer<QQuickWebEngineHistoryListModel> m_forwardNavigationModel;
+    QQuickWebEngineViewPrivate *m_view;
+    mutable QScopedPointer<QQuickWebEngineHistoryListModel> m_navigationModel;
+    mutable QScopedPointer<QQuickWebEngineHistoryListModel> m_backNavigationModel;
+    mutable QScopedPointer<QQuickWebEngineHistoryListModel> m_forwardNavigationModel;
 };
 
 QT_END_NAMESPACE