summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2020-10-27 09:19:08 +0100
committerTopi Reinio <topi.reinio@qt.io>2020-10-27 18:34:21 +0100
commit4a4995a7952fa5d274488ce019d24a2af1f884fb (patch)
tree6e75f79e34c6b97419bddad5f0d2bf6e9e2622d5
parentb92c477f27832710cdfe20b24088b37f6f44c392 (diff)
qdoc: Avoid duplicates in \sincelist
Related non-members appear twice in the node tree; when processing children of an aggregate, skip nodes that do not report the aggregate as their parent. Task-number: QTBUG-87866 Change-Id: Id06dcfe9ab4ce4d0ef18b69506fa82c2df9e85b0 (cherry picked from commit ff92f335d5223af55542753f6ce5da382a1d2cd9) Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--src/qdoc/node.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp
index 82306eeed..29985a8bc 100644
--- a/src/qdoc/node.cpp
+++ b/src/qdoc/node.cpp
@@ -2749,6 +2749,8 @@ void Aggregate::findAllAttributions(NodeMultiMap &attributions)
void Aggregate::findAllSince()
{
for (auto *node : qAsConst(children_)) {
+ if (node->isRelatedNonmember() && node->parent() != this)
+ continue;
QString sinceString = node->since();
// Insert a new entry into each map for each new since string found.
if (!node->isPrivate() && !sinceString.isEmpty()) {