summaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/quick/geopermission/tst_geopermission.qml8
-rw-r--r--tests/manual/widgets/geolocation/main.cpp13
-rw-r--r--tests/manual/widgets/webrtc/main.cpp8
3 files changed, 13 insertions, 16 deletions
diff --git a/tests/manual/quick/geopermission/tst_geopermission.qml b/tests/manual/quick/geopermission/tst_geopermission.qml
index 36317c176..ace48d464 100644
--- a/tests/manual/quick/geopermission/tst_geopermission.qml
+++ b/tests/manual/quick/geopermission/tst_geopermission.qml
@@ -13,14 +13,14 @@ WebEngineView {
property bool deniedGeolocation: false
property bool geoPermissionRequested: false
- onFeaturePermissionRequested: function(securityOrigin, feature) {
- if (feature === WebEngineView.Geolocation) {
+ onPermissionRequested: function(perm) {
+ if (perm.feature === WebEnginePermission.Geolocation) {
geoPermissionRequested = true
if (deniedGeolocation) {
- webEngineView.grantFeaturePermission(securityOrigin, feature, false)
+ perm.deny()
}
else {
- webEngineView.grantFeaturePermission(securityOrigin, feature, true)
+ perm.grant()
}
}
}
diff --git a/tests/manual/widgets/geolocation/main.cpp b/tests/manual/widgets/geolocation/main.cpp
index f33cf5798..1f4cefe54 100644
--- a/tests/manual/widgets/geolocation/main.cpp
+++ b/tests/manual/widgets/geolocation/main.cpp
@@ -16,18 +16,15 @@ class GeoPermissionWebView : public QWebEngineView {
Q_OBJECT
public slots:
- void handleFeaturePermissionRequested(const QUrl &securityOrigin,
- QWebEnginePage::Feature feature)
+ void handlePermissionRequested(QWebEnginePermission permission)
{
qWarning("Feature Permission");
QString title = tr("Permission Request");
QString question = QLatin1String("Allow access to geolocation?");
if (!question.isEmpty() && QMessageBox::question(window(), title, question) == QMessageBox::Yes)
- page()->setFeaturePermission(securityOrigin, feature,
- QWebEnginePage::PermissionGrantedByUser);
+ permission.grant();
else
- page()->setFeaturePermission(securityOrigin, feature,
- QWebEnginePage::PermissionDeniedByUser);
+ permission.deny();
}
};
@@ -38,8 +35,8 @@ int main(int argc, char *argv[])
QMainWindow w;
GeoPermissionWebView webview;
QWebEnginePage page;
- QObject::connect(&page, &QWebEnginePage::featurePermissionRequested, &webview,
- &GeoPermissionWebView::handleFeaturePermissionRequested);
+ QObject::connect(&page, &QWebEnginePage::permissionRequested, &webview,
+ &GeoPermissionWebView::handlePermissionRequested);
webview.setPage(&page);
page.load(QUrl("qrc:/geolocation.html"));
w.setCentralWidget(&webview);
diff --git a/tests/manual/widgets/webrtc/main.cpp b/tests/manual/widgets/webrtc/main.cpp
index 328e4ae36..b5718159c 100644
--- a/tests/manual/widgets/webrtc/main.cpp
+++ b/tests/manual/widgets/webrtc/main.cpp
@@ -35,19 +35,19 @@ private slots:
Page::Page(QWebEngineProfile *profile, QObject *parent) : QWebEnginePage(profile, parent)
{
settings()->setAttribute(QWebEngineSettings::ScreenCaptureEnabled, true);
- connect(this, &QWebEnginePage::featurePermissionRequested, this,
+ connect(this, &QWebEnginePage::permissionRequested, this,
&Page::handlePermissionRequest);
connect(this, &QWebEnginePage::desktopMediaRequested, this, &Page::handleDesktopMediaRequest);
}
-void Page::handlePermissionRequest(const QUrl &origin, Feature feature)
+void Page::handlePermissionRequest(QWebEnginePermission permission)
{
if (QMessageBox::question(QApplication::activeWindow(), tr("Permission request"),
tr("allow access?"))
== QMessageBox::Yes)
- setFeaturePermission(origin, feature, PermissionGrantedByUser);
+ permission.grant();
else
- setFeaturePermission(origin, feature, PermissionDeniedByUser);
+ permission.deny();
}
void Page::handleDesktopMediaRequest(const QWebEngineDesktopMediaRequest &request)