diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-05 13:52:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-05 13:52:44 +0200 |
| commit | 781efbabf32e4438ae9c698ce498cc32cc900c57 (patch) | |
| tree | fec14c84f9a61dc6579a78537f5e3daafdeab2e1 /examples | |
| parent | 3c5fa29f78816d8cc7fd9fa6e9462e2a9f283f64 (diff) | |
| parent | a9e5e09f156b09c7f65e0b57fe191d71f9c1aa3e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/qdoc/doc/qdoc-manual-markupcmds.qdoc
Change-Id: I43e2d334a848397a2e619ad19aab66daff53d9b7
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, |