Move featurePermissionRequested to the public API

Change-Id: Ifc0baac73daad9146eb8f2878e49257d25310555
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>

3 files changed, 19 insertions, 13 deletions

diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index 1cf2e37c4..1ac5a3111 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -120,6 +120,10 @@ static QStringList expectedAPI = QStringList()
     << "QQuickWebEngineView.NewViewInTab --> NewViewDestination"
     << "QQuickWebEngineView.NewViewInDialog --> NewViewDestination"
     << "QQuickWebEngineView.NewViewInBackgroundTab --> NewViewDestination"
+    << "QQuickWebEngineView.MediaAudioCapture --> Feature"
+    << "QQuickWebEngineView.MediaVideoCapture --> Feature"
+    << "QQuickWebEngineView.MediaAudioVideoCapture --> Feature"
+    << "QQuickWebEngineView.Geolocation --> Feature"
     << "QQuickWebEngineView.InfoMessageLevel --> JavaScriptConsoleMessageLevel"
     << "QQuickWebEngineView.WarningMessageLevel --> JavaScriptConsoleMessageLevel"
     << "QQuickWebEngineView.ErrorMessageLevel --> JavaScriptConsoleMessageLevel"
@@ -143,6 +147,8 @@ static QStringList expectedAPI = QStringList()
     << "QQuickWebEngineView.fullScreenRequested(QQuickWebEngineFullScreenRequest) --> void"
     << "QQuickWebEngineView.isFullScreenChanged() --> void"
     << "QQuickWebEngineView.fullScreenCancelled() --> void"
+    << "QQuickWebEngineView.featurePermissionRequested(QUrl,Feature) --> void"
+    << "QQuickWebEngineView.grantFeaturePermission(QUrl,Feature,bool) --> void"
     << "QQuickWebEngineView.runJavaScript(QString,QJSValue) --> void"
     << "QQuickWebEngineView.runJavaScript(QString) --> void"
     << "QQuickWebEngineView.loadHtml(QString,QUrl) --> void"
diff --git a/tests/quicktestbrowser/BrowserWindow.qml b/tests/quicktestbrowser/BrowserWindow.qml
index 3f7897f04..45fad8d9c 100644
--- a/tests/quicktestbrowser/BrowserWindow.qml
+++ b/tests/quicktestbrowser/BrowserWindow.qml
@@ -397,12 +397,13 @@ ApplicationWindow {
                         request.accept()
                     }
 
+                    onFeaturePermissionRequested: {
+                        permBar.securityOrigin = securityOrigin;
+                        permBar.requestedFeature = feature;
+                        permBar.visible = true;
+                    }
+
                     experimental {
-                        onFeaturePermissionRequested: {
-                            permBar.securityOrigin = securityOrigin;
-                            permBar.requestedFeature = feature;
-                            permBar.visible = true;
-                        }
                         extraContextMenuEntriesComponent: ContextMenuExtras {}
                     }
                 }
diff --git a/tests/quicktestbrowser/FeaturePermissionBar.qml b/tests/quicktestbrowser/FeaturePermissionBar.qml
index 135df9abd..c9b15dfd2 100644
--- a/tests/quicktestbrowser/FeaturePermissionBar.qml
+++ b/tests/quicktestbrowser/FeaturePermissionBar.qml
@@ -40,8 +40,7 @@
 
 import QtQuick 2.1
 import QtQuick.Controls 1.0
-import QtWebEngine 1.0
-import QtWebEngine.experimental 1.0
+import QtWebEngine 1.1
 import QtQuick.Layouts 1.0
 
 Rectangle {
@@ -69,13 +68,13 @@ Rectangle {
             Layout.fillWidth: true
 
             function textForFeature(feature) {
-                if (feature === WebEngineViewExperimental.MediaAudioCapture)
+                if (feature === WebEngineView.MediaAudioCapture)
                     return "your microphone"
-                if (feature === WebEngineViewExperimental.MediaVideoCapture)
+                if (feature === WebEngineView.MediaVideoCapture)
                     return "your camera"
-                if (feature === WebEngineViewExperimental.MediaAudioVideoCapture)
+                if (feature === WebEngineView.MediaAudioVideoCapture)
                     return "your camera and microphone"
-                if (feature === WebEngineViewExperimental.Geolocation)
+                if (feature === WebEngineView.Geolocation)
                     return "your position"
             }
         }
@@ -85,7 +84,7 @@ Rectangle {
             text: "Accept"
             Layout.alignment: Qt.AlignRight
             onClicked: {
-                view.experimental.grantFeaturePermission(securityOrigin, requestedFeature, true);
+                view.grantFeaturePermission(securityOrigin, requestedFeature, true);
                 permissionBar.visible = false;
             }
         }
@@ -94,7 +93,7 @@ Rectangle {
             text: "Deny"
             Layout.alignment: Qt.AlignRight
             onClicked: {
-                view.experimental.grantFeaturePermission(securityOrigin, requestedFeature, false);
+                view.grantFeaturePermission(securityOrigin, requestedFeature, false);
                 permissionBar.visible = false
             }
         }