summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2018-03-06 16:06:45 +0100
committerKai Koehne <kai.koehne@qt.io>2018-04-17 15:39:28 +0000
commit7c964ca5569cdbf0d1570d0328f73c4fe8c93758 (patch)
treef3f9ceb7cb0d8ae1146aedd36448cefe5c765a3d
parent7566b23f7d4df9898369a9608b000c0364221177 (diff)
Update plugins.qmltypes
Task-number: QTBUG-66905 Change-Id: I149a0d6a9b16ddc55c52200b7dce2b5e37409e9d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/webengine/plugin/dependencies.json2
-rw-r--r--src/webengine/plugin/plugins.qmltypes48
2 files changed, 34 insertions, 16 deletions
diff --git a/src/webengine/plugin/dependencies.json b/src/webengine/plugin/dependencies.json
index 115ba72e7..ef26b3617 100644
--- a/src/webengine/plugin/dependencies.json
+++ b/src/webengine/plugin/dependencies.json
@@ -2,6 +2,6 @@
{
"name": "QtQuick",
"type": "module",
- "version": "2.6"
+ "version": "2.8"
}
]
diff --git a/src/webengine/plugin/plugins.qmltypes b/src/webengine/plugin/plugins.qmltypes
index a1af20503..5c61ee8d0 100644
--- a/src/webengine/plugin/plugins.qmltypes
+++ b/src/webengine/plugin/plugins.qmltypes
@@ -7,7 +7,7 @@ import QtQuick.tooling 1.2
// 'qmlplugindump -defaultplatform -dependencies dependencies.json -nonrelocatable QtWebEngine 1.7'
Module {
- dependencies: ["QtQuick 2.6"]
+ dependencies: ["QtQuick 2.8"]
Component {
name: "QQuickWebEngineAuthenticationDialogRequest"
prototype: "QObject"
@@ -154,10 +154,11 @@ Module {
"QtWebEngine/WebEngineDownloadItem 1.3",
"QtWebEngine/WebEngineDownloadItem 1.4",
"QtWebEngine/WebEngineDownloadItem 1.5",
- "QtWebEngine/WebEngineDownloadItem 1.6"
+ "QtWebEngine/WebEngineDownloadItem 1.6",
+ "QtWebEngine/WebEngineDownloadItem 1.7"
]
isCreatable: false
- exportMetaObjectRevisions: [0, 1, 2, 3, 4, 5]
+ exportMetaObjectRevisions: [0, 1, 2, 3, 4, 5, 6]
Enum {
name: "DownloadState"
values: {
@@ -467,16 +468,6 @@ Module {
Method { name: "clearHttpCache"; revision: 2 }
}
Component {
- name: "QQuickWebEngineQuotaPermissionRequest"
- exports: ["QtWebEngine/QuotaPermissionRequest 1.7"]
- isCreatable: false
- exportMetaObjectRevisions: [0]
- Property { name: "origin"; type: "QUrl"; isReadonly: true }
- Property { name: "requestedSize"; type: "qlonglong"; isReadonly: true }
- Method { name: "accept" }
- Method { name: "reject" }
- }
- Component {
name: "QQuickWebEngineScript"
prototype: "QObject"
exports: ["QtWebEngine/WebEngineScript 1.1"]
@@ -603,6 +594,7 @@ Module {
Property { name: "unknownUrlSchemePolicy"; revision: 6; type: "UnknownUrlSchemePolicy" }
Property { name: "playbackRequiresUserGesture"; revision: 6; type: "bool" }
Property { name: "webRTCPublicInterfacesOnly"; revision: 6; type: "bool" }
+ Property { name: "javascriptCanPaste"; revision: 6; type: "bool" }
Signal { name: "fullScreenSupportEnabledChanged"; revision: 1 }
Signal { name: "screenCaptureEnabledChanged"; revision: 2 }
Signal { name: "webGLEnabledChanged"; revision: 2 }
@@ -618,6 +610,7 @@ Module {
Signal { name: "unknownUrlSchemePolicyChanged"; revision: 6 }
Signal { name: "playbackRequiresUserGestureChanged"; revision: 6 }
Signal { name: "webRTCPublicInterfacesOnlyChanged"; revision: 6 }
+ Signal { name: "javascriptCanPasteChanged"; revision: 6 }
}
Component {
name: "QQuickWebEngineSingleton"
@@ -1096,9 +1089,9 @@ Module {
Parameter { name: "success"; type: "bool" }
}
Signal {
- name: "quotaPermissionRequested"
+ name: "quotaRequested"
revision: 7
- Parameter { name: "request"; type: "QQuickWebEngineQuotaPermissionRequest" }
+ Parameter { name: "request"; type: "QWebEngineQuotaRequest" }
}
Signal {
name: "geometryChangeRequested"
@@ -1108,6 +1101,11 @@ Module {
}
Signal { name: "inspectedViewChanged"; revision: 7 }
Signal { name: "devToolsViewChanged"; revision: 7 }
+ Signal {
+ name: "registerProtocolHandlerRequested"
+ revision: 7
+ Parameter { name: "request"; type: "QWebEngineRegisterProtocolHandlerRequest" }
+ }
Method {
name: "runJavaScript"
Parameter { type: "string" }
@@ -1227,4 +1225,24 @@ Module {
Parameter { name: "replacement"; type: "string" }
}
}
+ Component {
+ name: "QWebEngineQuotaRequest"
+ exports: ["QtWebEngine/QuotaRequest 1.7"]
+ isCreatable: false
+ exportMetaObjectRevisions: [0]
+ Property { name: "origin"; type: "QUrl"; isReadonly: true }
+ Property { name: "requestedSize"; type: "qlonglong"; isReadonly: true }
+ Method { name: "accept" }
+ Method { name: "reject" }
+ }
+ Component {
+ name: "QWebEngineRegisterProtocolHandlerRequest"
+ exports: ["QtWebEngine/RegisterProtocolHandlerRequest 1.7"]
+ isCreatable: false
+ exportMetaObjectRevisions: [0]
+ Property { name: "origin"; type: "QUrl"; isReadonly: true }
+ Property { name: "scheme"; type: "string"; isReadonly: true }
+ Method { name: "accept" }
+ Method { name: "reject" }
+ }
}