diff options
12 files changed, 72 insertions, 152 deletions
diff --git a/src/core/api/core_api.pro b/src/core/api/core_api.pro index 3763fb391..cff7b1506 100644 --- a/src/core/api/core_api.pro +++ b/src/core/api/core_api.pro @@ -39,6 +39,8 @@ HEADERS = \ qwebenginecookiestore.h \ qwebenginecookiestore_p.h \ qwebenginehttprequest.h \ + qwebenginequotapermissionrequest.h \ + qwebengineregisterprotocolhandlerpermissionrequest.h \ qwebengineurlrequestinterceptor.h \ qwebengineurlrequestinfo.h \ qwebengineurlrequestinfo_p.h \ @@ -50,6 +52,8 @@ SOURCES = \ qwebenginebrowsercontext.cpp \ qwebenginecookiestore.cpp \ qwebenginehttprequest.cpp \ + qwebenginequotapermissionrequest.cpp \ + qwebengineregisterprotocolhandlerpermissionrequest.cpp \ qwebengineurlrequestinfo.cpp \ qwebengineurlrequestjob.cpp \ qwebengineurlschemehandler.cpp diff --git a/src/webenginewidgets/api/qwebenginequotapermissionrequest.cpp b/src/core/api/qwebenginequotapermissionrequest.cpp index f8f987e2c..5750d84ae 100644 --- a/src/webenginewidgets/api/qwebenginequotapermissionrequest.cpp +++ b/src/core/api/qwebenginequotapermissionrequest.cpp @@ -51,16 +51,14 @@ QT_BEGIN_NAMESPACE \since 5.11 - \inmodule QtWebEngineWidgets + \inmodule QtWebEngineCore */ -static void registerMetaTypes() -{ - qRegisterMetaType<QWebEngineQuotaPermissionRequest>(); -} - -Q_CONSTRUCTOR_FUNCTION(registerMetaTypes) +/*! \fn QWebEngineQuotaPermissionRequest::QWebEngineQuotaPermissionRequest() + \internal +*/ +/*! \internal */ QWebEngineQuotaPermissionRequest::QWebEngineQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController> controller) : d_ptr(controller) { @@ -102,4 +100,12 @@ qint64 QWebEngineQuotaPermissionRequest::requestedSize() const return d_ptr->requestedSize(); } +/*! \fn bool QWebEngineQuotaPermissionRequest::operator==(const QWebEngineQuotaPermissionRequest &that) const + Returns \c true if the objects are equal. +*/ + +/*! \fn bool QWebEngineQuotaPermissionRequest::operator!=(const QWebEngineQuotaPermissionRequest &that) const + Returns \c true if the objects are not equal. +*/ + QT_END_NAMESPACE diff --git a/src/webenginewidgets/api/qwebenginequotapermissionrequest.h b/src/core/api/qwebenginequotapermissionrequest.h index ed6e9edc3..5c6e6c007 100644 --- a/src/webenginewidgets/api/qwebenginequotapermissionrequest.h +++ b/src/core/api/qwebenginequotapermissionrequest.h @@ -42,7 +42,7 @@ #include <QtCore/qsharedpointer.h> #include <QtCore/qurl.h> -#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h> +#include <QtWebEngineCore/qtwebenginecoreglobal.h> namespace QtWebEngineCore { class QuotaPermissionController; @@ -50,24 +50,23 @@ namespace QtWebEngineCore { QT_BEGIN_NAMESPACE -class QWEBENGINEWIDGETS_EXPORT QWebEngineQuotaPermissionRequest { +class QWEBENGINE_EXPORT QWebEngineQuotaPermissionRequest { Q_GADGET Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL) Q_PROPERTY(qint64 requestedSize READ requestedSize CONSTANT FINAL) public: - explicit QWebEngineQuotaPermissionRequest() { Q_UNREACHABLE(); } - explicit QWebEngineQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController> controller); + QWebEngineQuotaPermissionRequest() {} + QWebEngineQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController>); Q_INVOKABLE void accept(); Q_INVOKABLE void reject(); QUrl origin() const; qint64 requestedSize() const; - + bool operator==(const QWebEngineQuotaPermissionRequest &that) const { return d_ptr == that.d_ptr; } + bool operator!=(const QWebEngineQuotaPermissionRequest &that) const { return d_ptr != that.d_ptr; } private: QSharedPointer<QtWebEngineCore::QuotaPermissionController> d_ptr; }; QT_END_NAMESPACE -Q_DECLARE_METATYPE(QWebEngineQuotaPermissionRequest) - #endif // QWEBENGINEQUOTAPERMISSIONREQUEST_H diff --git a/src/webenginewidgets/api/qwebengineregisterprotocolhandlerpermissionrequest.cpp b/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.cpp index ad1398daf..1d893bd1c 100644 --- a/src/webenginewidgets/api/qwebengineregisterprotocolhandlerpermissionrequest.cpp +++ b/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE /*! \class QWebEngineRegisterProtocolHandlerPermissionRequest - \inmodule QtWebEngineWidgets + \inmodule QtWebEngineCore \since 5.11 \brief The QWebEngineRegisterProtocolHandlerPermissionRequest type enables accepting or rejecting requests from the \l registerProtocolHandler API. @@ -53,13 +53,6 @@ QT_BEGIN_NAMESPACE \sa QWebEnginePage::registerProtocolHandlerPermissionRequested */ -static void registerMetaTypes() -{ - qRegisterMetaType<QWebEngineRegisterProtocolHandlerPermissionRequest>(); -} - -Q_CONSTRUCTOR_FUNCTION(registerMetaTypes) - /*! \fn QWebEngineRegisterProtocolHandlerPermissionRequest::QWebEngineRegisterProtocolHandlerPermissionRequest() \internal */ @@ -112,4 +105,12 @@ QString QWebEngineRegisterProtocolHandlerPermissionRequest::protocol() const return d_ptr->protocol(); } +/*! \fn bool QWebEngineRegisterProtocolHandlerPermissionRequest::operator==(const QWebEngineRegisterProtocolHandlerPermissionRequest &that) const + Returns \c true if the objects are equal. +*/ + +/*! \fn bool QWebEngineRegisterProtocolHandlerPermissionRequest::operator!=(const QWebEngineRegisterProtocolHandlerPermissionRequest &that) const + Returns \c true if the objects are not equal. +*/ + QT_END_NAMESPACE diff --git a/src/webenginewidgets/api/qwebengineregisterprotocolhandlerpermissionrequest.h b/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.h index 592eabb34..43ddf35e4 100644 --- a/src/webenginewidgets/api/qwebengineregisterprotocolhandlerpermissionrequest.h +++ b/src/core/api/qwebengineregisterprotocolhandlerpermissionrequest.h @@ -42,7 +42,7 @@ #include <QtCore/qsharedpointer.h> #include <QtCore/qurl.h> -#include <QtWebEngineWidgets/qtwebenginewidgetsglobal.h> +#include <QtWebEngineCore/qtwebenginecoreglobal.h> namespace QtWebEngineCore { class RegisterProtocolHandlerPermissionController; @@ -50,7 +50,7 @@ namespace QtWebEngineCore { QT_BEGIN_NAMESPACE -class QWEBENGINEWIDGETS_EXPORT QWebEngineRegisterProtocolHandlerPermissionRequest { +class QWEBENGINE_EXPORT QWebEngineRegisterProtocolHandlerPermissionRequest { Q_GADGET Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL) Q_PROPERTY(QString protocol READ protocol CONSTANT FINAL) @@ -62,12 +62,12 @@ public: Q_INVOKABLE void reject(); QUrl origin() const; QString protocol() const; - + bool operator==(const QWebEngineRegisterProtocolHandlerPermissionRequest &that) const { return d_ptr == that.d_ptr; } + bool operator!=(const QWebEngineRegisterProtocolHandlerPermissionRequest &that) const { return d_ptr != that.d_ptr; } private: QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerPermissionController> d_ptr; }; QT_END_NAMESPACE -Q_DECLARE_METATYPE(QWebEngineRegisterProtocolHandlerPermissionRequest) #endif // QWEBENGINEREGISTERPROTOCOLHANDLERPERMISSIONREQUEST_H diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index eb67d6571..5e11a1c04 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -45,8 +45,6 @@ #include "certificate_error_controller.h" #include "file_picker_controller.h" #include "javascript_dialog_controller.h" -#include "quota_permission_controller.h" -#include "register_protocol_handler_permission_controller.h" #include "qquickwebenginehistory_p.h" #include "qquickwebenginecertificateerror_p.h" #include "qquickwebenginecontextmenurequest_p.h" @@ -58,6 +56,8 @@ #include "qquickwebengineprofile_p.h" #include "qquickwebenginesettings_p.h" #include "qquickwebenginescript_p.h" +#include "qwebenginequotapermissionrequest.h" +#include "qwebengineregisterprotocolhandlerpermissionrequest.h" #ifdef ENABLE_QML_TESTSUPPORT_API #include "qquickwebenginetestsupport_p.h" @@ -593,14 +593,14 @@ void QQuickWebEngineViewPrivate::runMouseLockPermissionRequest(const QUrl &secur void QQuickWebEngineViewPrivate::runQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController> controller) { Q_Q(QQuickWebEngineView); - QQuickWebEngineQuotaPermissionRequest request(controller); + QWebEngineQuotaPermissionRequest request(std::move(controller)); Q_EMIT q->quotaPermissionRequested(request); } void QQuickWebEngineViewPrivate::runRegisterProtocolHandlerPermissionRequest(QSharedPointer<RegisterProtocolHandlerPermissionController> controller) { Q_Q(QQuickWebEngineView); - QQuickWebEngineRegisterProtocolHandlerPermissionRequest request(std::move(controller)); + QWebEngineRegisterProtocolHandlerPermissionRequest request(std::move(controller)); Q_EMIT q->registerProtocolHandlerPermissionRequested(request); } @@ -1805,60 +1805,6 @@ void QQuickWebEngineFullScreenRequest::reject() m_viewPrivate->setFullScreenMode(!m_toggleOn); } -QQuickWebEngineQuotaPermissionRequest::QQuickWebEngineQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController> controller) - : d_ptr(controller) -{ -} - -QQuickWebEngineQuotaPermissionRequest::~QQuickWebEngineQuotaPermissionRequest() -{ -} - -void QQuickWebEngineQuotaPermissionRequest::accept() -{ - d_ptr->accept(); -} - -void QQuickWebEngineQuotaPermissionRequest::reject() -{ - d_ptr->reject(); -} - -QUrl QQuickWebEngineQuotaPermissionRequest::origin() const -{ - return d_ptr->origin(); -} - -qint64 QQuickWebEngineQuotaPermissionRequest::requestedSize() const -{ - return d_ptr->requestedSize(); -} - -QQuickWebEngineRegisterProtocolHandlerPermissionRequest::QQuickWebEngineRegisterProtocolHandlerPermissionRequest( - QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerPermissionController> d_ptr) - : d_ptr(std::move(d_ptr)) -{} - -void QQuickWebEngineRegisterProtocolHandlerPermissionRequest::accept() -{ - d_ptr->accept(); -} - -void QQuickWebEngineRegisterProtocolHandlerPermissionRequest::reject() -{ - d_ptr->reject(); -} - -QUrl QQuickWebEngineRegisterProtocolHandlerPermissionRequest::origin() const -{ - return d_ptr->origin(); -} - -QString QQuickWebEngineRegisterProtocolHandlerPermissionRequest::protocol() const -{ - return d_ptr->protocol(); -} - QQuickContextMenuBuilder::QQuickContextMenuBuilder(const QtWebEngineCore::WebEngineContextMenuData &data, QQuickWebEngineView *view, QObject *menu) diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index 5b018b8a8..76b5c2be9 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -57,12 +57,6 @@ #include <QtGui/qcolor.h> -namespace QtWebEngineCore { - class QuotaPermissionController; - class RegisterProtocolHandlerPermissionController; -} - - QT_BEGIN_NAMESPACE class QQmlWebChannel; @@ -82,6 +76,8 @@ class QQuickWebEngineProfile; class QQuickWebEngineSettings; class QQuickWebEngineFormValidationMessageRequest; class QQuickWebEngineViewPrivate; +class QWebEngineQuotaPermissionRequest; +class QWebEngineRegisterProtocolHandlerPermissionRequest; #ifdef ENABLE_QML_TESTSUPPORT_API class QQuickWebEngineTestSupport; @@ -106,42 +102,6 @@ private: const bool m_toggleOn; }; -class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineQuotaPermissionRequest { - Q_GADGET - Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL) - Q_PROPERTY(qint64 requestedSize READ requestedSize CONSTANT FINAL) -public: - QQuickWebEngineQuotaPermissionRequest() {} - QQuickWebEngineQuotaPermissionRequest(QSharedPointer<QtWebEngineCore::QuotaPermissionController> controller); - ~QQuickWebEngineQuotaPermissionRequest(); - - Q_INVOKABLE void accept(); - Q_INVOKABLE void reject(); - QUrl origin() const; - qint64 requestedSize() const; - -private: - QSharedPointer<QtWebEngineCore::QuotaPermissionController> d_ptr; -}; - -class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineRegisterProtocolHandlerPermissionRequest { - Q_GADGET - Q_PROPERTY(QUrl origin READ origin CONSTANT FINAL) - Q_PROPERTY(QString protocol READ protocol CONSTANT FINAL) -public: - QQuickWebEngineRegisterProtocolHandlerPermissionRequest() {} - QQuickWebEngineRegisterProtocolHandlerPermissionRequest( - QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerPermissionController>); - - Q_INVOKABLE void accept(); - Q_INVOKABLE void reject(); - QUrl origin() const; - QString protocol() const; - -private: - QSharedPointer<QtWebEngineCore::RegisterProtocolHandlerPermissionController> d_ptr; -}; - #define LATEST_WEBENGINEVIEW_REVISION 7 class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem { @@ -582,11 +542,11 @@ Q_SIGNALS: Q_REVISION(4) void fileDialogRequested(QQuickWebEngineFileDialogRequest *request); Q_REVISION(4) void formValidationMessageRequested(QQuickWebEngineFormValidationMessageRequest *request); Q_REVISION(5) void pdfPrintingFinished(const QString &filePath, bool success); - Q_REVISION(7) void quotaPermissionRequested(const QQuickWebEngineQuotaPermissionRequest &request); + Q_REVISION(7) void quotaPermissionRequested(const QWebEngineQuotaPermissionRequest &request); Q_REVISION(7) void geometryChangeRequested(const QRect &geometry, const QRect &frameGeometry); Q_REVISION(7) void inspectedViewChanged(); Q_REVISION(7) void devToolsViewChanged(); - Q_REVISION(7) void registerProtocolHandlerPermissionRequested(const QQuickWebEngineRegisterProtocolHandlerPermissionRequest &request); + Q_REVISION(7) void registerProtocolHandlerPermissionRequested(const QWebEngineRegisterProtocolHandlerPermissionRequest &request); #ifdef ENABLE_QML_TESTSUPPORT_API void testSupportChanged(); @@ -616,7 +576,5 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickWebEngineView) Q_DECLARE_METATYPE(QQuickWebEngineFullScreenRequest) -Q_DECLARE_METATYPE(QQuickWebEngineQuotaPermissionRequest) -Q_DECLARE_METATYPE(QQuickWebEngineRegisterProtocolHandlerPermissionRequest) #endif // QQUICKWEBENGINEVIEW_P_H diff --git a/src/webengine/doc/src/webengineview_lgpl.qdoc b/src/webengine/doc/src/webengineview_lgpl.qdoc index b7999938f..93f4b555d 100644 --- a/src/webengine/doc/src/webengineview_lgpl.qdoc +++ b/src/webengine/doc/src/webengineview_lgpl.qdoc @@ -1311,7 +1311,7 @@ /*! \qmltype QuotaPermissionRequest - \instantiates QQuickWebEngineQuotaPermissionRequest + \instantiates QWebEngineQuotaPermissionRequest \inqmlmodule QtWebEngine \since QtWebEngine 1.7 @@ -1368,7 +1368,7 @@ /*! \qmltype RegisterProtocolHandlerPermissionRequest - \instantiates QQuickWebEngineRegisterProtocolHandlerPermissionRequest + \instantiates QWebEngineRegisterProtocolHandlerPermissionRequest \inqmlmodule QtWebEngine \since QtWebEngine 1.7 \brief The RegisterProtocolHandlerPermissionRequest type enables accepting 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: diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index f475d660a..6017fe078 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -235,6 +235,9 @@ QWebEnginePagePrivate::QWebEnginePagePrivate(QWebEngineProfile *_profile) #endif { memset(actions, 0, sizeof(actions)); + + qRegisterMetaType<QWebEngineQuotaPermissionRequest>(); + qRegisterMetaType<QWebEngineRegisterProtocolHandlerPermissionRequest>(); } QWebEnginePagePrivate::~QWebEnginePagePrivate() diff --git a/src/webenginewidgets/webenginewidgets.pro b/src/webenginewidgets/webenginewidgets.pro index c3132b640..540c4d538 100644 --- a/src/webenginewidgets/webenginewidgets.pro +++ b/src/webenginewidgets/webenginewidgets.pro @@ -19,8 +19,6 @@ SOURCES = \ api/qwebenginehistory.cpp \ api/qwebenginepage.cpp \ api/qwebengineprofile.cpp \ - api/qwebenginequotapermissionrequest.cpp \ - api/qwebengineregisterprotocolhandlerpermissionrequest.cpp \ api/qwebenginescript.cpp \ api/qwebenginescriptcollection.cpp \ api/qwebenginesettings.cpp \ @@ -39,8 +37,6 @@ HEADERS = \ api/qwebenginepage_p.h \ api/qwebengineprofile.h \ api/qwebengineprofile_p.h \ - api/qwebenginequotapermissionrequest.h \ - api/qwebengineregisterprotocolhandlerpermissionrequest.h \ api/qwebenginescriptcollection.h \ api/qwebenginescriptcollection_p.h \ api/qwebenginesettings.h \ diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index 52d8a0b41..0da6e71cc 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -35,6 +35,8 @@ #include <QtTest/QtTest> #include <QtWebEngine/QQuickWebEngineProfile> #include <QtWebEngine/QQuickWebEngineScript> +#include <QtWebEngineCore/QWebEngineQuotaPermissionRequest> +#include <QtWebEngineCore/QWebEngineRegisterProtocolHandlerPermissionRequest> #include <private/qquickwebengineview_p.h> #include <private/qquickwebenginecertificateerror_p.h> #include <private/qquickwebenginedialogrequests_p.h> @@ -66,8 +68,6 @@ static QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *>() << &QQuickWebEngineScript::staticMetaObject << &QQuickWebEngineSettings::staticMetaObject << &QQuickWebEngineFullScreenRequest::staticMetaObject - << &QQuickWebEngineQuotaPermissionRequest::staticMetaObject - << &QQuickWebEngineRegisterProtocolHandlerPermissionRequest::staticMetaObject << &QQuickWebEngineSingleton::staticMetaObject << &QQuickWebEngineAuthenticationDialogRequest::staticMetaObject << &QQuickWebEngineJavaScriptDialogRequest::staticMetaObject @@ -75,6 +75,8 @@ static QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *>() << &QQuickWebEngineFileDialogRequest::staticMetaObject << &QQuickWebEngineFormValidationMessageRequest::staticMetaObject << &QQuickWebEngineContextMenuRequest::staticMetaObject + << &QWebEngineQuotaPermissionRequest::staticMetaObject + << &QWebEngineRegisterProtocolHandlerPermissionRequest::staticMetaObject ; static QList<const char *> knownEnumNames = QList<const char *>(); @@ -292,14 +294,6 @@ static QStringList expectedAPI = QStringList() << "QQuickWebEngineProfile.storageName --> QString" << "QQuickWebEngineProfile.storageNameChanged() --> void" << "QQuickWebEngineProfile.userScripts --> QQmlListProperty<QQuickWebEngineScript>" - << "QQuickWebEngineQuotaPermissionRequest.accept() --> void" - << "QQuickWebEngineQuotaPermissionRequest.origin --> QUrl" - << "QQuickWebEngineQuotaPermissionRequest.reject() --> void" - << "QQuickWebEngineQuotaPermissionRequest.requestedSize --> qlonglong" - << "QQuickWebEngineRegisterProtocolHandlerPermissionRequest.accept() --> void" - << "QQuickWebEngineRegisterProtocolHandlerPermissionRequest.origin --> QUrl" - << "QQuickWebEngineRegisterProtocolHandlerPermissionRequest.protocol --> QString" - << "QQuickWebEngineRegisterProtocolHandlerPermissionRequest.reject() --> void" << "QQuickWebEngineScript.ApplicationWorld --> ScriptWorldId" << "QQuickWebEngineScript.Deferred --> InjectionPoint" << "QQuickWebEngineScript.DocumentCreation --> InjectionPoint" @@ -655,10 +649,10 @@ static QStringList expectedAPI = QStringList() << "QQuickWebEngineView.printToPdf(QString,PrintedPageSizeId,PrintedPageOrientation) --> void" << "QQuickWebEngineView.profile --> QQuickWebEngineProfile*" << "QQuickWebEngineView.profileChanged() --> void" - << "QQuickWebEngineView.quotaPermissionRequested(QQuickWebEngineQuotaPermissionRequest) --> void" + << "QQuickWebEngineView.quotaPermissionRequested(QWebEngineQuotaPermissionRequest) --> void" << "QQuickWebEngineView.recentlyAudible --> bool" << "QQuickWebEngineView.recentlyAudibleChanged(bool) --> void" - << "QQuickWebEngineView.registerProtocolHandlerPermissionRequested(QQuickWebEngineRegisterProtocolHandlerPermissionRequest) --> void" + << "QQuickWebEngineView.registerProtocolHandlerPermissionRequested(QWebEngineRegisterProtocolHandlerPermissionRequest) --> void" << "QQuickWebEngineView.reload() --> void" << "QQuickWebEngineView.reloadAndBypassCache() --> void" << "QQuickWebEngineView.renderProcessTerminated(RenderProcessTerminationStatus,int) --> void" @@ -687,6 +681,14 @@ static QStringList expectedAPI = QStringList() << "QQuickWebEngineView.windowCloseRequested() --> void" << "QQuickWebEngineView.zoomFactor --> double" << "QQuickWebEngineView.zoomFactorChanged(double) --> void" + << "QWebEngineQuotaPermissionRequest.accept() --> void" + << "QWebEngineQuotaPermissionRequest.origin --> QUrl" + << "QWebEngineQuotaPermissionRequest.reject() --> void" + << "QWebEngineQuotaPermissionRequest.requestedSize --> qlonglong" + << "QWebEngineRegisterProtocolHandlerPermissionRequest.accept() --> void" + << "QWebEngineRegisterProtocolHandlerPermissionRequest.origin --> QUrl" + << "QWebEngineRegisterProtocolHandlerPermissionRequest.reject() --> void" + << "QWebEngineRegisterProtocolHandlerPermissionRequest.protocol --> QString" ; static bool isCheckedEnum(const QByteArray &typeName) |