From a2a9ea11f95b4a5347f599d8a28151166ad00a71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCri=20Valdmann?= <juri.valdmann@qt.io>
Date: Tue, 28 Apr 2020 14:45:18 +0200
Subject: Move QWebEngineCertificateError to core and use it in QML

Update qml certificate error test.

Task-number: QTBUG-74585
Change-Id: I9383052bd1e37160d03e3d66e8f2e4a749023736
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 src/webengine/plugin/plugin.cpp       | 5 +++--
 src/webengine/plugin/plugins.qmltypes | 5 ++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/webengine/plugin')

diff --git a/src/webengine/plugin/plugin.cpp b/src/webengine/plugin/plugin.cpp
index 2603e91ef..25cb375ad 100644
--- a/src/webengine/plugin/plugin.cpp
+++ b/src/webengine/plugin/plugin.cpp
@@ -40,7 +40,6 @@
 #include <QtQml/qqmlextensionplugin.h>
 #include <QtWebEngine/QQuickWebEngineProfile>
 
-#include <QtWebEngine/private/qquickwebenginecertificateerror_p.h>
 #include <QtWebEngine/private/qquickwebengineclientcertificateselection_p.h>
 #include <QtWebEngine/private/qquickwebenginedialogrequests_p.h>
 #include <QtWebEngine/private/qquickwebenginedownloaditem_p.h>
@@ -54,6 +53,7 @@
 #include <QtWebEngine/private/qquickwebenginetouchhandleprovider_p_p.h>
 #include <QtWebEngine/private/qquickwebengineview_p.h>
 #include <QtWebEngine/private/qquickwebengineaction_p.h>
+#include <QtWebEngineCore/qwebenginecertificateerror.h>
 #include <QtWebEngineCore/qwebenginefindtextresult.h>
 #include <QtWebEngineCore/qwebenginenotification.h>
 #include <QtWebEngineCore/qwebenginequotarequest.h>
@@ -105,7 +105,8 @@ public:
         qmlRegisterType<QQuickWebEngineProfile, 4>(uri, 1, 5, "WebEngineProfile");
         qmlRegisterType<QQuickWebEngineProfile, 5>(uri, 1, 9, "WebEngineProfile");
         qmlRegisterType<QQuickWebEngineScript>(uri, 1, 1, "WebEngineScript");
-        qmlRegisterUncreatableType<QQuickWebEngineCertificateError>(uri, 1, 1, "WebEngineCertificateError", msgUncreatableType("WebEngineCertificateError"));
+        qRegisterMetaType<QWebEngineCertificateError>();
+        qmlRegisterUncreatableType<QWebEngineCertificateError>(uri, 1, 1, "WebEngineCertificateError", msgUncreatableType("WebEngineCertificateError"));
         qmlRegisterUncreatableType<QQuickWebEngineDownloadItem>(uri, 1, 1, "WebEngineDownloadItem",
             msgUncreatableType("WebEngineDownloadItem"));
         qmlRegisterUncreatableType<QQuickWebEngineDownloadItem, 1>(uri, 1, 2, "WebEngineDownloadItem",
diff --git a/src/webengine/plugin/plugins.qmltypes b/src/webengine/plugin/plugins.qmltypes
index 24b073290..8f0a848d5 100644
--- a/src/webengine/plugin/plugins.qmltypes
+++ b/src/webengine/plugin/plugins.qmltypes
@@ -320,8 +320,7 @@ Module {
         Method { name: "dialogReject" }
     }
     Component {
-        name: "QQuickWebEngineCertificateError"
-        prototype: "QObject"
+        name: "QWebEngineCertificateError"
         exports: ["QtWebEngine/WebEngineCertificateError 1.1"]
         isCreatable: false
         exportMetaObjectRevisions: [0]
@@ -1371,7 +1370,7 @@ Module {
         Signal {
             name: "certificateError"
             revision: 1
-            Parameter { name: "error"; type: "QQuickWebEngineCertificateError"; isPointer: true }
+            Parameter { name: "error"; type: "QWebEngineCertificateError" }
         }
         Signal {
             name: "fullScreenRequested"
-- 
cgit v1.2.3