Merge remote-tracking branch 'origin/5.13.2' into 5.135.13

Change-Id: Ic8cb8f2dd90f8fb809034ef07b341f3f7cb71ab2

1 files changed, 2 insertions, 2 deletions

diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp
index 82bcd1b25..c840c748d 100644
--- a/src/qdoc/node.cpp
+++ b/src/qdoc/node.cpp
@@ -1114,7 +1114,7 @@ QStringList Aggregate::primaryKeys()
 void Aggregate::markUndocumentedChildrenInternal()
 {
     foreach (Node *child, children_) {
-        if (!child->isSharingComment() && !child->hasDoc() && !child->isDontDocument()) {
+        if (!child->isSharingComment() && !child->hasDoc()) {
             if (!child->docMustBeGenerated()) {
                 if (child->isFunction()) {
                     if (static_cast<FunctionNode*>(child)->hasAssociatedProperties())
@@ -3386,7 +3386,7 @@ void Aggregate::findAllObsoleteThings()
 void Aggregate::findAllClasses()
 {
     foreach (Node *n, children_) {
-        if (!n->isPrivate() && !n->isInternal() &&
+        if (!n->isPrivate() && !n->isInternal() && !n->isDontDocument() &&
             n->tree()->camelCaseModuleName() != QString("QDoc")) {
             if (n->isClassNode()) {
                 QDocDatabase::cppClasses().insert(n->qualifyCppName().toLower(), n);