Merge branch '5.6' into dev

Change-Id: I05fe27b8321944cf68cc96dfa9dfcaeb54c8c8cd

2 files changed, 7 insertions, 7 deletions

diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp
index 2025ce588..c59dfb450 100644
--- a/src/webengine/plugin/plugin.cpp
+++ b/src/webengine/plugin/plugin.cpp
@@ -79,7 +79,7 @@ public:
             tr("Cannot create a separate instance of WebEngineDownloadItem"));
         qmlRegisterUncreatableType<QQuickWebEngineNewViewRequest>(uri, 1, 1, "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"));
+        // FIXME(QTBUG-40043): qmlRegisterUncreatableType<QQuickWebEngineSettings, 1>(uri, 1, 2, "WebEngineSettings", tr("Cannot create a separate instance of WebEngineSettings"));
         qmlRegisterSingletonType<QQuickWebEngineSingleton>(uri, 1, 1, "WebEngine", webEngineSingletonProvider);
         qmlRegisterUncreatableType<QQuickWebEngineHistory>(uri, 1, 1, "NavigationHistory",
             tr("Cannot create a separate instance of NavigationHistory"));
diff --git a/src/webengine/plugin/plugins.qmltypes b/src/webengine/plugin/plugins.qmltypes
index 1e577bf51..7a310d268 100644
--- a/src/webengine/plugin/plugins.qmltypes
+++ b/src/webengine/plugin/plugins.qmltypes
@@ -488,8 +488,10 @@ Module {
         exports: ["QtWebEngine/FullScreenRequest 1.1"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
+        Property { name: "origin"; type: "QUrl"; isReadonly: true }
         Property { name: "toggleOn"; type: "bool"; isReadonly: true }
         Method { name: "accept" }
+        Method { name: "reject" }
     }
     Component {
         name: "QQuickWebEngineHistory"
@@ -609,11 +611,7 @@ Module {
             name: "downloadFinished"
             Parameter { name: "download"; type: "QQuickWebEngineDownloadItem"; isPointer: true }
         }
-        Method {
-            name: "setCookieStoreClient"
-            revision: 1
-            Parameter { name: "client"; type: "QWebEngineCookieStoreClient"; isPointer: true }
-        }
+        Method { name: "cookieStoreClient"; revision: 1; type: "QWebEngineCookieStoreClient*" }
     }
     Component {
         name: "QQuickWebEngineScript"
@@ -832,7 +830,8 @@ Module {
                 "DownloadMediaToDisk": 25,
                 "InspectElement": 26,
                 "ExitFullScreen": 27,
-                "WebActionCount": 28
+                "RequestClose": 28,
+                "WebActionCount": 29
             }
         }
         Enum {
@@ -953,6 +952,7 @@ Module {
             Parameter { name: "terminationStatus"; type: "RenderProcessTerminationStatus" }
             Parameter { name: "exitCode"; type: "int" }
         }
+        Signal { name: "windowCloseRequested"; revision: 2 }
         Method {
             name: "runJavaScript"
             Parameter { type: "string" }