summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/htmlgenerator.cpp
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-03-11 08:13:54 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-03-11 08:13:54 (GMT)
commita21ac7e75730bb094b49e5b58698a2ceebe8d73e (patch)
tree0187f97f1f41a04ac98812843fb879fd93f869cf /tools/qdoc3/htmlgenerator.cpp
parent49bcf035d428d9d8bd2c4d546fc935e9d4ca0a2a (diff)
downloadQt-a21ac7e75730bb094b49e5b58698a2ceebe8d73e.zip
Qt-a21ac7e75730bb094b49e5b58698a2ceebe8d73e.tar.gz
Qt-a21ac7e75730bb094b49e5b58698a2ceebe8d73e.tar.bz2
qdoc: Fixed lookup of QML property nodes.
At this point, no QML qdoc errors appear in the output. There is still a lot of debug output.
Diffstat (limited to 'tools/qdoc3/htmlgenerator.cpp')
-rw-r--r--tools/qdoc3/htmlgenerator.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 411a886..f8fb5b2 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -3991,10 +3991,12 @@ QString HtmlGenerator::getLink(const Atom *atom,
}
else {
*node = marker->resolveTarget(first, myTree, relative);
- if (!*node)
+ if (!*node) {
*node = myTree->findFakeNodeByTitle(first);
- if (!*node)
+ }
+ if (!*node) {
*node = myTree->findUnambiguousTarget(first, targetAtom);
+ }
}
if (*node) {