diff options
| author | Michael Bruning <michael.bruning@theqtcompany.com> | 2016-05-23 15:02:12 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-05-23 16:51:11 +0200 |
| commit | 59d211d8bbb42242ca355a7451b8a66ee5f30dc6 (patch) | |
| tree | d51ef03184d1b9ef58fde30835a6c014c75b2c6d /src/webengine/api/qquickwebenginesettings.cpp | |
| parent | 7933be051938a2815ed44563d26126e5d4a40b06 (diff) | |
| parent | ad8bc45732eeb2efa6e885d564c10761e7154889 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7.0
Conflicts:
src/3rdparty
src/core/browser_context_adapter.cpp
src/core/web_contents_adapter.cpp
src/webengine/doc/src/qtwebengine-platform-notes.qdoc
tests/auto/widgets/qwebenginepage/BLACKLIST
Change-Id: I768fc954a9a2147fc3669961286163a0a824def3
Diffstat (limited to 'src/webengine/api/qquickwebenginesettings.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebenginesettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/webengine/api/qquickwebenginesettings.cpp b/src/webengine/api/qquickwebenginesettings.cpp index 9096dd604..3fea83166 100644 --- a/src/webengine/api/qquickwebenginesettings.cpp +++ b/src/webengine/api/qquickwebenginesettings.cpp @@ -217,7 +217,7 @@ bool QQuickWebEngineSettings::errorPageEnabled() const Disabled by default. - \sa {Pepper Plugin API Support} + \sa {Pepper Plugin API} */ bool QQuickWebEngineSettings::pluginsEnabled() const { |