AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdoc: Show signals inherited from abstract base types

Browse Source 
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>
This commit is contained in:
Martin Smith 2013-03-21 11:54:41 +01:00 committed by The Qt Project
parent e90ce866fa
commit 771a254d3c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tools/qdoc/codemarker.cpp
View File

@ -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;
}
}

4
src/tools/qdoc/cppcodemarker.cpp
View File

@ -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()) {