summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-01-22 11:22:20 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-01-28 16:53:14 +0000
commit372c81255a25fe6f81fb134b081d5f187ce89868 (patch)
treee3b47f6d9b808079a6c3f8785a3a2e63dc08e096 /src/webenginewidgets
parent721c561c1334048a89af0882e1d3b7184b8f4ca9 (diff)
Document geolocation feature
When the geolocation feature was activated, the feature request was not documented along with it. Change-Id: I8cb1b60015c3cffe7f3d035ea4f61625d81be5b0 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
Diffstat (limited to 'src/webenginewidgets')
-rw-r--r--src/webenginewidgets/api/qwebenginepage.h2
-rw-r--r--src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index afc96c996..a194df831 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -150,8 +150,8 @@ public:
enum Feature {
#ifndef Q_QDOC
Notifications = 0,
- Geolocation = 1,
#endif
+ Geolocation = 1,
MediaAudioCapture = 2,
MediaVideoCapture,
MediaAudioVideoCapture,
diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
index af435d170..e23fc6f7c 100644
--- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
+++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
@@ -166,6 +166,7 @@
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.