diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp
index f973336f04bbceda79ca501d6ceb39b75720148f..97f4c6e12c9ab94099827271435d5d5e68410655 100644
--- a/src/webengine/plugin/plugin.cpp
+++ b/src/webengine/plugin/plugin.cpp
@@ -84,10 +84,12 @@ public:
qmlRegisterType<QQuickWebEngineView, 2>(uri, 1, 2, "WebEngineView");
qmlRegisterType<QQuickWebEngineView, 3>(uri, 1, 3, "WebEngineView");
qmlRegisterType<QQuickWebEngineView, 4>(uri, 1, 4, "WebEngineView");
+ qmlRegisterType<QQuickWebEngineView, 5>(uri, 1, 5, "WebEngineView");
qmlRegisterType<QQuickWebEngineProfile>(uri, 1, 1, "WebEngineProfile");
qmlRegisterType<QQuickWebEngineProfile, 1>(uri, 1, 2, "WebEngineProfile");
qmlRegisterType<QQuickWebEngineProfile, 2>(uri, 1, 3, "WebEngineProfile");
qmlRegisterType<QQuickWebEngineProfile, 3>(uri, 1, 4, "WebEngineProfile");
+ qmlRegisterType<QQuickWebEngineProfile, 4>(uri, 1, 5, "WebEngineProfile");
qmlRegisterType<QQuickWebEngineScript>(uri, 1, 1, "WebEngineScript");
qmlRegisterUncreatableType<QQuickWebEngineCertificateError>(uri, 1, 1, "WebEngineCertificateError", msgUncreatableType("WebEngineCertificateError"));
qmlRegisterUncreatableType<QQuickWebEngineDownloadItem>(uri, 1, 1, "WebEngineDownloadItem",
@@ -101,7 +103,7 @@ public:
qmlRegisterUncreatableType<QQuickWebEngineDownloadItem, 4>(uri, 1, 5, "WebEngineDownloadItem",
tr("Cannot create a separate instance of WebEngineDownloadItem"));
qmlRegisterUncreatableType<QQuickWebEngineNewViewRequest>(uri, 1, 1, "WebEngineNewViewRequest", msgUncreatableType("WebEngineNewViewRequest"));
- qmlRegisterUncreatableType<QQuickWebEngineNewViewRequest, 1>(uri, 1, 2, "WebEngineNewViewRequest", tr("Cannot create separate instance of WebEngineNewViewRequest"));
+ qmlRegisterUncreatableType<QQuickWebEngineNewViewRequest, 1>(uri, 1, 5, "WebEngineNewViewRequest", tr("Cannot create separate instance of WebEngineNewViewRequest"));
qmlRegisterUncreatableType<QQuickWebEngineSettings>(uri, 1, 1, "WebEngineSettings", tr("Cannot create a separate instance of WebEngineSettings"));
qmlRegisterUncreatableType<QQuickWebEngineSettings, 1>(uri, 1, 2, "WebEngineSettings", tr("Cannot create a separate instance of WebEngineSettings"));
qmlRegisterUncreatableType<QQuickWebEngineSettings, 2>(uri, 1, 3, "WebEngineSettings", tr("Cannot create a separate instance of WebEngineSettings"));
diff --git a/src/webengine/plugin/plugin.pro b/src/webengine/plugin/plugin.pro
index 56eb7bd3cdb1deb2b393c3da4062dd6eaa85069e..68404b4f80a153999f7fbe5a5ce03df86fb843b0 100644
--- a/src/webengine/plugin/plugin.pro
+++ b/src/webengine/plugin/plugin.pro
@@ -1,7 +1,7 @@
CXX_MODULE = qml
TARGET = qtwebengineplugin
TARGETPATH = QtWebEngine
-IMPORT_VERSION = 1.4
+IMPORT_VERSION = 1.5
QT += webengine qml quick
QT_PRIVATE += webengine-private
diff --git a/src/webengine/plugin/plugins.qmltypes b/src/webengine/plugin/plugins.qmltypes
index 48a572866a02ceeff6bc6b8eda99a9bc37de1dad..459d56c75b6fdf24a1df543a9d30669d4c79db1c 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.4'
+// 'qmlplugindump -defaultplatform -dependencies dependencies.json -nonrelocatable QtWebEngine 1.5'
Module {
dependencies: ["QtQuick 2.6"]
@@ -118,10 +118,11 @@ Module {
"QtWebEngine/WebEngineDownloadItem 1.1",
"QtWebEngine/WebEngineDownloadItem 1.2",
"QtWebEngine/WebEngineDownloadItem 1.3",
- "QtWebEngine/WebEngineDownloadItem 1.4"
+ "QtWebEngine/WebEngineDownloadItem 1.4",
+ "QtWebEngine/WebEngineDownloadItem 1.5"
]
isCreatable: false
- exportMetaObjectRevisions: [0, 1, 2, 3]
+ exportMetaObjectRevisions: [0, 1, 2, 3, 4]
Enum {
name: "DownloadState"
values: {
@@ -141,6 +142,35 @@ Module {
"MimeHtmlSaveFormat": 2
}
}
+ Enum {
+ name: "DownloadInterruptReason"
+ values: {
+ "NoReason": 0,
+ "FileFailed": 1,
+ "FileAccessDenied": 2,
+ "FileNoSpace": 3,
+ "FileNameTooLong": 5,
+ "FileTooLarge": 6,
+ "FileVirusInfected": 7,
+ "FileTransientError": 10,
+ "FileBlocked": 11,
+ "FileSecurityCheckFailed": 12,
+ "FileTooShort": 13,
+ "FileHashMismatch": 14,
+ "NetworkFailed": 20,
+ "NetworkTimeout": 21,
+ "NetworkDisconnected": 22,
+ "NetworkServerDown": 23,
+ "NetworkInvalidRequest": 24,
+ "ServerFailed": 30,
+ "ServerBadContent": 33,
+ "ServerUnauthorized": 34,
+ "ServerCertProblem": 35,
+ "ServerForbidden": 36,
+ "ServerUnreachable": 37,
+ "UserCanceled": 40
+ }
+ }
Enum {
name: "DownloadType"
values: {
@@ -158,9 +188,17 @@ Module {
Property { name: "mimeType"; revision: 1; type: "string"; isReadonly: true }
Property { name: "path"; type: "string" }
Property { name: "type"; revision: 3; type: "DownloadType"; isReadonly: true }
+ Property {
+ name: "interruptReason"
+ revision: 4
+ type: "DownloadInterruptReason"
+ isReadonly: true
+ }
+ Property { name: "interruptReasonString"; revision: 4; type: "string"; isReadonly: true }
Signal { name: "savePageFormatChanged"; revision: 2 }
Signal { name: "mimeTypeChanged"; revision: 1 }
Signal { name: "typeChanged"; revision: 3 }
+ Signal { name: "interruptReasonChanged"; revision: 4 }
Method { name: "accept" }
Method { name: "cancel" }
}
@@ -310,14 +348,18 @@ Module {
Component {
name: "QQuickWebEngineNewViewRequest"
prototype: "QObject"
- exports: ["QtWebEngine/WebEngineNewViewRequest 1.1"]
+ exports: [
+ "QtWebEngine/WebEngineNewViewRequest 1.1",
+ "QtWebEngine/WebEngineNewViewRequest 1.5"
+ ]
isCreatable: false
- exportMetaObjectRevisions: [0]
+ exportMetaObjectRevisions: [0, 1]
Property {
name: "destination"
type: "QQuickWebEngineView::NewViewDestination"
isReadonly: true
}
+ Property { name: "requestedUrl"; revision: 1; type: "QUrl"; isReadonly: true }
Property { name: "userInitiated"; type: "bool"; isReadonly: true }
Method {
name: "openIn"
@@ -331,9 +373,10 @@ Module {
"QtWebEngine/WebEngineProfile 1.1",
"QtWebEngine/WebEngineProfile 1.2",
"QtWebEngine/WebEngineProfile 1.3",
- "QtWebEngine/WebEngineProfile 1.4"
+ "QtWebEngine/WebEngineProfile 1.4",
+ "QtWebEngine/WebEngineProfile 1.5"
]
- exportMetaObjectRevisions: [0, 1, 2, 3]
+ exportMetaObjectRevisions: [0, 1, 2, 3, 4]
Enum {
name: "HttpCacheType"
values: {
@@ -361,6 +404,13 @@ Module {
Property { name: "httpCacheMaximumSize"; type: "int" }
Property { name: "spellCheckLanguages"; revision: 3; type: "QStringList" }
Property { name: "spellCheckEnabled"; revision: 3; type: "bool" }
+ Property {
+ name: "userScripts"
+ revision: 4
+ type: "QQuickWebEngineScript"
+ isList: true
+ isReadonly: true
+ }
Signal { name: "httpAcceptLanguageChanged"; revision: 1 }
Signal { name: "spellCheckLanguagesChanged"; revision: 3 }
Signal { name: "spellCheckEnabledChanged"; revision: 3 }
@@ -403,53 +453,53 @@ Module {
Property { name: "runOnSubframes"; type: "bool" }
Signal {
name: "nameChanged"
- Parameter { name: "arg"; type: "string" }
+ Parameter { name: "name"; type: "string" }
}
Signal {
name: "sourceUrlChanged"
- Parameter { name: "arg"; type: "QUrl" }
+ Parameter { name: "url"; type: "QUrl" }
}
Signal {
name: "sourceCodeChanged"
- Parameter { name: "arg"; type: "string" }
+ Parameter { name: "code"; type: "string" }
}
Signal {
name: "injectionPointChanged"
- Parameter { name: "arg"; type: "InjectionPoint" }
+ Parameter { name: "injectionPoint"; type: "InjectionPoint" }
}
Signal {
name: "worldIdChanged"
- Parameter { name: "arg"; type: "ScriptWorldId" }
+ Parameter { name: "scriptWorldId"; type: "ScriptWorldId" }
}
Signal {
name: "runOnSubframesChanged"
- Parameter { name: "arg"; type: "bool" }
+ Parameter { name: "on"; type: "bool" }
}
+ Method { name: "toString"; type: "string" }
Method {
name: "setName"
- Parameter { name: "arg"; type: "string" }
+ Parameter { name: "name"; type: "string" }
}
Method {
name: "setSourceUrl"
- Parameter { name: "arg"; type: "QUrl" }
+ Parameter { name: "url"; type: "QUrl" }
}
Method {
name: "setSourceCode"
- Parameter { name: "arg"; type: "string" }
+ Parameter { name: "code"; type: "string" }
}
Method {
name: "setInjectionPoint"
- Parameter { name: "arg"; type: "InjectionPoint" }
+ Parameter { name: "injectionPoint"; type: "InjectionPoint" }
}
Method {
name: "setWorldId"
- Parameter { name: "arg"; type: "ScriptWorldId" }
+ Parameter { name: "scriptWorldId"; type: "ScriptWorldId" }
}
Method {
name: "setRunOnSubframes"
- Parameter { name: "arg"; type: "bool" }
+ Parameter { name: "on"; type: "bool" }
}
- Method { name: "toString"; type: "string" }
}
Component {
name: "QQuickWebEngineSettings"
@@ -458,10 +508,11 @@ Module {
"QtWebEngine/WebEngineSettings 1.1",
"QtWebEngine/WebEngineSettings 1.2",
"QtWebEngine/WebEngineSettings 1.3",
- "QtWebEngine/WebEngineSettings 1.4"
+ "QtWebEngine/WebEngineSettings 1.4",
+ "QtWebEngine/WebEngineSettings 1.5"
]
isCreatable: false
- exportMetaObjectRevisions: [0, 1, 2, 3]
+ exportMetaObjectRevisions: [0, 1, 2, 3, 4]
Property { name: "autoLoadImages"; type: "bool" }
Property { name: "javascriptEnabled"; type: "bool" }
Property { name: "javascriptCanOpenWindows"; type: "bool" }
@@ -484,6 +535,7 @@ Module {
Property { name: "focusOnNavigationEnabled"; revision: 3; type: "bool" }
Property { name: "printElementBackgrounds"; revision: 3; type: "bool" }
Property { name: "allowRunningInsecureContent"; revision: 3; type: "bool" }
+ Property { name: "allowGeolocationOnInsecureOrigins"; revision: 4; type: "bool" }
Signal { name: "fullScreenSupportEnabledChanged"; revision: 1 }
Signal { name: "screenCaptureEnabledChanged"; revision: 2 }
Signal { name: "webGLEnabledChanged"; revision: 2 }
@@ -493,6 +545,7 @@ Module {
Signal { name: "focusOnNavigationEnabledChanged"; revision: 3 }
Signal { name: "printElementBackgroundsChanged"; revision: 3 }
Signal { name: "allowRunningInsecureContentChanged"; revision: 3 }
+ Signal { name: "allowGeolocationOnInsecureOriginsChanged"; revision: 4 }
}
Component {
name: "QQuickWebEngineSingleton"
@@ -519,9 +572,10 @@ Module {
"QtWebEngine/WebEngineView 1.1",
"QtWebEngine/WebEngineView 1.2",
"QtWebEngine/WebEngineView 1.3",
- "QtWebEngine/WebEngineView 1.4"
+ "QtWebEngine/WebEngineView 1.4",
+ "QtWebEngine/WebEngineView 1.5"
]
- exportMetaObjectRevisions: [0, 1, 2, 3, 4]
+ exportMetaObjectRevisions: [0, 1, 2, 3, 4, 5]
Enum {
name: "NavigationRequestAction"
values: {
@@ -944,6 +998,12 @@ Module {
isPointer: true
}
}
+ Signal {
+ name: "pdfPrintingFinished"
+ revision: 5
+ Parameter { name: "filePath"; type: "string" }
+ Parameter { name: "success"; type: "bool" }
+ }
Method {
name: "runJavaScript"
Parameter { type: "string" }