qdoc: Make \target and \keyword commands link as expected

When resolving targets added for each node, QDoc didn't run the
check recursively; this meant that \target and \keyword commands
did not link when used in documentation nodes that are not direct
children of the root node. There include e.g. documentation for
functions and QML properties/methods.

This commit fixes that issue, and also modifies the behavior of
\keyword slightly: Using a \keyword no longer generates a HTML
anchor reference. Instead, linking to a keyword links directly
to the parent item which defines the \keyword. This produces
cleaner HTML by omitting unnecessary anchors.

Change-Id: I87659642770a5372409ecb09cb576fbad295155e
Task-number: QTBUG-47286
Reviewed-by: Martin Smith <martin.smith@digia.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/src/tools/qdoc/tree.h b/src/tools/qdoc/tree.h
index 0f41c221b6..9e195c90ae 100644
--- a/src/tools/qdoc/tree.h
+++ b/src/tools/qdoc/tree.h
@@ -56,7 +56,12 @@ struct TargetRec
               TargetRec::TargetType type,
               Node* node,
               int priority)
-    : node_(node), ref_(name), title_(title), priority_(priority), type_(type) { }
+    : node_(node), ref_(name), title_(title), priority_(priority), type_(type) {
+        // Discard the dedicated ref for keywords - they always
+        // link to the top of the QDoc comment they appear in
+        if (type == Keyword)
+            ref_.clear();
+    }
 
     bool isEmpty() const { return ref_.isEmpty(); }