diff options
| author | Paul Wicking <paul.wicking@qt.io> | 2019-10-20 14:58:00 +0200 |
|---|---|---|
| committer | Paul Wicking <paul.wicking@qt.io> | 2019-10-20 14:58:00 +0200 |
| commit | b12d88c05db1bf53d8295f7ab305c601e27796aa (patch) | |
| tree | 43f92369cd5fd8183cee248797b0f693bacb568c | |
| parent | bb57fe7440e59008851a95ee63ee4d16fde080ed (diff) | |
| parent | 1ee284dca162184e1344e19b76db5e62010c65ce (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I740be88a123913bd2a5146c7402609addf9051b0
| -rw-r--r-- | src/qdoc/sections.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/qdoc/sections.cpp b/src/qdoc/sections.cpp index 8ba71f17c..44eea84ea 100644 --- a/src/qdoc/sections.cpp +++ b/src/qdoc/sections.cpp @@ -970,7 +970,10 @@ void Sections::buildStdCppClassRefPageSections() NodeList::ConstIterator c = aggregate_->constBegin(); while (c != aggregate_->constEnd()) { Node *n = *c; - if (!n->isPrivate() && !n->isProperty() && !n->isRelatedNonmember()) + if (!n->isPrivate() + && !n->isProperty() + && !n->isRelatedNonmember() + && !n->isSharedCommentNode()) allMembers.insert(n); if (!documentAll && !n->hasDoc()) { ++c; @@ -997,7 +1000,10 @@ void Sections::buildStdCppClassRefPageSections() c = cn->constBegin(); while (c != cn->constEnd()) { Node *n = *c; - if (!n->isPrivate() && !n->isProperty()) + if (!n->isPrivate() + && !n->isProperty() + && !n->isRelatedNonmember() + && !n->isSharedCommentNode()) allMembers.insert(n); if (!documentAll && !n->hasDoc()) { ++c; @@ -1063,7 +1069,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; } |