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-platform-notes.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-platform-notes.qdoc')
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index 4aa0ac9ec..c70cb5775 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -37,7 +37,7 @@ different requirements of Chromium this is not always possible. Known limitations are: \list - \li Qt WebEngine currently supports only Windows, Linux, and OS X. + \li Qt WebEngine currently supports only Windows, Linux, and \macos. \li On Windows, Qt WebEngine only supports Windows Vista or newer as target platform. Due to use of newer API in Chromium, Windows XP is not supported. WinRT is @@ -54,7 +54,7 @@ \list \li \l{Qt for Windows - Requirements} \li \l{Qt for X11 Requirements} - \li \l{Qt for OS X - Requirements} + \li \l{Qt for macOS - Requirements} \endlist In addition, the following tools are required for building the \l {Qt WebEngine} module: @@ -63,7 +63,7 @@ \li \l {All Platforms} \li \l {Windows} \li \l {Linux} - \li \l {OS X} + \li \l {macOS} \endlist The tests for skipping the Qt WebEngine build are located in the @@ -112,11 +112,11 @@ Further, development packages for \c khr and \c libcap need to be installed. - \section2 OS X + \section2 \macos - On OS X, Xcode version 5.1 or later on OS X 10.9 or later is required. + On \macos, Xcode version 5.1 or later on \macos 10.9 or later is required. - \note Qt WebEngine cannot be built for the 32-bit mode of OS X (using the + \note Qt WebEngine cannot be built for the 32-bit mode of \macos (using the \c macx-clang-32 \c mkspec). \section1 Default QSurfaceFormat OpenGL Profile Support @@ -125,7 +125,7 @@ before the application instance is declared, to make sure that all created OpenGL contexts use the same OpenGL profile. - On OS X, if the default QSurfaceFormat is set after the application instance, the application + On \macos, if the default QSurfaceFormat is set after the application instance, the application will exit with qFatal(), and print a message that the default QSurfaceFormat should be set before the application instance. */ |