summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/tree.cpp
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2010-07-22 11:27:43 (GMT)
committerMartin Smith <martin.smith@nokia.com>2010-07-22 11:27:43 (GMT)
commitd8908922f339892fee4275a433e2bf6da87ae055 (patch)
tree5a6c360e74f434b0b017a489bce5d08082866c28 /tools/qdoc3/tree.cpp
parentbad44806fd543b91777b69d9afb0e1dd4910b15a (diff)
downloadQt-d8908922f339892fee4275a433e2bf6da87ae055.zip
Qt-d8908922f339892fee4275a433e2bf6da87ae055.tar.gz
Qt-d8908922f339892fee4275a433e2bf6da87ae055.tar.bz2
qdoc: Fixed reporting of read-only status for QML properties.
Task-number: QTBUG-11512
Diffstat (limited to 'tools/qdoc3/tree.cpp')
-rw-r--r--tools/qdoc3/tree.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/qdoc3/tree.cpp b/tools/qdoc3/tree.cpp
index d22a09a..56e3484 100644
--- a/tools/qdoc3/tree.cpp
+++ b/tools/qdoc3/tree.cpp
@@ -469,8 +469,9 @@ void Tree::resolveInheritance(NamespaceNode *rootNode)
for (int pass = 0; pass < 2; pass++) {
NodeList::ConstIterator c = rootNode->childNodes().begin();
while (c != rootNode->childNodes().end()) {
- if ((*c)->type() == Node::Class)
+ if ((*c)->type() == Node::Class) {
resolveInheritance(pass, (ClassNode *) *c);
+ }
else if ((*c)->type() == Node::Namespace) {
NamespaceNode *ns = static_cast<NamespaceNode*>(*c);
resolveInheritance(ns);
@@ -542,14 +543,16 @@ void Tree::resolveInheritance(int pass, ClassNode *classe)
while (b != bounds.end()) {
ClassNode *baseClass = (ClassNode*)findNode((*b).basePath,
Node::Class);
- if (!baseClass && (*b).parent)
+ if (!baseClass && (*b).parent) {
baseClass = (ClassNode*)findNode((*b).basePath,
Node::Class,
(*b).parent);
- if (baseClass)
+ }
+ if (baseClass) {
classe->addBaseClass((*b).access,
baseClass,
(*b).dataTypeWithTemplateArgs);
+ }
++b;
}
}