diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-07-08 11:43:57 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-07-16 07:28:21 (GMT) |
| commit | b5fad0d1d260ce900885f63f794cadd3d9dc25ba (patch) | |
| tree | 1c775e5af4f702e46ad900c98cb3792d96ae840d /tools/qdoc3 | |
| parent | 6776acfcc18132a2b084aa6bbb5515620a63b6a8 (diff) | |
| download | Qt-b5fad0d1d260ce900885f63f794cadd3d9dc25ba.zip Qt-b5fad0d1d260ce900885f63f794cadd3d9dc25ba.tar.gz Qt-b5fad0d1d260ce900885f63f794cadd3d9dc25ba.tar.bz2 | |
qdoc: Fixed broken QML property links.
Task-number: QTBUG-12038
(cherry picked from commit 5903558f17a7a3173ad7a592892262bf297b52f2)
Diffstat (limited to 'tools/qdoc3')
| -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 813bb4b..4aa53d8 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -3009,7 +3009,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) { |