diff options
| -rw-r--r-- | src/tools/qdoc/helpprojectwriter.cpp | 10 | ||||
| -rw-r--r-- | src/tools/qdoc/helpprojectwriter.h | 3 | ||||
| -rw-r--r-- | src/tools/qdoc/htmlgenerator.cpp | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/src/tools/qdoc/helpprojectwriter.cpp b/src/tools/qdoc/helpprojectwriter.cpp index d0960e48bd..f4b866f856 100644 --- a/src/tools/qdoc/helpprojectwriter.cpp +++ b/src/tools/qdoc/helpprojectwriter.cpp @@ -49,8 +49,16 @@ QT_BEGIN_NAMESPACE HelpProjectWriter::HelpProjectWriter(const Config &config, const QString &defaultFileName, Generator* g) - : gen_(g) { + reset(config, defaultFileName, g); +} + +void HelpProjectWriter::reset(const Config &config, + const QString &defaultFileName, + Generator* g) +{ + projects.clear(); + gen_ = g; /* Get the pointer to the singleton for the qdoc database and store it locally. This replaces all the local accesses to diff --git a/src/tools/qdoc/helpprojectwriter.h b/src/tools/qdoc/helpprojectwriter.h index 2519e62c13..04aa1ce11b 100644 --- a/src/tools/qdoc/helpprojectwriter.h +++ b/src/tools/qdoc/helpprojectwriter.h @@ -83,6 +83,9 @@ public: HelpProjectWriter(const Config &config, const QString &defaultFileName, Generator* g); + void reset(const Config &config, + const QString &defaultFileName, + Generator* g); void addExtraFile(const QString &file); void addExtraFiles(const QSet<QString> &files); void generate(); diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp index fddb53dff1..7cf6c3b609 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) |