diff options
| author | Topi Reinio <topi.reinio@theqtcompany.com> | 2016-08-11 15:59:50 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2016-10-31 13:19:26 +0000 |
| commit | a4b04e4c2613cb600680eea5697b2775a765147b (patch) | |
| tree | 2fc7f47be4230f477edb4c0b9896927735262596 /src/webengine/doc/src/qtwebengine-overview.qdoc | |
| parent | ba6acb2bc25add0f8b4490d8760b7ad1c1f27629 (diff) | |
Doc: Change instances of 'OS X' to 'macOS'
As of version 10.12 (Sierra), the name of Apple's desktop operating
system will be macOS. Change all occurrences where the Mac platform
is discussed to use the macro \macos (defined in the documentation
configuration in qtbase), except in link targets where QDoc does
not expand macros.
Change-Id: Icad4e7817d93b9e7b0e1a9a13a8618b3341ab2ba
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
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 ca9573709..f29410e6d 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. |