diff options
| author | Martin Smith <martin.smith@nokia.com> | 2011-07-22 11:33:48 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2011-07-22 11:33:48 (GMT) |
| commit | b17ae5f8b26838288d7841b4b0651e435198396f (patch) | |
| tree | 47c07e851279101c8ef57dbd7690a58b715db777 /tools | |
| parent | 54b7ff1f5aea6ea33dad98d7daf1a7bdc9da7eb7 (diff) | |
| download | Qt-b17ae5f8b26838288d7841b4b0651e435198396f.zip Qt-b17ae5f8b26838288d7841b4b0651e435198396f.tar.gz Qt-b17ae5f8b26838288d7841b4b0651e435198396f.tar.bz2 | |
qdoc: Fixed to remove extranious markup tags.
Task-numberr: QTBUG-20474
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/ditaxmlgenerator.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp index b801e1e..6d74762 100644 --- a/tools/qdoc3/ditaxmlgenerator.cpp +++ b/tools/qdoc3/ditaxmlgenerator.cpp @@ -770,7 +770,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom, { writeStartTag(DT_codeblock); xmlWriter().writeAttribute("outputclass","cpp"); - QString chars = trimmedTrailing(atom->string()); + QString chars = trimmedTrailing(atom->string()); writeText(chars, marker, relative); writeEndTag(); // </codeblock> } @@ -3407,6 +3407,7 @@ void DitaXmlGenerator::writeText(const QString& markedCode, "<@type>", "<@type>", "<@headerfile>", "<@headerfile>", "<@func>", "<@func>", + "<@func ", "<@func ", "<@param>", "<@param>", "<@extra>", "<@extra>", "</@link>", "</@link>", @@ -3419,7 +3420,7 @@ void DitaXmlGenerator::writeText(const QString& markedCode, for (int i = 0, n = src.size(); i < n;) { if (src.at(i) == charLangle) { bool handled = false; - for (int k = 0; k != 12; ++k) { + for (int k = 0; k != 13; ++k) { const QString & tag = spanTags[2 * k]; if (tag == QStringRef(&src, i, tag.length())) { html += spanTags[2 * k + 1]; |