diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-08-25 13:42:16 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-09-01 02:39:43 (GMT) |
| commit | bc697e5b2e8c92d308176a704ed919d146f6963c (patch) | |
| tree | f0d82b7d1571d7abbc0b67251e2233806faf3793 | |
| parent | 8ca075aa4beece8cd45240679e4ca152fc0b03a5 (diff) | |
| download | Qt-bc697e5b2e8c92d308176a704ed919d146f6963c.zip Qt-bc697e5b2e8c92d308176a704ed919d146f6963c.tar.gz Qt-bc697e5b2e8c92d308176a704ed919d146f6963c.tar.bz2 | |
qdoc: Fixed erroneous links to QML basic types.
Task-nr: QTBUG-13096
(cherry picked from commit 002c89aeb44c805d642be2d4e4a19422be877bc2)
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 75d8893..0d543e8 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -3230,7 +3230,14 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode, if (parseArg(src, typeTag, &i, srcSize, &arg, &par1)) { par1 = QStringRef(); const Node* n = marker->resolveTarget(arg.toString(), myTree, relative, self); - addLink(linkForNode(n,relative), arg, &html); + if (n && n->subType() == Node::QmlBasicType) { + if (relative && relative->subType() == Node::QmlClass) + addLink(linkForNode(n,relative), arg, &html); + else + html += arg.toString(); + } + else + addLink(linkForNode(n,relative), arg, &html); handled = true; } else if (parseArg(src, headerTag, &i, srcSize, &arg, &par1)) { @@ -3592,7 +3599,7 @@ QString HtmlGenerator::linkForNode(const Node *node, const Node *relative) return QString(); if (node->access() == Node::Private) return QString(); - + fn = fileName(node); /* if (!node->url().isEmpty()) return fn;*/ |