diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-07-08 11:43:57 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-07-08 11:43:57 (GMT) |
| commit | 5903558f17a7a3173ad7a592892262bf297b52f2 (patch) | |
| tree | ed374a06df60a9a2e6deae52e2a2a1651e3bdc17 | |
| parent | ba25cb2339d2be305f6f2f13387ebf558ad7c250 (diff) | |
| download | Qt-5903558f17a7a3173ad7a592892262bf297b52f2.zip Qt-5903558f17a7a3173ad7a592892262bf297b52f2.tar.gz Qt-5903558f17a7a3173ad7a592892262bf297b52f2.tar.bz2 | |
qdoc: Fixed broken QML property links.
Task-number: QTBUG-12038
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 2 | ||||
| -rw-r--r-- | tools/qdoc3/node.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 567a297..5a8fb86 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -2949,7 +2949,7 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode, static const QString headerTag("headerfile"); static const QString funcTag("func"); static const QString linkTag("link"); - + // replace all <@link> tags: "(<@link node=\"([^\"]+)\">).*(</@link>)" bool done = false; for (int i = 0, srcSize = src.size(); i < srcSize;) { diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp index b077074..da62e29 100644 --- a/tools/qdoc3/node.cpp +++ b/tools/qdoc3/node.cpp @@ -299,7 +299,7 @@ InnerNode::~InnerNode() Node *InnerNode::findNode(const QString& name) { Node *node = childMap.value(name); - if (node) + if (node && node->subType() != QmlPropertyGroup) return node; if ((type() == Fake) && (subType() == QmlClass)) { for (int i=0; i<children.size(); ++i) { |