diff options
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/qdoc/codemarker.cpp | 3 | ||||
-rw-r--r-- | src/tools/qdoc/cppcodemarker.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/qdoc/codemarker.cpp b/src/tools/qdoc/codemarker.cpp index 7a7ede0f20..4e144d2f7d 100644 --- a/src/tools/qdoc/codemarker.cpp +++ b/src/tools/qdoc/codemarker.cpp @@ -398,7 +398,8 @@ void CodeMarker::insert(FastSection &fastSection, bool inheritedMember = false; if (!node->relates()) { if (node->parent() != fastSection.parent_) { // && !node->parent()->isAbstract()) { - if (node->type() != Node::QmlProperty) { + if ((node->parent()->subType() != Node::QmlClass) || !node->parent()->isAbstract()) { + //if (node->type() != Node::QmlProperty) { inheritedMember = true; } } diff --git a/src/tools/qdoc/cppcodemarker.cpp b/src/tools/qdoc/cppcodemarker.cpp index 5af9cdf2e8..75e49f288a 100644 --- a/src/tools/qdoc/cppcodemarker.cpp +++ b/src/tools/qdoc/cppcodemarker.cpp @@ -142,8 +142,8 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node, name = linkTag(node, name); name = "<@name>" + name + "</@name>"; - if (style == Detailed && !node->parent()->name().isEmpty() && - node->type() != Node::Property) + if ((style == Detailed) && !node->parent()->name().isEmpty() && + (node->type() != Node::Property) && !node->isQmlNode()) name.prepend(taggedNode(node->parent()) + "::"); switch (node->type()) { |