summaryrefslogtreecommitdiffstats
path: root/src/webengine/plugin/experimental/plugin.cpp
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2014-03-18 18:32:39 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-20 09:00:08 +0100
commitca417f2aa2a8264f8818bf8dd2df98981b21867b (patch)
tree6f89cb40d0f573a8bb01dbcf57b654ad9bf5da64 /src/webengine/plugin/experimental/plugin.cpp
parente82487177bbfbf5b6c219d40547706f50b3b73ab (diff)
Add Quick's navigationHistory
Add QQuickWebEngineHistory and list models providing API for the quick's navigationHistory. Change-Id: Ia86c94b120cc5d0b4757fc62386fc7a0dcb3e341 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/webengine/plugin/experimental/plugin.cpp')
-rw-r--r--src/webengine/plugin/experimental/plugin.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/webengine/plugin/experimental/plugin.cpp b/src/webengine/plugin/experimental/plugin.cpp
index 6107147cf..5274ea3fa 100644
--- a/src/webengine/plugin/experimental/plugin.cpp
+++ b/src/webengine/plugin/experimental/plugin.cpp
@@ -41,6 +41,7 @@
#include <QtQml/qqmlextensionplugin.h>
+#include "qquickwebenginehistory_p.h"
#include "qquickwebengineview_p.h"
#include "qquickwebengineview_p_p.h"
@@ -71,6 +72,10 @@ 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"));
}
};