summaryrefslogtreecommitdiffstats
path: root/src/webengine/plugin/plugins.qmltypes
diff options
context:
space:
mode:
authorViktor Engelmann <viktor.engelmann@qt.io>2017-09-25 12:52:36 +0200
committerViktor Engelmann <viktor.engelmann@qt.io>2017-09-26 12:25:30 +0000
commitb04675452f7390476f8ef2d5ead47e5085d113e5 (patch)
tree20771059ef9ad7e97b9a27be84423c6c8dca6be3 /src/webengine/plugin/plugins.qmltypes
parent05c6c1b59d59113b81fcb4a5a0388ef98d39ed40 (diff)
Fix version numbers for UnknownUrlSchemePolicy
As 49c0ce8403e5caeb864f66553f122c68a7c975fb missed feature freeze for Qt 5.10, the version numbers must be corrected to Qt 5.11, REVISION 6 etc. Also the auto test was moved into its own source file, so we can blacklist it on Boot2Qt. Task-number: QTBUG-58627 Change-Id: I2381e2433ba1b903a62f59a6db58e5f25af77336 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/webengine/plugin/plugins.qmltypes')
-rw-r--r--src/webengine/plugin/plugins.qmltypes23
1 files changed, 20 insertions, 3 deletions
diff --git a/src/webengine/plugin/plugins.qmltypes b/src/webengine/plugin/plugins.qmltypes
index e8ec1fa7a..b57aa4498 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.6'
+// 'qmlplugindump -defaultplatform -dependencies dependencies.json -nonrelocatable QtWebEngine 1.7'
Module {
dependencies: ["QtQuick 2.6"]
@@ -432,6 +432,16 @@ 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"]
@@ -553,7 +563,8 @@ Module {
Property { name: "allowRunningInsecureContent"; revision: 3; type: "bool" }
Property { name: "allowGeolocationOnInsecureOrigins"; revision: 4; type: "bool" }
Property { name: "allowWindowActivationFromJavaScript"; revision: 5; type: "bool" }
- Property { name: "unknownUrlSchemePolicy"; revision: 5; type: "UnknownUrlSchemePolicy" }
+ Property { name: "showScrollBars"; revision: 5; type: "bool" }
+ Property { name: "unknownUrlSchemePolicy"; revision: 6; type: "UnknownUrlSchemePolicy" }
Signal { name: "fullScreenSupportEnabledChanged"; revision: 1 }
Signal { name: "screenCaptureEnabledChanged"; revision: 2 }
Signal { name: "webGLEnabledChanged"; revision: 2 }
@@ -565,7 +576,8 @@ Module {
Signal { name: "allowRunningInsecureContentChanged"; revision: 3 }
Signal { name: "allowGeolocationOnInsecureOriginsChanged"; revision: 4 }
Signal { name: "allowWindowActivationFromJavaScriptChanged"; revision: 5 }
- Signal { name: "unknownUrlSchemePolicyChanged"; revision: 5 }
+ Signal { name: "showScrollBarsChanged"; revision: 5 }
+ Signal { name: "unknownUrlSchemePolicyChanged"; revision: 6 }
}
Component {
name: "QQuickWebEngineSingleton"
@@ -1039,6 +1051,11 @@ Module {
Parameter { name: "filePath"; type: "string" }
Parameter { name: "success"; type: "bool" }
}
+ Signal {
+ name: "quotaPermissionRequested"
+ revision: 7
+ Parameter { name: "request"; type: "QQuickWebEngineQuotaPermissionRequest" }
+ }
Method {
name: "runJavaScript"
Parameter { type: "string" }