diff options
| author | Jerome Pasion <jerome.pasion@digia.com> | 2014-08-30 15:43:35 +0200 |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@digia.com> | 2014-09-09 17:41:59 +0200 |
| commit | 666dfbe539cb95bcb043efc1d4af1d18f8d2b6c6 (patch) | |
| tree | b3ce81aff5c5737515d2269de3dedec06dab30dc /doc/src/deployment | |
| parent | a1a4cb2964bc6d9e873d6aa8b7332168df7454d6 (diff) | |
| download | qtdoc-666dfbe539cb95bcb043efc1d4af1d18f8d2b6c6.tar.gz | |
Doc: Changed instances of "Mac OS X" to "OS X".
The name of the operating system is "OS X".
The titles cause missing links in other repos, for which
a fix will come soon.
Task-number: QTBUG-40759
Change-Id: I19d31d24357faff615dbc9b4929906cc56b54123
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Diffstat (limited to 'doc/src/deployment')
| -rw-r--r-- | doc/src/deployment/deployment.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/deployment/qt-conf.qdoc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc index 0e6d0cb7..d46baed4 100644 --- a/doc/src/deployment/deployment.qdoc +++ b/doc/src/deployment/deployment.qdoc @@ -128,7 +128,7 @@ platform-specific application dependencies for \l{Qt for Linux/X11 - Deployment#Application Dependencies}{X11}, \l{Qt for Windows - Deployment#Application Dependencies}{Windows}, - and \l{Qt for Mac OS X}{Mac OS X}. + and \l{Qt for OS X}{OS X}. \section1 Licensing @@ -172,7 +172,7 @@ \list \li \l{Qt for Linux/X11 - Deployment}{Qt for X11 Platforms} \li \l{Qt for Windows - Deployment}{Qt for Windows} - \li \l{Qt for Mac OS X#Deploying Applications on Mac OS X}{Qt for Mac OS X} + \li \l{Qt for OS X#Deploying Applications on OS X}{Qt for OS X} \li \l{Deploying an Application on Android}{Qt for Android} \endlist diff --git a/doc/src/deployment/qt-conf.qdoc b/doc/src/deployment/qt-conf.qdoc index 1d17f83a..03b143e7 100644 --- a/doc/src/deployment/qt-conf.qdoc +++ b/doc/src/deployment/qt-conf.qdoc @@ -44,7 +44,7 @@ \li \c :/qt/etc/qt.conf using the resource system - \li on Mac OS X, in the Resource directory inside the application + \li on OS X, in the Resource directory inside the application bundle, for example \c assistant.app/Contents/Resources/qt.conf \li in the directory containing the application executable, i.e. @@ -97,7 +97,7 @@ Absolute paths are used as specified in the \c qt.conf file. All paths are relative to the \c Prefix. On Windows and X11, the \c Prefix is relative to the directory containing the application - executable (QCoreApplication::applicationDirPath()). On Mac OS X, + executable (QCoreApplication::applicationDirPath()). On OS X, the \c Prefix is relative to the \c Contents in the application bundle. For example, \c application.app/Contents/plugins/ is the default location for loading Qt plugins. Note that the plugins |