summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2014-04-15 11:31:49 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-17 14:27:07 +0200
commit9b8dd3012cc8b2a71acb324485f1541a01171838 (patch)
tree1678036c38f709e19b707386e1efdd88a37d51e7 /src/tools
parentd953d9a4c3bdc5ed3b8d380c4b893b51b523bc50 (diff)
qdoc: \l now works with QML property groups
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>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/qdoc/node.cpp2
-rw-r--r--src/tools/qdoc/tree.cpp2
2 files changed, 1 insertions, 3 deletions
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);