diff options
| author | Nico Vertriest <nico.vertriest@digia.com> | 2015-07-16 10:29:33 +0200 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@digia.com> | 2015-08-17 11:02:16 +0000 |
| commit | e2bcb43fdccf72c12d679ebfd63955bce342d6a7 (patch) | |
| tree | b5cc2084e00efee820bf4f0e316166f5e8d3583e | |
| parent | 57d043600d7e3b4537891891dfc4c368143c1e21 (diff) | |
Doc: replaced Mac OS X with OS X
Task-number: QTBUG-40759
Change-Id: I3dd691ec1f17ae3217cb85e6f3e6330114ab7aa3
Reviewed-by: Martin Smith <martin.smith@digia.com>
| -rw-r--r-- | examples/assistant/doc/src/simpletextviewer.qdoc | 2 | ||||
| -rw-r--r-- | src/designer/src/designer/doc/src/designer-manual.qdoc | 2 | ||||
| -rw-r--r-- | src/macdeployqt/macdeployqt/main.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/assistant/doc/src/simpletextviewer.qdoc b/examples/assistant/doc/src/simpletextviewer.qdoc index dda039ec0..b23967916 100644 --- a/examples/assistant/doc/src/simpletextviewer.qdoc +++ b/examples/assistant/doc/src/simpletextviewer.qdoc @@ -330,7 +330,7 @@ To start the process we need the executable name of \QA as well as the command line arguments for running \QA in a customized mode. The executable name is a little bit tricky since it depends on the - platform, but fortunately it is only different on Mac OS X. + platform, but fortunately it is only different on OS X. The displayed documentation can be altered using the \c -collectionFile command line argument when launching \QA. When started without any options, diff --git a/src/designer/src/designer/doc/src/designer-manual.qdoc b/src/designer/src/designer/doc/src/designer-manual.qdoc index 665456468..7dd4d52d2 100644 --- a/src/designer/src/designer/doc/src/designer-manual.qdoc +++ b/src/designer/src/designer/doc/src/designer-manual.qdoc @@ -800,7 +800,7 @@ \table \header \li Windows XP - \li Mac OS X + \li OS X \li Cleanlooks \row \li \inlineimage designer-form-layout-windowsXP.png diff --git a/src/macdeployqt/macdeployqt/main.cpp b/src/macdeployqt/macdeployqt/main.cpp index 3cc8f5a8e..81639f233 100644 --- a/src/macdeployqt/macdeployqt/main.cpp +++ b/src/macdeployqt/macdeployqt/main.cpp @@ -72,8 +72,8 @@ int main(int argc, char **argv) qDebug() << "to skip these plugins. Currently two SQL plugins are known to"; qDebug() << "be incompatible: qsqlodbc and qsqlpsql."; qDebug() << ""; - qDebug() << "See the \"Deploying an Application on Qt/Mac\" topic in the"; - qDebug() << "documentation for more information about deployment on Mac OS X."; + qDebug() << "See the \"Deploying Applications on OS X\" topic in the"; + qDebug() << "documentation for more information about deployment on OS X."; return 1; } |