From 78de5016bb7f86face1644402b414135163d4418 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 21 Dec 2018 11:52:09 +0100 Subject: qdoc: Don't include overridden functions in all-members list When an override function is documented, it should appear in the class's all-members list, but the overridden function in the base class should not appear there. This update implements that. Change-Id: Iadc8188d84bc8697aa4a5ec24b7574f1389f27f5 Task-number: QTBUG-72723 Reviewed-by: Paul Wicking Reviewed-by: Jesus Fernandez --- src/qdoc/sections.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qdoc/sections.cpp b/src/qdoc/sections.cpp index 49bb73721..4913f66a5 100644 --- a/src/qdoc/sections.cpp +++ b/src/qdoc/sections.cpp @@ -200,8 +200,12 @@ void Section::insert(Node *node) if (node->isObsolete()) { obsoleteMemberMap_.insertMulti(key, node); } else { - if (!inherited || style_ == AllMembers) + if (!inherited) memberMap_.insertMulti(key, node); + else if (style_ == AllMembers) { + if (!memberMap_.contains(key)) + memberMap_.insertMulti(key, node); + } if (inherited && (node->parent()->isClass() || node->parent()->isNamespace())) { if (inheritedMembers_.isEmpty() || inheritedMembers_.last().first != node->parent()) { QPair p(node->parent(), 0); -- cgit v1.2.3