summaryrefslogtreecommitdiffstats
path: root/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc
diff options
context:
space:
mode:
authorSzabolcs David <davidsz@inf.u-szeged.hu>2015-03-09 05:30:04 -0700
committerSzabolcs David <davidsz@inf.u-szeged.hu>2015-03-16 11:24:42 +0000
commitd433826c7d0514228b44f0c30ec7e545a3c179bb (patch)
tree2d856a75c50810515187aaaa98c6e834aceffb62 /src/webengine/doc/src/qquickwebengineview_lgpl.qdoc
parent29a9caf106e5ea82202b66f6cd45c2db85fb734b (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 'src/webengine/doc/src/qquickwebengineview_lgpl.qdoc')
-rw-r--r--src/webengine/doc/src/qquickwebengineview_lgpl.qdoc31
1 files changed, 31 insertions, 0 deletions
diff --git a/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc b/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc
index 73c084dab..035d4a382 100644
--- a/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc
+++ b/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc
@@ -245,6 +245,23 @@
*/
/*!
+ \qmlmethod void WebEngineView::grantFeaturePermission(url securityOrigin, WebEngineView::Feature feature, bool granted)
+
+ Sets the permission for the web site identified by \a securityOrigin to use \a feature.
+
+ \sa featurePermissionRequested()
+*/
+
+/*!
+ \qmlsignal void WebEngineView::featurePermissionRequested(url securityOrigin, WebEngineView::Feature feature)
+
+ This is signal is emitted when the web site identified by \a securityOrigin requests
+ to make use of the resource or device identified by \a feature.
+
+ \sa grantFeaturePermission()
+*/
+
+/*!
\qmlsignal WebEngineView::loadingChanged(loadRequest)
This signal is emitted when a page load begins, ends, or fails.
@@ -416,3 +433,17 @@
\sa WebEngineView::findText()
*/
+
+/*!
+ \qmlproperty enumeration WebEngineView::Feature
+
+ This enum describes the platform feature access categories that the user may be asked to grant or deny access to.
+
+ \value Geolocation Access to location hardware or service
+ \value MediaAudioCapture Audio capture devices such a microphones
+ \value MediaVideoCapture Video devices, e.g. cameras
+ \value MediaAudioVideoCapture Both Audio and Video capture devices.
+
+ \sa featurePermissionRequested(), grantFeaturePermission()
+
+*/