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

qdoc: \l now works with QML property groups

Browse Source 
This update makes it possible to link to the name of a
QML property group with a \l command. e.g. \l {Item::anchors}

Task-number: QTBUG-35844
Change-Id: I2dc51bd90eadd13754a8f4d3357f3f17605a068d
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
This commit is contained in:
Martin Smith 2014-04-15 11:31:49 +02:00 committed by The Qt Project
parent d953d9a4c3
commit 9b8dd3012c
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/qdoc/node.cpp
View File

@ -712,7 +712,7 @@ Node* InnerNode::findChildNode(const QString& name, bool qml) const
if (!node->isQmlNode())
return node;
}
else if (node->isQmlNode() && !node->isQmlPropertyGroup())
else if (node->isQmlNode())
return node;
}
}

2
src/tools/qdoc/tree.cpp
View File

@ -787,12 +787,10 @@ const Node* Tree::findNode(const QStringList& path, const Node* start, int findF
if (node && i == path.size()
&& (!(findFlags & NonFunction) || node->type() != Node::Function
|| ((FunctionNode*)node)->metaness() == FunctionNode::MacroWithoutParams)) {
if (!node->isQmlPropertyGroup()) {
if (node->isCollisionNode())
node = node->applyModuleName(start);
return node;
}
}
current = current->parent();
} while (current);