From 20a8bd5be2799df2a0ca533c68c609b8f716bf0c Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 21 Dec 2018 09:52:49 +0100 Subject: qdoc: Include inherited members in all-members list A refactoring update in qdoc stopped including the class's inherited members in its all-members list. This update corrects that problem. Change-Id: I62faa9f6c61e2dc437945acda6107794acd5ca13 Task-number: QTBUG-72357 Reviewed-by: Paul Wicking Reviewed-by: Sze Howe Koh --- src/qdoc/sections.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qdoc/sections.cpp b/src/qdoc/sections.cpp index d9bfb624a..49bb73721 100644 --- a/src/qdoc/sections.cpp +++ b/src/qdoc/sections.cpp @@ -186,7 +186,7 @@ void Section::insert(Node *node) FunctionNode *func = static_cast(node); irrelevant = (inherited && (func->isSomeCtor() || func->isDtor())); } - else if (node->isClass() || node->isEnumType() || node->isTypedef()) { + else if (node->isClass() || node->isEnumType() || node->isTypedef() || node->isVariable()) { irrelevant = (inherited && style_ != AllMembers); if (!irrelevant && style_ == Details && node->isTypedef()) { const TypedefNode* tdn = static_cast(node); @@ -200,9 +200,9 @@ void Section::insert(Node *node) if (node->isObsolete()) { obsoleteMemberMap_.insertMulti(key, node); } else { - if (!inherited) { + if (!inherited || style_ == AllMembers) memberMap_.insertMulti(key, node); - } else if (node->parent()->isClass() || node->parent()->isNamespace()) { + if (inherited && (node->parent()->isClass() || node->parent()->isNamespace())) { if (inheritedMembers_.isEmpty() || inheritedMembers_.last().first != node->parent()) { QPair p(node->parent(), 0); inheritedMembers_.append(p); -- cgit v1.2.1