diff options
author | Paul Wicking <paul.wicking@qt.io> | 2018-09-03 15:09:40 +0200 |
---|---|---|
committer | Paul Wicking <paul.wicking@qt.io> | 2018-09-03 15:13:05 +0000 |
commit | 277af20762813ff92ea47a69b4d18563e01cc18e (patch) | |
tree | 0a24e83479bb1a342a6f5f7c696079e637c71952 | |
parent | dc5fdf373ea90b92a86778d6dd4a821ddd059ba2 (diff) |
QDoc: Link correctly to enums as function parametersv5.11.2
Include enum type in findChildNode check, to resolve page nodes
correctly. The missing check causes QDoc to not link to enums when they
are function parameter types. This behavior constitutes a regression
from 5.10.
Task-number: QTBUG-70231
Change-Id: I57f94c08b0e207567e97127d0b7e268d90d051aa
Reviewed-by: Martin Smith <martin.smith@qt.io>
-rw-r--r-- | src/qdoc/node.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp index 046467a94..84b44c4da 100644 --- a/src/qdoc/node.cpp +++ b/src/qdoc/node.cpp @@ -850,7 +850,8 @@ Node *Aggregate::findChildNode(const QString& name, Node::Genus genus, int findF && !node->isQmlType() && !node->isQmlBasicType() && !node->isJsType() - && !node->isJsBasicType()) + && !node->isJsBasicType() + && !node->isEnumType()) continue; } return node; |