From 4714ca1b14fdf889cc2df8fef0d6eb0f436c2eae Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 19 Feb 2019 15:27:27 +0100 Subject: Update plugins.qmltypes for Qt 5.13 Task-number: QTBUG-73484 Change-Id: I9e8fb525e7dc77b46cff654b9c4b7a52b76cd45d Reviewed-by: Allan Sandfeld Jensen --- src/webengine/plugin/plugin.pro | 1 + src/webengine/plugin/plugins.qmltypes | 85 ++++++++++++++++++++++++++++++++++- 2 files changed, 84 insertions(+), 2 deletions(-) (limited to 'src/webengine') diff --git a/src/webengine/plugin/plugin.pro b/src/webengine/plugin/plugin.pro index 102f9a9fe..0c1310de3 100644 --- a/src/webengine/plugin/plugin.pro +++ b/src/webengine/plugin/plugin.pro @@ -8,4 +8,5 @@ QT_PRIVATE += core-private webenginecore-private webengine-private SOURCES = plugin.cpp +QMAKE_QMLPLUGINDUMP_FLAGS = -defaultplatform load(qml_plugin) diff --git a/src/webengine/plugin/plugins.qmltypes b/src/webengine/plugin/plugins.qmltypes index 435124e30..74c710e8b 100644 --- a/src/webengine/plugin/plugins.qmltypes +++ b/src/webengine/plugin/plugins.qmltypes @@ -4,7 +4,7 @@ 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.9' +// 'qmlplugindump -nonrelocatable -defaultplatform -dependencies dependencies.json QtWebEngine 1.9' Module { dependencies: ["QtQuick 2.8"] @@ -79,6 +79,46 @@ Module { Method { name: "ignoreCertificateError" } Method { name: "rejectCertificate" } } + Component { + name: "QQuickWebEngineClientCertificateOption" + prototype: "QObject" + exports: ["QtWebEngine/WebEngineClientCertificateOption 1.9"] + isCreatable: false + exportMetaObjectRevisions: [0] + Property { name: "issuer"; type: "string"; isReadonly: true } + Property { name: "subject"; type: "string"; isReadonly: true } + Property { name: "effectiveDate"; type: "QDateTime"; isReadonly: true } + Property { name: "expiryDate"; type: "QDateTime"; isReadonly: true } + Property { name: "isSelfSigned"; type: "bool"; isReadonly: true } + Method { name: "select" } + } + Component { + name: "QQuickWebEngineClientCertificateSelection" + prototype: "QObject" + exports: ["QtWebEngine/WebEngineClientCertificateSelection 1.9"] + isCreatable: false + exportMetaObjectRevisions: [0] + Property { name: "host"; type: "QUrl"; isReadonly: true } + Property { + name: "certificates" + type: "QQuickWebEngineClientCertificateOption" + isList: true + isReadonly: true + } + Method { + name: "select" + Parameter { name: "idx"; type: "int" } + } + Method { + name: "select" + Parameter { + name: "certificate" + type: "const QQuickWebEngineClientCertificateOption" + isPointer: true + } + } + Method { name: "selectNone" } + } Component { name: "QQuickWebEngineColorDialogRequest" prototype: "QObject" @@ -490,6 +530,11 @@ Module { name: "downloadFinished" Parameter { name: "download"; type: "QQuickWebEngineDownloadItem"; isPointer: true } } + Signal { + name: "userNotification" + revision: 6 + Parameter { name: "notification"; type: "QWebEngineNotification"; isPointer: true } + } Method { name: "clearHttpCache"; revision: 2 } } Component { @@ -729,7 +774,8 @@ Module { "MediaAudioVideoCapture": 2, "Geolocation": 3, "DesktopVideoCapture": 4, - "DesktopAudioVideoCapture": 5 + "DesktopAudioVideoCapture": 5, + "Notifications": 6 } } Enum { @@ -1137,6 +1183,15 @@ Module { Parameter { name: "request"; type: "QWebEngineRegisterProtocolHandlerRequest" } } Signal { name: "printRequested"; revision: 8 } + Signal { + name: "selectClientCertificate" + revision: 9 + Parameter { + name: "clientCertSelection" + type: "QQuickWebEngineClientCertificateSelection" + isPointer: true + } + } Method { name: "runJavaScript" Parameter { type: "string" } @@ -1262,6 +1317,32 @@ Module { Parameter { name: "action"; type: "WebAction" } } } + Component { + name: "QWebEngineNotification" + prototype: "QObject" + exports: ["QtWebEngine/WebEngineNotification 1.9"] + isCreatable: false + exportMetaObjectRevisions: [0] + Enum { + name: "Direction" + values: { + "LeftToRight": 0, + "RightToLeft": 1, + "DirectionAuto": 2 + } + } + Property { name: "origin"; type: "QUrl"; isReadonly: true } + Property { name: "icon"; type: "QIcon"; isReadonly: true } + Property { name: "title"; type: "string"; isReadonly: true } + Property { name: "message"; type: "string"; isReadonly: true } + Property { name: "tag"; type: "string"; isReadonly: true } + Property { name: "language"; type: "string"; isReadonly: true } + Property { name: "direction"; type: "Direction"; isReadonly: true } + Signal { name: "closed" } + Method { name: "show" } + Method { name: "click" } + Method { name: "close" } + } Component { name: "QWebEngineQuotaRequest" exports: ["QtWebEngine/QuotaRequest 1.7"] -- cgit v1.2.3