summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets/api/qwebenginepage.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2014-11-07 14:31:48 +0100
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2014-11-07 15:26:45 +0100
commitd2d5baeb8c3b10579f7f144e918b2935af66bec5 (patch)
tree5dd9eea0282c70001ed8fd1a00fe718d5c44004e /src/webenginewidgets/api/qwebenginepage.h
parent32f75b83d591d1940a4427eb1a6fd8353406733e (diff)
Fix enum names of audio/video features
The feature enum names and documentation gave the impression it could control audio and video output, while they only control input. Also removed documentation of non connected feature permissions for Notifications and GeoLocation. Change-Id: Ia35142ca691ebd6059b7472e9803fda8cbd84813 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.h')
-rw-r--r--src/webenginewidgets/api/qwebenginepage.h16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index cda6e620f..7856b8243 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -122,7 +122,8 @@ public:
FindBackward = 1,
FindCaseSensitively = 2,
};
- Q_DECLARE_FLAGS(FindFlags, FindFlag)
+ Q_DECLARE_FLAGS(FindFlags, FindFlag);
+
enum WebWindowType {
WebBrowserWindow,
WebBrowserTab,
@@ -136,12 +137,15 @@ public:
};
enum Feature {
- Notifications,
- Geolocation,
- MediaAudioDevices,
- MediaVideoDevices,
- MediaAudioVideoDevices
+#ifndef Q_QDOC
+ Notifications = 0,
+ Geolocation = 1,
+#endif
+ MediaAudioCapture = 2,
+ MediaVideoCapture,
+ MediaAudioVideoCapture
};
+
// Ex-QWebFrame enum
enum FileSelectionMode {