diff options
Diffstat (limited to 'src/tools/qdoc/codemarker.cpp')
| -rw-r--r-- | src/tools/qdoc/codemarker.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/tools/qdoc/codemarker.cpp b/src/tools/qdoc/codemarker.cpp index 99f2abfb2f..235b3c3f04 100644 --- a/src/tools/qdoc/codemarker.cpp +++ b/src/tools/qdoc/codemarker.cpp @@ -273,7 +273,7 @@ QString CodeMarker::taggedNode(const Node* node) case Node::Property: tag = QLatin1String("@property"); break; - case Node::Document: + case Node::QmlType: /* Remove the "QML:" prefix, if present. There shouldn't be any of these "QML:" @@ -282,10 +282,11 @@ QString CodeMarker::taggedNode(const Node* node) qualifiers, but this code is kept to be backward compatible. */ - if (node->subType() == Node::QmlClass) { - if (node->name().startsWith(QLatin1String("QML:"))) - name = name.mid(4); - } + if (node->name().startsWith(QLatin1String("QML:"))) + name = name.mid(4); + tag = QLatin1String("@property"); + break; + case Node::Document: tag = QLatin1String("@property"); break; case Node::QmlMethod: @@ -400,9 +401,8 @@ void CodeMarker::insert(FastSection &fastSection, InnerNode* p = node->parent(); if (p->type() == Node::QmlPropertyGroup) p = p->parent(); - if (p != fastSection.parent_) { // && !node->parent()->isAbstract()) { - if (p->subType() != Node::QmlClass || !p->isAbstract()) { - //if (node->type() != Node::QmlProperty) { + if (p != fastSection.parent_) { + if (!p->isQmlType() || !p->isAbstract()) { inheritedMember = true; } } @@ -622,6 +622,7 @@ QStringList CodeMarker::macRefsForNode(Node *node) } case Node::Namespace: case Node::Document: + case Node::QmlType: default: return QStringList(); } @@ -648,7 +649,7 @@ QString CodeMarker::macName(const Node *node, const QString &name) /*! Returns an empty list of documentation sections. */ -QList<Section> CodeMarker::qmlSections(const QmlClassNode* , SynopsisStyle ) +QList<Section> CodeMarker::qmlSections(QmlClassNode* , SynopsisStyle ) { return QList<Section>(); } |