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 /src/webengine/api/qquickwebengineview_p.h | |
| 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 'src/webengine/api/qquickwebengineview_p.h')
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index 248ee62b6..c84a65805 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -99,6 +99,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem { Q_ENUMS(LoadStatus); Q_ENUMS(ErrorDomain); Q_ENUMS(NewViewDestination); + Q_ENUMS(Feature); Q_ENUMS(JavaScriptConsoleMessageLevel); Q_FLAGS(FindFlags); @@ -162,6 +163,13 @@ public: NewViewInBackgroundTab }; + enum Feature { + MediaAudioCapture, + MediaVideoCapture, + MediaAudioVideoCapture, + Geolocation + }; + // must match WebContentsAdapterClient::JavaScriptConsoleMessageLevel enum JavaScriptConsoleMessageLevel { InfoMessageLevel = 0, @@ -202,6 +210,7 @@ public Q_SLOTS: void stop(); Q_REVISION(1) void findText(const QString &subString, FindFlags options = 0, const QJSValue &callback = QJSValue()); Q_REVISION(1) void fullScreenCancelled(); + Q_REVISION(1) void grantFeaturePermission(const QUrl &securityOrigin, Feature, bool granted); Q_SIGNALS: void titleChanged(); @@ -215,6 +224,7 @@ Q_SIGNALS: Q_REVISION(1) void certificateError(QQuickWebEngineCertificateError *error); Q_REVISION(1) void fullScreenRequested(const QQuickWebEngineFullScreenRequest &request); Q_REVISION(1) void isFullScreenChanged(); + Q_REVISION(1) void featurePermissionRequested(const QUrl &securityOrigin, Feature feature); Q_REVISION(1) void newViewRequested(QQuickWebEngineNewViewRequest *request); Q_REVISION(1) void zoomFactorChanged(qreal arg); Q_REVISION(1) void webChannelChanged(); |