summaryrefslogtreecommitdiffstats
path: root/src/webengine/plugin/experimental/plugin.cpp
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@theqtcompany.com>2015-02-12 20:17:40 +0100
committerPierre Rossi <pierre.rossi@theqtcompany.com>2015-02-18 13:17:45 +0000
commit6717d58192a9e4fb87b4721a34f3715766863851 (patch)
tree9014acec9ccde3cd2c36a89725ed8bbb215f0d82 /src/webengine/plugin/experimental/plugin.cpp
parent4bac2cb5084c68354e43fb456e4d20d4f70b223a (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/plugin/experimental/plugin.cpp')
-rw-r--r--src/webengine/plugin/experimental/plugin.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/webengine/plugin/experimental/plugin.cpp b/src/webengine/plugin/experimental/plugin.cpp
index 857f1de0..29b5413f 100644
--- a/src/webengine/plugin/experimental/plugin.cpp
+++ b/src/webengine/plugin/experimental/plugin.cpp
@@ -36,7 +36,6 @@
#include <QtQml/qqmlextensionplugin.h>
-#include "qquickwebenginehistory_p.h"
#include "qquickwebengineview_p.h"
#include "qquickwebengineview_p_p.h"
@@ -67,10 +66,6 @@ public:
QObject::tr("Cannot create a separate instance of WebEngineViewExperimental"));
qmlRegisterUncreatableType<QQuickWebEngineViewport>(uri, 1, 0, "WebEngineViewport",
QObject::tr("Cannot create a separate instance of WebEngineViewport"));
- qmlRegisterUncreatableType<QQuickWebEngineHistory>(uri, 1, 0, "NavigationHistory",
- QObject::tr("Cannot create a separate instance of NavigationHistory"));
- qmlRegisterUncreatableType<QQuickWebEngineHistoryListModel>(uri, 1, 0, "NavigationHistoryListModel",
- QObject::tr("Cannot create a separate instance of NavigationHistory"));
// Use the latest revision of QQuickWebEngineView when importing QtWebEngine.experimental 1.0
qmlRegisterRevision<QQuickWebEngineView, 1>(uri, 1, 0);