diff -r 5dc02b23752f -r 3e2da88830cd tools/qdoc3/cppcodemarker.cpp --- a/tools/qdoc3/cppcodemarker.cpp Tue Jul 06 15:10:48 2010 +0300 +++ b/tools/qdoc3/cppcodemarker.cpp Wed Aug 18 10:37:55 2010 +0300 @@ -825,9 +825,10 @@ return sections; } -const Node *CppCodeMarker::resolveTarget(const QString &target, - const Tree *tree, - const Node *relative) +const Node *CppCodeMarker::resolveTarget(const QString& target, + const Tree* tree, + const Node* relative, + const Node* self) { if (target.endsWith("()")) { const FunctionNode *func; @@ -869,11 +870,13 @@ else { QStringList path = target.split("::"); const Node *node; + int flags = Tree::SearchBaseClasses | + Tree::SearchEnumValues | + Tree::NonFunction; if ((node = tree->findNode(path, relative, - Tree::SearchBaseClasses | - Tree::SearchEnumValues | - Tree::NonFunction))) + flags, + self))) return node; } return 0;