diff options
| author | Topi Reinio <[email protected]> | 2015-01-13 15:08:18 +0100 |
|---|---|---|
| committer | Topi Reiniö <[email protected]> | 2015-01-22 12:48:05 +0100 |
| commit | 3c37066062d61a430b8e7f970cccf6effab5a3ef (patch) | |
| tree | 6b1b1965b6536069ead5b213760491aaabcfd95b /src/tools/qdoc/htmlgenerator.cpp | |
| parent | 595ed595eabe01a1cf11c8b846fd777de8233721 (diff) | |
qdoc: Ensure .qhp file is generated for all modules
When run in single-exec mode, QDoc constructs only one instance
of HelpProjectWriter, even though it generates documentation for
multiple modules in one go.
This change adds a reset() function for the help project writer,
allowing new parameters to be passed to the existing writer
instance, thus ensuring that all .qhp files are correctly
generated.
Task-number: QTBUG-43815
Change-Id: I1d1c9f713eb5f574a6f8e56616cf5f61bb3e8ff8
Reviewed-by: Martin Smith <[email protected]>
Diffstat (limited to 'src/tools/qdoc/htmlgenerator.cpp')
| -rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index fddb53dff19..7cf6c3b6099 100644 --- a/src/tools/qdoc/htmlgenerator.cpp +++ b/src/tools/qdoc/htmlgenerator.cpp @@ -226,7 +226,9 @@ void HtmlGenerator::initializeGenerator(const Config &config) The help file write should be allocated once and only once per qdoc execution. */ - if (helpProjectWriter == 0) + if (helpProjectWriter) + helpProjectWriter->reset(config, project.toLower() + ".qhp", this); + else helpProjectWriter = new HelpProjectWriter(config, project.toLower() + ".qhp", this); // Documentation template handling @@ -3116,7 +3118,7 @@ void HtmlGenerator::generateQmlItem(const Node *node, } marked.replace(QRegExp("<@param>([a-z]+)_([1-9n])</@param>"), "<i>\\1<sub>\\2</sub></i>"); - marked.replace("<@param>", "<i>"); + marked.replace("<@param>", "<i> "); marked.replace("</@param>", "</i>"); if (summary) |