diff options
| author | Martin Smith <martin.smith@qt.io> | 2019-07-16 14:17:03 +0200 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2019-07-16 15:31:30 +0200 |
| commit | 5ac3f3843a265a5d7dc083e3c4c48bf458022413 (patch) | |
| tree | b1afde19d233c59df6b41a7f88643b6e9dbc241f | |
| parent | 3b28a9e3d28152ca3792de932ec43a54a82739f5 (diff) | |
| download | qttools-5ac3f3843a265a5d7dc083e3c4c48bf458022413.tar.gz | |
qdoc: Add hasDoc() test to docMustBeGenerated()
Even if a class declaration appears in an _p.h file, a doc page must be
generated for it if hasDoc() returns true for the class node.
Task-number: QTBUG-77026
Change-Id: I6ca7d614383aadfb6ffcae1c8e021d2998de6a9d
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| -rw-r--r-- | src/qdoc/node.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp index 6618a7e6d..0c4e57f6f 100644 --- a/src/qdoc/node.cpp +++ b/src/qdoc/node.cpp @@ -1877,7 +1877,7 @@ bool ClassNode::docMustBeGenerated() const { if (!hasDoc() || isPrivate() || isInternal() || isDontDocument()) return false; - if (declLocation().fileName().endsWith(QLatin1String("_p.h"))) + if (declLocation().fileName().endsWith(QLatin1String("_p.h")) && !hasDoc()) return false; return true; |