diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-07-12 16:38:30 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2018-07-26 05:55:57 +0000 |
| commit | 30a75f7f0d540b5fd312b3cb2cf850e4e177c68b (patch) | |
| tree | 1bfa56e2abdce37412158ec9548eb833df1a9462 /src/assistant/assistant | |
| parent | caf3b6c291d3659d9fbc083ccf26fa178a3d38dc (diff) | |
Merge qcollectiongenerator into qhelpgenerator tool
Change-Id: I3c961d7c13ce4f9a3aa36dd0554ec5184fbc5953
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/assistant/assistant')
| -rw-r--r-- | src/assistant/assistant/doc/snippets/doc_src_assistant-manual.qdoc | 2 | ||||
| -rw-r--r-- | src/assistant/assistant/doc/src/assistant-manual.qdoc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/assistant/assistant/doc/snippets/doc_src_assistant-manual.qdoc b/src/assistant/assistant/doc/snippets/doc_src_assistant-manual.qdoc index 6356b208a..feae78784 100644 --- a/src/assistant/assistant/doc/snippets/doc_src_assistant-manual.qdoc +++ b/src/assistant/assistant/doc/snippets/doc_src_assistant-manual.qdoc @@ -154,5 +154,5 @@ assistant -collectionFile mycollection.qhc //! [9] //! [10] -qcollectiongenerator mycollection.qhcp -o mycollection.qhc +qhelpgenerator mycollection.qhcp -o mycollection.qhc //! [10] diff --git a/src/assistant/assistant/doc/src/assistant-manual.qdoc b/src/assistant/assistant/doc/src/assistant-manual.qdoc index cbd6ccde4..9badfc260 100644 --- a/src/assistant/assistant/doc/src/assistant-manual.qdoc +++ b/src/assistant/assistant/doc/src/assistant-manual.qdoc @@ -189,7 +189,7 @@ \section2 Creating a Custom Help Collection File The help collection file (*.qhc) used by \QA is created when running the - \c qcollectiongenerator tool on a help collection project file (*.qhcp). + \c qhelpgenerator tool on a help collection project file (*.qhcp). The project file format is XML and it supports the following tags: \table @@ -279,7 +279,7 @@ \snippet doc_src_assistant-manual.qdoc 1 - To create the binary collection file, run the \c qcollectiongenerator tool: + To create the binary collection file, run the \c qhelpgenerator tool: \snippet doc_src_assistant-manual.qdoc 10 |