diff options
| author | Martin Smith <martin.smith@digia.com> | 2013-03-21 11:54:41 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-26 10:18:02 +0100 |
| commit | 771a254d3c6f7830d1cc827835806afa16954368 (patch) | |
| tree | 95af49c8cee5f10e6e51a53e7ceeef8577680081 /src/tools | |
| parent | e90ce866fa61ece9eca3b8e0846d46bb73752824 (diff) | |
qdoc: Show signals inherited from abstract base types
qdoc was not including QML signals in the documentation
for a QML type, when the signals were inherited from a
QML type that had been marked abstract. This is now fixed.
Additionally, the QML type qualifier is not shown in the
header for the documentation for a member of a QML type.
The type qualifier was redundant information, and it was
incorrect for members inherited from abstract base types.
Task-number: QTBUG-30111
Change-Id: I73aef40f69a15bca6948bf36596b83800d248b1f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
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()) { |