diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2019-05-13 14:39:37 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2019-05-14 04:30:05 +0000 |
| commit | baac552c6822c10b509a1fbb1fae6b3ba9d58af2 (patch) | |
| tree | db707f69571a0527a8c78f56ff91a43f78b75e8d | |
| parent | a8d88cddfcede68f5c9c13adb02e655f0c0bcf21 (diff) | |
| download | qttools-baac552c6822c10b509a1fbb1fae6b3ba9d58af2.tar.gz | |
qdoc: Fix \headerfile generation
Commit 72eac2f5 introduced a regression where \headerfile pages never
generated any output. Since that commit, Node::docMustBeGenerated() is
called for HeaderNodes, and we need to override it; otherwise the
default base implementation gets called, and it simply returns false.
Fixes: QTBUG-75790
Change-Id: I4932d5ba8dd595ad4d18033f77e62b14b54f8263
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| -rw-r--r-- | src/qdoc/node.cpp | 7 | ||||
| -rw-r--r-- | src/qdoc/node.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp index d418190a3..5081f4370 100644 --- a/src/qdoc/node.cpp +++ b/src/qdoc/node.cpp @@ -1901,6 +1901,13 @@ HeaderNode::HeaderNode(Aggregate* parent, const QString& name) : Aggregate(Heade Aggregate::addIncludeFile(name); } +bool HeaderNode::docMustBeGenerated() const +{ + if (!hasDoc() || isInternal() || isDontDocument()) + return false; + return true; +} + /*! \class PageNode */ diff --git a/src/qdoc/node.h b/src/qdoc/node.h index 168ff79a4..5d5a90ab0 100644 --- a/src/qdoc/node.h +++ b/src/qdoc/node.h @@ -651,6 +651,7 @@ class HeaderNode : public Aggregate public: HeaderNode(Aggregate* parent, const QString& name); virtual ~HeaderNode() { } + bool docMustBeGenerated() const override; bool isFirstClassAggregate() const override { return true; } bool isRelatableType() const override { return true; } QString title() const override { return (title_.isEmpty() ? name() : title_); } |