diff options
author | Martin Smith <martin.smith@qt.io> | 2017-08-14 15:21:08 +0200 |
---|---|---|
committer | Martin Smith <martin.smith@qt.io> | 2017-09-06 15:37:34 +0000 |
commit | 560269593ba6642e6cb7915a64853a4457f4afe8 (patch) | |
tree | 59e0956b463736969fb854d1c22861ef0c872a1b | |
parent | 03855e3dc7f22df38c9e20572beb0828441c204c (diff) | |
download | qttools-560269593ba6642e6cb7915a64853a4457f4afe8.tar.gz |
qdoc: Fix linking of types in QML blocks
This change fixes a regression bug from before 5.6.
QML type names were not being converted to links in
Document files.
Task-number: QTBUG-62440
Change-Id: I76ba9a654645a63651c6b3e15431369ec52d90de
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
-rw-r--r-- | src/qdoc/qdocdatabase.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qdoc/qdocdatabase.h b/src/qdoc/qdocdatabase.h index 0af094878..4645754f4 100644 --- a/src/qdoc/qdocdatabase.h +++ b/src/qdoc/qdocdatabase.h @@ -147,7 +147,7 @@ class QDocForest { int flags = SearchBaseClasses | SearchEnumValues | NonFunction; Node::Genus genus = Node::DontCare; - if (relative) + if (relative && relative->genus() != Node::DOC) genus = relative->genus(); foreach (Tree* t, searchOrder()) { const Node* n = t->findNode(path, relative, flags, genus); |