diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-04-10 09:56:03 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-04-10 09:56:03 +0200 |
| commit | bcc1ea10c7fc5e2e5192d0e56c626c855dbe8eac (patch) | |
| tree | 390c71d3c9dc60ab05ee08fe3bf835d79a2b4a0a /src/webengine | |
| parent | bebc5a1c6ff9968bf8b06ca74a76b0618a57700b (diff) | |
| parent | 9136c16ae640aec8ab393237ce1a1c7f89c8bb1d (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I75f7bbf5e5a4d4ed3bf7bfbfb76162de8a89e6fa
Diffstat (limited to 'src/webengine')
| -rw-r--r-- | src/webengine/api/qquickwebenginesettings.cpp | 8 | ||||
| -rw-r--r-- | src/webengine/doc/src/external-resources.qdoc | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index 9a102a504..78fbe16e8 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -404,10 +404,14 @@ bool QQuickWebEngineSettings::showScrollBars() const \qmlproperty bool WebEngineSettings::playbackRequiresUserGesture \since QtWebEngine 1.7 Inhibits playback of media content until the user interacts with - the page. Disabled by default. + the page. + + By default, Qt WebEngine uses Chromium settings, as described in + \l {Autoplay Policy Changes}. To overwrite the default behavior, + this property must be set to \c false. \note The behavior is similar to Chrome on Android when enabled, - and similar to Chrome on desktops when disabled (default). + and similar to Chrome on desktops when disabled. */ bool QQuickWebEngineSettings::playbackRequiresUserGesture() const { diff --git a/src/webengine/doc/src/external-resources.qdoc b/src/webengine/doc/src/external-resources.qdoc index 55f6a68a3..acf63fb04 100644 --- a/src/webengine/doc/src/external-resources.qdoc +++ b/src/webengine/doc/src/external-resources.qdoc @@ -139,3 +139,8 @@ \externalpage https://www.w3.org/TR/notifications \title Web Notifications API */ + +/*! + \externalpage https://developers.google.com/web/updates/2017/09/autoplay-policy-changes + \title Autoplay Policy Changes +*/ |