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 <paul.wicking@qt.io>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>

1 files 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<FunctionNode *>(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<const TypedefNode*>(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<Aggregate *, int> p(node->parent(), 0);
                     inheritedMembers_.append(p);