diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2015-03-09 05:30:04 -0700 |
|---|---|---|
| committer | Szabolcs David <davidsz@inf.u-szeged.hu> | 2015-03-16 11:24:42 +0000 |
| commit | d433826c7d0514228b44f0c30ec7e545a3c179bb (patch) | |
| tree | 2d856a75c50810515187aaaa98c6e834aceffb62 /tests/quicktestbrowser | |
| parent | 29a9caf106e5ea82202b66f6cd45c2db85fb734b (diff) | |
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>
Diffstat (limited to 'tests/quicktestbrowser')
| -rw-r--r-- | tests/quicktestbrowser/BrowserWindow.qml | 11 | ||||
| -rw-r--r-- | tests/quicktestbrowser/FeaturePermissionBar.qml | 15 |
2 files changed, 13 insertions, 13 deletions
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 } } |