qdoc: Ensure that doc for header file nodes is written

This update fixes a regression caused by the introduction of the
docMustBeGenerated() function. The doc for header file nodes was
not being generated because docMustBeGenerated() returned false
for the header file nodes.

Change-Id: I8bafd9e2ae96f41c8e7592403e3d9722797e5c24
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>

2 files changed, 21 insertions, 3 deletions

diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp
index 5081f4370..c1388f726 100644
--- a/src/qdoc/node.cpp
+++ b/src/qdoc/node.cpp
@@ -1901,11 +1901,28 @@ HeaderNode::HeaderNode(Aggregate* parent, const QString& name) : Aggregate(Heade
         Aggregate::addIncludeFile(name);
 }
 
+/*!
+  Returns true if this header file node is not private and
+  contains at least one public child node with documentation.
+ */
 bool HeaderNode::docMustBeGenerated() const
 {
-    if (!hasDoc() || isInternal() || isDontDocument())
-        return false;
-    return true;
+    if (hasDoc() && !isInternal() && !isPrivate())
+        return true;
+    return (hasDocumentedChildren() ? true : false);
+}
+
+/*!
+  Returns true if this header file node contains at least one
+  child that has documentation and is not private or internal.
+ */
+bool HeaderNode::hasDocumentedChildren() const
+{
+    foreach (Node *n, children_) {
+        if (n->hasDoc() && !n->isPrivate() && !n->isInternal())
+            return true;
+    }
+    return false;
 }
 
 /*!
diff --git a/src/qdoc/node.h b/src/qdoc/node.h
index 5d5a90ab0..6deb9f8c0 100644
--- a/src/qdoc/node.h
+++ b/src/qdoc/node.h
@@ -660,6 +660,7 @@ public:
     bool setTitle(const QString& title) override { title_ = title; return true; }
     bool setSubtitle(const QString &subtitle) override { subtitle_ = subtitle; return true; }
     QString nameForLists() const override { return title(); }
+    bool hasDocumentedChildren() const;
 
 private:
     QString title_;