From 349d11dd83578b5baeec87e41c71f612e5bd21b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <juri.valdmann@qt.io>
Date: Thu, 1 Mar 2018 14:32:48 +0100
Subject: Move quota and registerProtocolHandler permission classes to core

- Move QWebEngineQuotaPermissionRequest and
  QWebEngineRegisterProtocolHandlerPermissionRequest to QtWebEngineCore.

- Delete QQuickWebEngineQuotaPermissionRequest and
  QQuickWebEngineRegisterProtocolHandlerPermissionRequest.

Miscellaneous cleanup:

- Mark QWebEngineQuotaPermissionRequest constructors as internal for QDoc.

- Remove superfluous Q_DECLARE_METATYPEs (implied by Q_GADGET).

- Remove Q_UNREACHABLE from default constructor.

  For some reason QML seems to default construct an unused temporary object
  before throwing it away and copy constructing the actual object. This triggers
  Q_UNREACHABLE.

Change-Id: Icf9f4e34996e4c64aec65b734bcb3bbd22b4dc51
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
 src/webengine/plugin/plugin.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/webengine/plugin')

diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp
index a9f406d49..162c814fa 100644
--- a/src/webengine/plugin/plugin.cpp
+++ b/src/webengine/plugin/plugin.cpp
@@ -52,6 +52,8 @@
 #include "qquickwebenginesettings_p.h"
 #include "qquickwebenginesingleton_p.h"
 #include "qquickwebengineview_p.h"
+#include "qwebenginequotapermissionrequest.h"
+#include "qwebengineregisterprotocolhandlerpermissionrequest.h"
 #include "qtwebengineversion.h"
 
 QT_BEGIN_NAMESPACE
@@ -137,10 +139,13 @@ public:
                                                                          msgUncreatableType("FileDialogRequest"));
         qmlRegisterUncreatableType<QQuickWebEngineFormValidationMessageRequest>(uri, 1, 4, "FormValidationMessageRequest",
                                                                          msgUncreatableType("FormValidationMessageRequest"));
-        qmlRegisterUncreatableType<QQuickWebEngineQuotaPermissionRequest>(uri, 1, 7, "QuotaPermissionRequest",
-            tr("Cannot create a separate instance of QuotaPermissionRequest"));
-        qmlRegisterUncreatableType<QQuickWebEngineRegisterProtocolHandlerPermissionRequest>(uri, 1, 7, "RegisterProtocolHandlerPermissionRequest",
-            tr("Cannot create a separate instance of RegisterProtocolHandlerPermissionRequest"));
+        qRegisterMetaType<QWebEngineQuotaPermissionRequest>();
+        qmlRegisterUncreatableType<QWebEngineQuotaPermissionRequest>(uri, 1, 7, "QuotaPermissionRequest",
+                                                                     msgUncreatableType("QuotaPermissionRequest"));
+        qRegisterMetaType<QWebEngineRegisterProtocolHandlerPermissionRequest>();
+        qmlRegisterUncreatableType<QWebEngineRegisterProtocolHandlerPermissionRequest>(uri, 1, 7, "RegisterProtocolHandlerPermissionRequest",
+                                                                                       msgUncreatableType("RegisterProtocolHandlerPermissionRequest"));
+
     }
 
 private:
-- 
cgit v1.2.3