summaryrefslogtreecommitdiffstats
path: root/src/webengine/plugin
diff options
context:
space:
mode:
authorValentin Fokin <fokinv@inf.u-szeged.hu>2018-05-30 14:46:15 +0200
committerPeter Varga <pvarga@inf.u-szeged.hu>2018-08-02 14:17:17 +0000
commit1481e8d87fe89d9e27d9de593767b55a0e84a31f (patch)
tree7ff04c22c4c880ec8d0951255772ce8b2c49bf3a /src/webengine/plugin
parent6a5f8d69fc1d090326fa92a0b24bd494369c2d0d (diff)
Introduce WebEngineAction in Quick API
Also implement QQuickWebEngineView::action() method similar to the Widget API to access the WebEngineActions. [ChangeLog][QtWebEngine] Introduce WebEngineAction in Quick API Task-number: QTBUG-56117 Change-Id: I758cd4703db4c111c1ed9187e091d4c845486c46 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'src/webengine/plugin')
-rw-r--r--src/webengine/plugin/plugin.cpp4
-rw-r--r--src/webengine/plugin/plugins.qmltypes38
2 files changed, 38 insertions, 4 deletions
diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp
index 545f17f82..76bee50be 100644
--- a/src/webengine/plugin/plugin.cpp
+++ b/src/webengine/plugin/plugin.cpp
@@ -52,6 +52,7 @@
#include "qquickwebenginesettings_p.h"
#include "qquickwebenginesingleton_p.h"
#include "qquickwebengineview_p.h"
+#include "qquickwebengineaction_p.h"
#include "qwebenginequotarequest.h"
#include "qwebengineregisterprotocolhandlerrequest.h"
#include "qtwebengineversion.h"
@@ -89,6 +90,7 @@ public:
qmlRegisterType<QQuickWebEngineView, 5>(uri, 1, 5, "WebEngineView");
qmlRegisterType<QQuickWebEngineView, 6>(uri, 1, 6, "WebEngineView");
qmlRegisterType<QQuickWebEngineView, 7>(uri, 1, 7, "WebEngineView");
+ qmlRegisterType<QQuickWebEngineView, 8>(uri, 1, 8, "WebEngineView");
qmlRegisterType<QQuickWebEngineProfile>(uri, 1, 1, "WebEngineProfile");
qmlRegisterType<QQuickWebEngineProfile, 1>(uri, 1, 2, "WebEngineProfile");
qmlRegisterType<QQuickWebEngineProfile, 2>(uri, 1, 3, "WebEngineProfile");
@@ -148,7 +150,7 @@ public:
qRegisterMetaType<QWebEngineRegisterProtocolHandlerRequest>();
qmlRegisterUncreatableType<QWebEngineRegisterProtocolHandlerRequest>(uri, 1, 7, "RegisterProtocolHandlerRequest",
msgUncreatableType("RegisterProtocolHandlerRequest"));
-
+ qmlRegisterUncreatableType<QQuickWebEngineAction>(uri, 1, 8, "WebEngineAction", msgUncreatableType("WebEngineAction"));
}
private:
diff --git a/src/webengine/plugin/plugins.qmltypes b/src/webengine/plugin/plugins.qmltypes
index 5c61ee8d0..44c85bd8e 100644
--- a/src/webengine/plugin/plugins.qmltypes
+++ b/src/webengine/plugin/plugins.qmltypes
@@ -4,11 +4,36 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -defaultplatform -dependencies dependencies.json -nonrelocatable QtWebEngine 1.7'
+// 'qmlplugindump -defaultplatform -dependencies dependencies.json -nonrelocatable QtWebEngine 1.8'
Module {
dependencies: ["QtQuick 2.8"]
Component {
+ name: "QQuickWebEngineAction"
+ prototype: "QObject"
+ exports: ["QtWebEngine/WebEngineAction 1.8"]
+ isCreatable: false
+ exportMetaObjectRevisions: [0]
+ Property { name: "text"; type: "string"; isReadonly: true }
+ Property { name: "iconText"; type: "string"; isReadonly: true }
+ Property { name: "enabled"; type: "bool"; isReadonly: true }
+ Signal { name: "toggled" }
+ Signal { name: "triggered" }
+ Signal {
+ name: "textChanged"
+ Parameter { name: "text"; type: "string" }
+ }
+ Signal {
+ name: "iconTextChanged"
+ Parameter { name: "iconText"; type: "string" }
+ }
+ Signal {
+ name: "enabledChanged"
+ Parameter { name: "enabled"; type: "bool" }
+ }
+ Method { name: "trigger" }
+ }
+ Component {
name: "QQuickWebEngineAuthenticationDialogRequest"
prototype: "QObject"
exports: ["QtWebEngine/AuthenticationDialogRequest 1.4"]
@@ -640,9 +665,10 @@ Module {
"QtWebEngine/WebEngineView 1.4",
"QtWebEngine/WebEngineView 1.5",
"QtWebEngine/WebEngineView 1.6",
- "QtWebEngine/WebEngineView 1.7"
+ "QtWebEngine/WebEngineView 1.7",
+ "QtWebEngine/WebEngineView 1.8"
]
- exportMetaObjectRevisions: [0, 1, 2, 3, 4, 5, 6, 7]
+ exportMetaObjectRevisions: [0, 1, 2, 3, 4, 5, 6, 7, 8]
Enum {
name: "NavigationRequestAction"
values: {
@@ -1224,6 +1250,12 @@ Module {
revision: 4
Parameter { name: "replacement"; type: "string" }
}
+ Method {
+ name: "action"
+ revision: 8
+ type: "QQuickWebEngineAction*"
+ Parameter { name: "action"; type: "WebAction" }
+ }
}
Component {
name: "QWebEngineQuotaRequest"