diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-05 17:15:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-05 17:15:41 +0200 |
| commit | 608e1856265c5e490f13cb22089bd1d9be4a9bfe (patch) | |
| tree | 248d33efbb2af32a856dbfc98a221eee9cd19c22 /examples | |
| parent | 89d766d65393a0445ddf5100b7db39f6ba1ed901 (diff) | |
| parent | 781efbabf32e4438ae9c698ce498cc32cc900c57 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I29e1f5d7d146cc77f8cf92bfbe2e41ffad50a041
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/assistant/doc/src/simpletextviewer.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/assistant/doc/src/simpletextviewer.qdoc b/examples/assistant/doc/src/simpletextviewer.qdoc index d713365b9..7afef1a78 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 OS X. + platform, but fortunately it is only different on \macos. The displayed documentation can be altered using the \c -collectionFile command line argument when launching \QA. When started without any options, |