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

Change-Id: Ic8cb8f2dd90f8fb809034ef07b341f3f7cb71ab2

3 files changed, 30 insertions, 3 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 1ed62c5ac..543d0a842 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,3 @@
 load(qt_build_config)
 
-MODULE_VERSION = 5.13.1
+MODULE_VERSION = 5.13.2
diff --git a/dist/changes-5.13.2 b/dist/changes-5.13.2
new file mode 100644
index 000000000..f1a1f9dbb
--- /dev/null
+++ b/dist/changes-5.13.2
@@ -0,0 +1,27 @@
+Qt 5.13.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.13.0 through 5.13.1.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.13 series is binary compatible with the 5.12.x series.
+Applications compiled for 5.12 will continue to run with 5.13.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                         Distance Field Generator                         *
+****************************************************************************
+
+ - [QTBUG-77499] Improved performance when selecting unicode ranges in
+   large fonts.
+ - [QTBUG-77501] Fixed broken text rendering when generating large glyph
+   sets.
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);