diff options
author | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-06-29 18:55:29 +0200 |
---|---|---|
committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2021-07-01 14:50:42 +0200 |
commit | 5f39a1098e7e64bf8d9947077d95b69e13f42416 (patch) | |
tree | ac86dbf46385dce490963b1252e75eec40be3cb9 | |
parent | c248844b3b8ee004800606d1a6c6e6d6bee31738 (diff) |
Fix enums access in qml for api types
Add missing namespace qml registration for WebEngineLoadingInfo,
CertificateError
Pick-to: 6.2
Change-Id: I154070df3ab685b36d000cdfc064a074d002afc0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
4 files changed, 40 insertions, 10 deletions
diff --git a/src/webenginequick/api/qquickwebengineforeigntypes_p.h b/src/webenginequick/api/qquickwebengineforeigntypes_p.h index 6f7ffdc06..776873500 100644 --- a/src/webenginequick/api/qquickwebengineforeigntypes_p.h +++ b/src/webenginequick/api/qquickwebengineforeigntypes_p.h @@ -69,6 +69,15 @@ QT_BEGIN_NAMESPACE +namespace ForeignWebEngineLoadingInfoNamespace +{ + Q_NAMESPACE + QML_FOREIGN_NAMESPACE(QWebEngineLoadingInfo) + QML_NAMED_ELEMENT(WebEngineLoadingInfo) + QML_ADDED_IN_VERSION(1, 1) + QML_EXTRA_VERSION(2, 0) +} + struct ForeignWebEngineLoadingInfo { Q_GADGET @@ -79,6 +88,15 @@ struct ForeignWebEngineLoadingInfo QML_UNCREATABLE("") }; +namespace ForeignWebEngineCertificateErrorNamespace +{ + Q_NAMESPACE + QML_FOREIGN_NAMESPACE(QWebEngineCertificateError) + QML_NAMED_ELEMENT(WebEngineCertificateError) + QML_ADDED_IN_VERSION(1, 1) + QML_EXTRA_VERSION(2, 0) +} + struct ForeignWebEngineCertificateError { Q_GADGET @@ -106,7 +124,7 @@ namespace ForeignWebEngineScriptNamespace QML_NAMED_ELEMENT(WebEngineScript) QML_ADDED_IN_VERSION(1, 1) QML_EXTRA_VERSION(2, 0) -}; +} struct ForeignWebEngineScript { diff --git a/tests/auto/quick/qmltests/data/tst_certificateError.qml b/tests/auto/quick/qmltests/data/tst_certificateError.qml index 07cfa3aa8..dcfd13498 100644 --- a/tests/auto/quick/qmltests/data/tst_certificateError.qml +++ b/tests/auto/quick/qmltests/data/tst_certificateError.qml @@ -91,7 +91,8 @@ TestWebEngineView { } view.certificateError.connect(handleCertificateError) - view.url = Shared.HttpsServer.url() + const server_url = Shared.HttpsServer.url() + view.url = server_url if (data.deferError) { spyError.wait() @@ -114,6 +115,12 @@ TestWebEngineView { compare(data.expectedContent, view.getBodyText()) view.certificateError.disconnect(handleCertificateError) + + let error = spyError.signalArguments[0][0] + compare(error.url, server_url) + verify(error.description.length > 0) + verify(error.overridable) + compare(error.type, WebEngineCertificateError.CertificateAuthorityInvalid) } } } diff --git a/tests/auto/quick/qmltests/data/tst_loadFail.qml b/tests/auto/quick/qmltests/data/tst_loadFail.qml index 69a8bd274..58d6b9e3c 100644 --- a/tests/auto/quick/qmltests/data/tst_loadFail.qml +++ b/tests/auto/quick/qmltests/data/tst_loadFail.qml @@ -85,6 +85,7 @@ TestWebEngineView { let loadStart = loadSpy.signalArguments[0][0] compare(loadStart.status, WebEngineView.LoadStartedStatus) compare(loadStart.errorDomain, WebEngineView.NoErrorDomain) + compare(loadStart.errorDomain, WebEngineLoadingInfo.NoErrorDomain) compare(loadStart.url, unavailableUrl) verify(!loadStart.isErrorPage) @@ -92,6 +93,7 @@ TestWebEngineView { let loadFail = loadSpy.signalArguments[1][0] compare(loadFail.status, WebEngineView.LoadFailedStatus) compare(loadFail.errorDomain, WebEngineView.InternalErrorDomain) + compare(loadFail.errorDomain, WebEngineLoadingInfo.InternalErrorDomain) compare(loadFail.url, unavailableUrl) verify(loadFail.isErrorPage) diff --git a/tests/auto/quick/qmltests/data/tst_loadUrl.qml b/tests/auto/quick/qmltests/data/tst_loadUrl.qml index b60a00faf..3a2341fc2 100644 --- a/tests/auto/quick/qmltests/data/tst_loadUrl.qml +++ b/tests/auto/quick/qmltests/data/tst_loadUrl.qml @@ -80,8 +80,8 @@ TestWebEngineView { var aboutBlank = "about:blank"; webEngineView.url = aboutBlank; verify(webEngineView.waitForLoadSucceeded()); - compare(loadRequestArray[0].status, WebEngineView.LoadStartedStatus); - compare(loadRequestArray[1].status, WebEngineView.LoadSucceededStatus); + compare(loadRequestArray[0].status, WebEngineLoadingInfo.LoadStartedStatus); + compare(loadRequestArray[1].status, WebEngineLoadingInfo.LoadSucceededStatus); compare(loadRequestArray.length, 2); compare(webEngineView.url, aboutBlank); webEngineView.clear(); @@ -134,6 +134,7 @@ TestWebEngineView { compare(loadRequest.activeUrl, bogusSite); loadRequest = loadRequestArray[1]; compare(loadRequest.status, WebEngineView.LoadFailedStatus); + compare(loadRequest.status, WebEngineLoadingInfo.LoadFailedStatus); compare(loadRequest.activeUrl, url); webEngineView.clear(); @@ -149,10 +150,10 @@ TestWebEngineView { compare(loadRequest.status, WebEngineView.LoadSucceededStatus); compare(loadRequest.activeUrl, redirectUrl); loadRequest = loadRequestArray[2]; - compare(loadRequest.status, WebEngineView.LoadStartedStatus); + compare(loadRequest.status, WebEngineLoadingInfo.LoadStartedStatus); compare(loadRequest.activeUrl, redirectUrl); loadRequest = loadRequestArray[3]; - compare(loadRequest.status, WebEngineView.LoadSucceededStatus); + compare(loadRequest.status, WebEngineLoadingInfo.LoadSucceededStatus); compare(loadRequest.activeUrl, url); webEngineView.clear(); @@ -174,11 +175,11 @@ TestWebEngineView { tryCompare(loadRequestArray, "length", 2); loadRequest = loadRequestArray[0]; - compare(loadRequest.status, WebEngineView.LoadStartedStatus); + compare(loadRequest.status, WebEngineLoadingInfo.LoadStartedStatus); compare(loadRequest.url, url); compare(loadRequest.activeUrl, lastUrl); loadRequest = loadRequestArray[1]; - compare(loadRequest.status, WebEngineView.LoadSucceededStatus); + compare(loadRequest.status, WebEngineLoadingInfo.LoadSucceededStatus); compare(loadRequest.url, url); compare(loadRequest.activeUrl, url); webEngineView.clear(); @@ -226,15 +227,16 @@ TestWebEngineView { compare(loadRequest.activeUrl, bogusSite); loadRequest = loadRequestArray[1]; compare(loadRequest.status, WebEngineView.LoadFailedStatus); + compare(loadRequest.status, WebEngineLoadingInfo.LoadFailedStatus); // Since the load did not succeed the active url is the // URL of the previous successful load. compare(loadRequest.activeUrl, aboutBlank); loadRequest = loadRequestArray[2]; - compare(loadRequest.status, WebEngineView.LoadStartedStatus); + compare(loadRequest.status, WebEngineLoadingInfo.LoadStartedStatus); compare(loadRequest.activeUrl, bogusSite); compare(loadRequest.url, "data:text/html;charset=UTF-8,load failed") loadRequest = loadRequestArray[3]; - compare(loadRequest.status, WebEngineView.LoadSucceededStatus); + compare(loadRequest.status, WebEngineLoadingInfo.LoadSucceededStatus); compare(loadRequest.activeUrl, bogusSite); compare(loadRequest.url, bogusSite) webEngineView.clear(); @@ -286,6 +288,7 @@ TestWebEngineView { compare(loadRequest.activeUrl, stoppedUrl); loadRequest = loadRequestArray[1]; compare(loadRequest.status, WebEngineView.LoadStoppedStatus); + compare(loadRequest.status, WebEngineLoadingInfo.LoadStoppedStatus); compare(loadRequest.url, stoppedUrl); compare(loadRequest.activeUrl, initialUrl); webEngineView.clear(); |