diff options
| author | hjk <hjk@theqtcompany.com> | 2016-08-03 16:46:29 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2016-08-03 15:30:06 +0000 |
| commit | 1e8ffa20d0e3f9ca4c4aa668dc87ef59ff235bab (patch) | |
| tree | 0563934c697b7430c7a1526624754af9b0c7ffed /doc/api/qtcreator-documentation.qdoc | |
| parent | 36f9c5f7d00bcb62093c2dc8194a105506cd0072 (diff) | |
Doc: Introduce a macro \macos to adapt to upcoming renamings
Start with an initial value 'macOS' and use in uncontroversial
places in the docs. Some explicit references to older versions
are untouched in this patch.
Change-Id: Ibea4115c45fc2ff2c9a0518d92797df26fd4138f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Diffstat (limited to 'doc/api/qtcreator-documentation.qdoc')
| -rw-r--r-- | doc/api/qtcreator-documentation.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/api/qtcreator-documentation.qdoc b/doc/api/qtcreator-documentation.qdoc index 8813a3d579..8b70832e24 100644 --- a/doc/api/qtcreator-documentation.qdoc +++ b/doc/api/qtcreator-documentation.qdoc @@ -156,7 +156,7 @@ \section2 Taking Screen Shots - \QC has the native look and feel on Windows, Linux, and OS X, and therefore, + \QC has the native look and feel on Windows, Linux, and \macos, and therefore, screen shots can end up looking very different, depending on who takes them and which system they use. To try to preserve a consistent look and feel in the \QC Manual, observe the guidelines listed in this section when taking @@ -207,7 +207,7 @@ You can use a web service, such as \l{https://tinypng.com}, or an image optimization tool to shrink the images. For example, you can use the Radical Image Optimization Tool (RIOT) on Windows (very efficient) or ImageOptim on - OS X (much less efficient), or some other tool available on Linux. + \macos (much less efficient), or some other tool available on Linux. With ImageOptim, you simply drag and drop the image files to the application. The following section describes the settings to use for RIOT. @@ -278,7 +278,7 @@ \list \li nmake docs (on Windows) - \li make docs (on Linux and OS X) + \li make docs (on Linux and \macos) \endlist The \QC Manual HTML files are generated in the \c {doc/html} directory. @@ -286,7 +286,7 @@ \c {doc/html-dev} directory. The help files (\c {.qch}) are generated in the \c {share/doc/qtcreator} directory in the \QC build directory on Windows and Linux, and in the \c {bin/Qt Creator.app/Contents/Resources/app} directory - on OS X. You can view the HTML files in a browser and the help files in + on \macos. You can view the HTML files in a browser and the help files in the \QC \uicontrol Help mode. For more information about adding the help files to \QC, see \l{http://doc.qt.io/qtcreator/creator-help.html#adding-external-documentation} |