diff options
| -rw-r--r-- | src/qdoc/generator.cpp | 4 | ||||
| -rw-r--r-- | src/qdoc/htmlgenerator.cpp | 2 | ||||
| -rw-r--r-- | src/qdoc/sections.cpp | 20 |
3 files changed, 17 insertions, 9 deletions
diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp index d5caa8bd0..3bb3ab13a 100644 --- a/src/qdoc/generator.cpp +++ b/src/qdoc/generator.cpp @@ -1467,7 +1467,7 @@ void Generator::generateInvokableNote(const Node* node, CodeMarker* marker) /*! Generate the documentation for \a relative. i.e. \a relative - is the node that reporesentas the entity where a qdoc comment + is the node that represents the entity where a qdoc comment was found, and \a text represents the qdoc comment. */ bool Generator::generateText(const Text& text, @@ -1707,7 +1707,7 @@ void Generator::generateOverloadedSignal(const Node* node, CodeMarker* marker) /*! - Traverses the database recursivly to generate all the documentation. + Traverses the database recursively to generate all the documentation. */ void Generator::generateDocs() { diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index a2eb42af8..3b1de12ae 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -3020,7 +3020,7 @@ void HtmlGenerator::generateAnnotatedLists(const Node* relative, the classes in the class map \a nmm and then generates a compact list of the class names alphabetized on the part of the name not including the common prefix. You can tell - the function to use \a comonPrefix as the common prefix, + the function to use \a commonPrefix as the common prefix, but normally you let it figure it out itself by looking at the name of the first and last classes in the class map \a nmm. diff --git a/src/qdoc/sections.cpp b/src/qdoc/sections.cpp index 0aa9f37e9..e91a1014e 100644 --- a/src/qdoc/sections.cpp +++ b/src/qdoc/sections.cpp @@ -934,8 +934,11 @@ void Sections::buildStdCppClassRefPageSections() documentAll = false; NodeList::ConstIterator c = aggregate_->constBegin(); while (c != aggregate_->constEnd()) { - Node* n = *c; - if (!n->isPrivate() && !n->isProperty() && !n->isRelatedNonmember()) + Node *n = *c; + if (!n->isPrivate() + && !n->isProperty() + && !n->isRelatedNonmember() + && !n->isSharedCommentNode()) allMembers.insert(n); if (!documentAll && !n->hasDoc()) { ++c; @@ -961,8 +964,11 @@ void Sections::buildStdCppClassRefPageSections() ClassNode *cn = stack.pop(); c = cn->constBegin(); while (c != cn->constEnd()) { - Node* n = *c; - if (!n->isPrivate() && !n->isProperty()) + Node *n = *c; + if (!n->isPrivate() + && !n->isProperty() + && !n->isRelatedNonmember() + && !n->isSharedCommentNode()) allMembers.insert(n); if (!documentAll && !n->hasDoc()) { ++c; @@ -1001,7 +1007,9 @@ void Sections::buildStdQmlTypeRefPageSections() ++c; continue; } - allMembers.add(classMap, n); + if (!n->isSharedCommentNode()) + allMembers.add(classMap, n); + distributeQmlNodeInSummaryVector(sv, n); distributeQmlNodeInDetailsVector(dv, n); ++c; @@ -1026,7 +1034,7 @@ void Sections::buildStdQmlTypeRefPageSections() NodeList::ConstIterator c = qtn->constBegin(); while (c != qtn->constEnd()) { Node *n = *c; - if (n->isInternal()) { + if (n->isInternal() || n->isSharedCommentNode()) { ++c; continue; } |