Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: If771fabe97c4d75edc4627999f04f70ca1901060

3 files changed, 89 insertions, 5 deletions

diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp
index b683c09d3..6cef0a329 100644
--- a/src/webengine/plugin/plugin.cpp
+++ b/src/webengine/plugin/plugin.cpp
@@ -160,12 +160,12 @@ public:
                                                                              msgUncreatableType("RegisterProtocolHandlerRequest"));
         qmlRegisterUncreatableType<QQuickWebEngineAction>(uri, 1, 8, "WebEngineAction", msgUncreatableType("WebEngineAction"));
         qmlRegisterUncreatableType<QQuickWebEngineClientCertificateSelection>(uri, 1, 9, "WebEngineClientCertificateSelection",
-            msgUncreatableType("WebEngineClientCertificateSelection"));
+                                                                              msgUncreatableType("WebEngineClientCertificateSelection"));
         qmlRegisterUncreatableType<QQuickWebEngineClientCertificateOption>(uri, 1, 9, "WebEngineClientCertificateOption",
-            msgUncreatableType("WebEngineClientCertificateOption"));
+                                                                           msgUncreatableType("WebEngineClientCertificateOption"));
         qmlRegisterUncreatableType<QWebEngineNotification>(uri, 1, 9, "WebEngineNotification", msgUncreatableType("WebEngineNotification"));
         qmlRegisterUncreatableType<QQuickWebEngineTooltipRequest>(uri, 1, 10, "TooltipRequest",
-                                                                         msgUncreatableType("TooltipRequest"));
+                                                                  msgUncreatableType("TooltipRequest"));
     }
 
 private:
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..cc2ed502d 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"]
@@ -80,6 +80,46 @@ Module {
         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"
         exports: ["QtWebEngine/ColorDialogRequest 1.4"]
@@ -490,6 +530,11 @@ Module {
             name: "downloadFinished"
             Parameter { name: "download"; type: "QQuickWebEngineDownloadItem"; isPointer: true }
         }
+        Signal {
+            name: "userNotification"
+            revision: 5
+            Parameter { name: "notification"; type: "QWebEngineNotification"; isPointer: true }
+        }
         Method { name: "clearHttpCache"; revision: 2 }
     }
     Component {
@@ -622,6 +667,7 @@ Module {
         Property { name: "webRTCPublicInterfacesOnly"; revision: 6; type: "bool" }
         Property { name: "javascriptCanPaste"; revision: 6; type: "bool" }
         Property { name: "dnsPrefetchEnabled"; revision: 7; type: "bool" }
+        Property { name: "pdfViewerEnabled"; revision: 8; type: "bool" }
         Signal { name: "fullScreenSupportEnabledChanged"; revision: 1 }
         Signal { name: "screenCaptureEnabledChanged"; revision: 2 }
         Signal { name: "webGLEnabledChanged"; revision: 2 }
@@ -639,6 +685,7 @@ Module {
         Signal { name: "webRTCPublicInterfacesOnlyChanged"; revision: 6 }
         Signal { name: "javascriptCanPasteChanged"; revision: 6 }
         Signal { name: "dnsPrefetchEnabledChanged"; revision: 7 }
+        Signal { name: "pdfViewerEnabledChanged"; revision: 8 }
     }
     Component {
         name: "QQuickWebEngineSingleton"
@@ -729,7 +776,8 @@ Module {
                 "MediaAudioVideoCapture": 2,
                 "Geolocation": 3,
                 "DesktopVideoCapture": 4,
-                "DesktopAudioVideoCapture": 5
+                "DesktopAudioVideoCapture": 5,
+                "Notifications": 6
             }
         }
         Enum {
@@ -1137,6 +1185,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" }
@@ -1263,6 +1320,32 @@ Module {
         }
     }
     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"]
         isCreatable: false