From 1481e8d87fe89d9e27d9de593767b55a0e84a31f Mon Sep 17 00:00:00 2001 From: Valentin Fokin Date: Wed, 30 May 2018 14:46:15 +0200 Subject: Introduce WebEngineAction in Quick API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/webengine/plugin/plugins.qmltypes | 38 ++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) (limited to 'src/webengine/plugin/plugins.qmltypes') 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,10 +4,35 @@ 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" @@ -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" -- cgit v1.2.3