diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:49:02 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-04 11:53:49 +0100 |
commit | 6189de6015764dd4a14774f2e08344c4cd085f69 (patch) | |
tree | aaadc8bf672ffde1d7bfa3080eeec416271a6c5c /src/webengine/doc/src/qtwebengine-overview.qdoc | |
parent | ea2dafb7d07500e83b59fd708a9634a5e1135425 (diff) | |
parent | 6bb3d98e47d89790049edca796843345b8fd3c8b (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Also apply a4b04e4c on src/webengine/doc/src/qtwebengine-deploying.qdoc,
use the macro \macos.
Conflicts:
src/core/media_capture_devices_dispatcher.cpp
src/webengine/doc/src/qtwebengine-deploying.qdoc
src/webengine/doc/src/qtwebengine-platform-notes.qdoc
Change-Id: Ia6092a56bfe23da7c06f5389718ebbc9b78ef820
Diffstat (limited to 'src/webengine/doc/src/qtwebengine-overview.qdoc')
-rw-r--r-- | src/webengine/doc/src/qtwebengine-overview.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index 6b5ccaa14..6c05b2e48 100644 --- a/src/webengine/doc/src/qtwebengine-overview.qdoc +++ b/src/webengine/doc/src/qtwebengine-overview.qdoc @@ -197,7 +197,7 @@ \section1 Proxy Support If QNetworkProxy::applicationProxy is set, it will also be used for Qt WebEngine. Otherwise, - Qt WebEngine automatically picks up the proxy configuration from OS X and Windows. On Linux, + Qt WebEngine automatically picks up the proxy configuration from \macos and Windows. On Linux, it acknowledges settings from KDE and Gnome. If a proxy requires authentication, QWebEnginePage::proxyAuthenticationRequired is emitted. @@ -247,7 +247,7 @@ \section1 Platform Notes - Qt WebEngine currently supports only Windows, Linux, and OS X. Due to Chromium build + Qt WebEngine currently supports only Windows, Linux, and \macos. Due to Chromium build requirements it also often requires a newer compiler than the rest of Qt. See \l{Qt WebEngine Platform Notes} for further details. |