diff --git a/.qmake.conf b/.qmake.conf index 1ed62c5ac2a87a445b99ef5f9cb83252d5c5ff70..543d0a84223c69d95ce8159fc04eec912a39a367 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 0000000000000000000000000000000000000000..f1a1f9dbbb227fccfd5959627ba6f1da93a6f33d --- /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 82bcd1b252e70e0752e49196294e4b1d7c89000b..c840c748d9f602dd30c9dff82fc086525442d96f 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);