summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2020-10-27 09:19:08 +0100
committerTopi Reiniƶ <topi.reinio@qt.io>2020-10-27 14:46:31 +0000
commitff92f335d5223af55542753f6ce5da382a1d2cd9 (patch)
tree8cca0411a16f42f181a5e4b349f3d87fafe6ef11
parent7268647fd5f911303a507fd5cc7c3feb48bb253f (diff)
downloadqttools-ff92f335d5223af55542753f6ce5da382a1d2cd9.tar.gz
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. Fixes: QTBUG-87866 Change-Id: Id06dcfe9ab4ce4d0ef18b69506fa82c2df9e85b0 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
-rw-r--r--src/qdoc/aggregate.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qdoc/aggregate.cpp b/src/qdoc/aggregate.cpp
index adbb7d1ca..8a8bad488 100644
--- a/src/qdoc/aggregate.cpp
+++ b/src/qdoc/aggregate.cpp
@@ -859,6 +859,8 @@ void Aggregate::findAllAttributions(NodeMultiMap &attributions)
void Aggregate::findAllSince()
{
for (auto *node : qAsConst(m_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()) {