From 9b8dd3012cc8b2a71acb324485f1541a01171838 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Tue, 15 Apr 2014 11:31:49 +0200 Subject: qdoc: \l now works with QML property groups MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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ö Reviewed-by: Sze Howe Koh --- src/tools/qdoc/node.cpp | 2 +- src/tools/qdoc/tree.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'src/tools/qdoc') diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp index 730d2d5663..820af9b784 100644 --- a/src/tools/qdoc/node.cpp +++ b/src/tools/qdoc/node.cpp @@ -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; } } diff --git a/src/tools/qdoc/tree.cpp b/src/tools/qdoc/tree.cpp index d17468f3a9..6ed639307e 100644 --- a/src/tools/qdoc/tree.cpp +++ b/src/tools/qdoc/tree.cpp @@ -787,11 +787,9 @@ 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); -- cgit v1.2.3