summaryrefslogtreecommitdiffstats
path: root/src/qdoc/tree.h
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@qt.io>2019-07-24 12:06:08 +0200
committerMartin Smith <martin.smith@qt.io>2019-07-31 13:10:38 +0200
commitb05d6b04e0527953983cc0451015efa27fa58580 (patch)
tree7631c6fb40fe5432c89b45e8b19494924227bfcb /src/qdoc/tree.h
parentf90b3f7498d1a6c44a21e939fb23bfdf0d7b410c (diff)
qdoc: Fix "Inherited By" output
The "Inherited By" list was incomplete for QObject (and other classes) because classes that inherited QObject from modules outside QtBase were not being included. This update cleans up the maintenance of a class's base class and derived class information so that the "Inherited By" list is more correct. Note that the "Inherited By" list can't be guaranteed to be complete because, for example, classes in external modules might inherit QObject, but if those external modules are not listed as dependencies of QtCore, QObject won't know about those classes. Task-number: QTBUG-77126 Change-Id: Ia0be361f9e909fee04e9680d4219c96812306712 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/qdoc/tree.h')
-rw-r--r--src/qdoc/tree.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/qdoc/tree.h b/src/qdoc/tree.h
index 2586f5c01..a70d0f5d2 100644
--- a/src/qdoc/tree.h
+++ b/src/qdoc/tree.h
@@ -168,12 +168,13 @@ class Tree
void addPropertyFunction(PropertyNode *property,
const QString &funcName,
PropertyNode::FunctionRole funcRole);
- void resolveInheritance(Aggregate *n);
- void resolveInheritanceHelper(int pass, ClassNode* cn);
+ void resolveBaseClasses(Aggregate *n);
+ void resolveBaseClassesHelper(int pass, ClassNode* cn);
+ void resolvePropertyOverriddenFromPtrs(Aggregate *n);
void resolveProperties();
void resolveCppToQmlLinks();
void resolveUsingClauses();
- void fixInheritance(NamespaceNode *rootNode);
+ void removePrivateAndInternalBases(NamespaceNode *rootNode);
NamespaceNode *root() { return &root_; }
const NamespaceNode *root() const { return &root_; }