diff options
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/quick/publicapi/tst_publicapi.cpp | 28 | ||||
-rw-r--r-- | tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp | 16 |
2 files changed, 22 insertions, 22 deletions
diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp index efd063512..27f1ec616 100644 --- a/tests/auto/quick/publicapi/tst_publicapi.cpp +++ b/tests/auto/quick/publicapi/tst_publicapi.cpp @@ -35,8 +35,8 @@ #include <QtTest/QtTest> #include <QtWebEngine/QQuickWebEngineProfile> #include <QtWebEngine/QQuickWebEngineScript> -#include <QtWebEngineCore/QWebEngineQuotaPermissionRequest> -#include <QtWebEngineCore/QWebEngineRegisterProtocolHandlerPermissionRequest> +#include <QtWebEngineCore/QWebEngineQuotaRequest> +#include <QtWebEngineCore/QWebEngineRegisterProtocolHandlerRequest> #include <private/qquickwebengineview_p.h> #include <private/qquickwebenginecertificateerror_p.h> #include <private/qquickwebenginedialogrequests_p.h> @@ -75,8 +75,8 @@ static QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *>() << &QQuickWebEngineFileDialogRequest::staticMetaObject << &QQuickWebEngineFormValidationMessageRequest::staticMetaObject << &QQuickWebEngineContextMenuRequest::staticMetaObject - << &QWebEngineQuotaPermissionRequest::staticMetaObject - << &QWebEngineRegisterProtocolHandlerPermissionRequest::staticMetaObject + << &QWebEngineQuotaRequest::staticMetaObject + << &QWebEngineRegisterProtocolHandlerRequest::staticMetaObject ; static QList<const char *> knownEnumNames = QList<const char *>(); @@ -649,10 +649,10 @@ static QStringList expectedAPI = QStringList() << "QQuickWebEngineView.printToPdf(QString,PrintedPageSizeId,PrintedPageOrientation) --> void" << "QQuickWebEngineView.profile --> QQuickWebEngineProfile*" << "QQuickWebEngineView.profileChanged() --> void" - << "QQuickWebEngineView.quotaPermissionRequested(QWebEngineQuotaPermissionRequest) --> void" + << "QQuickWebEngineView.quotaRequested(QWebEngineQuotaRequest) --> void" << "QQuickWebEngineView.recentlyAudible --> bool" << "QQuickWebEngineView.recentlyAudibleChanged(bool) --> void" - << "QQuickWebEngineView.registerProtocolHandlerPermissionRequested(QWebEngineRegisterProtocolHandlerPermissionRequest) --> void" + << "QQuickWebEngineView.registerProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest) --> void" << "QQuickWebEngineView.reload() --> void" << "QQuickWebEngineView.reloadAndBypassCache() --> void" << "QQuickWebEngineView.renderProcessTerminated(RenderProcessTerminationStatus,int) --> void" @@ -681,14 +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.scheme --> QString" + << "QWebEngineQuotaRequest.accept() --> void" + << "QWebEngineQuotaRequest.origin --> QUrl" + << "QWebEngineQuotaRequest.reject() --> void" + << "QWebEngineQuotaRequest.requestedSize --> qlonglong" + << "QWebEngineRegisterProtocolHandlerRequest.accept() --> void" + << "QWebEngineRegisterProtocolHandlerRequest.origin --> QUrl" + << "QWebEngineRegisterProtocolHandlerRequest.reject() --> void" + << "QWebEngineRegisterProtocolHandlerRequest.scheme --> QString" ; static bool isCheckedEnum(const QByteArray &typeName) diff --git a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp index 18a33695a..d193a07ce 100644 --- a/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp +++ b/tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp @@ -49,8 +49,8 @@ #include <qwebenginehistory.h> #include <qwebenginepage.h> #include <qwebengineprofile.h> -#include <qwebenginequotapermissionrequest.h> -#include <qwebengineregisterprotocolhandlerpermissionrequest.h> +#include <qwebenginequotarequest.h> +#include <qwebengineregisterprotocolhandlerrequest.h> #include <qwebenginescript.h> #include <qwebenginescriptcollection.h> #include <qwebenginesettings.h> @@ -160,7 +160,7 @@ private Q_SLOTS: void runJavaScript(); void fullScreenRequested(); - void quotaPermissionRequested(); + void quotaRequested(); // Tests from tst_QWebEngineFrame @@ -2750,7 +2750,7 @@ void tst_QWebEnginePage::fullScreenRequested() QVERIFY(watcher.wait()); } -void tst_QWebEnginePage::quotaPermissionRequested() +void tst_QWebEnginePage::quotaRequested() { ConsolePage page; QWebEngineView view; @@ -2759,8 +2759,8 @@ void tst_QWebEnginePage::quotaPermissionRequested() page.load(QUrl("qrc:///resources/content.html")); QVERIFY(loadFinishedSpy.wait()); - connect(&page, &QWebEnginePage::quotaPermissionRequested, - [] (QWebEngineQuotaPermissionRequest request) + connect(&page, &QWebEnginePage::quotaRequested, + [] (QWebEngineQuotaRequest request) { if (request.requestedSize() <= 5000) request.accept(); @@ -4264,7 +4264,7 @@ void tst_QWebEnginePage::registerProtocolHandler() QWebEnginePage page; QSignalSpy loadSpy(&page, &QWebEnginePage::loadFinished); - QSignalSpy permissionSpy(&page, &QWebEnginePage::registerProtocolHandlerPermissionRequested); + QSignalSpy permissionSpy(&page, &QWebEnginePage::registerProtocolHandlerRequested); page.setUrl(server.url("/")); QTRY_COMPARE(loadSpy.count(), 1); @@ -4278,7 +4278,7 @@ void tst_QWebEnginePage::registerProtocolHandler() page.runJavaScript(call); QTRY_COMPARE(permissionSpy.count(), 1); - auto request = permissionSpy.takeFirst().value(0).value<QWebEngineRegisterProtocolHandlerPermissionRequest>(); + auto request = permissionSpy.takeFirst().value(0).value<QWebEngineRegisterProtocolHandlerRequest>(); QCOMPARE(request.origin(), QUrl(url)); QCOMPARE(request.scheme(), scheme); if (permission) |