diff options
| author | Martin Smith <[email protected]> | 2014-08-08 13:42:32 +0200 |
|---|---|---|
| committer | Martin Smith <[email protected]> | 2014-08-22 18:24:08 +0200 |
| commit | 2a56a3bad75c0cc5befa1ce874995570e622cffc (patch) | |
| tree | 30797ef316dde15ee7ba8c80841c4ac0e530f8e8 /src/tools/qdoc/qdocdatabase.cpp | |
| parent | f752a7ab6cb022c136f91d471616edda0c55a612 (diff) | |
qdoc: Fix a few cases for '[ ... ]' linking
This update fixes a few cases that didn't work
correctly. The problem was caused by calling
findNodeForTarget() with a pointer to a relative
node, but the relative node pointer should always
be 0, when the domain tree to be searched is not
the same as the tree containing the relative node.
This fix sets the relative node pointer to 0 in
that case.
Change-Id: I2fe4a7a4a3b6392199666c7d49b473a56697e7b5
Task-number: QTBUG-39221
Reviewed-by: Topi Reiniö <[email protected]>
Diffstat (limited to 'src/tools/qdoc/qdocdatabase.cpp')
| -rw-r--r-- | src/tools/qdoc/qdocdatabase.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/qdoc/qdocdatabase.cpp b/src/tools/qdoc/qdocdatabase.cpp index 8211f35342b..ffac23aae0f 100644 --- a/src/tools/qdoc/qdocdatabase.cpp +++ b/src/tools/qdoc/qdocdatabase.cpp @@ -1620,6 +1620,8 @@ const Node* QDocDatabase::findNodeForAtom(const Atom* atom, const Node* relative target = targetPath.at(0); targetPath.removeFirst(); } + if (relative && relative->tree()->moduleName() != domain->moduleName()) + relative = 0; node = domain->findNodeForTarget(nodePath, target, relative, flags, genus, ref); return node; } |