From 505a8c9dbcb6c8c668d4ad2db304f307022a3b85 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 10 Oct 2019 12:35:49 +0200 Subject: qdoc: Remove multiple QTypeInfo entries from All Classes page QTypeInfo is a class that is generated by a Qt macro. It is not documented and is not supposed to be documented, but clang sees it as being in the public API. This update ensures that the class is marked internal prior to generating the index file. Ironically, this was one of the classes that motivated the addition of the \dontdocument command, and it was the test for isDontDocument() that caused this bug. We might have to visit the \dontdocument command again. Task-number: QTBUG-79088 Change-Id: I11307a2236e2ebcdcc205952056ddaca88fc0bd3 Reviewed-by: Paul Wicking --- src/qdoc/node.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp index 82bcd1b25..ea6e82536 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(child)->hasAssociatedProperties()) -- cgit v1.2.3 From 6da2067cac4031d9df7ed72c24e29748f5351174 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 10 Oct 2019 13:07:04 +0200 Subject: qdoc: Do not add class to map if isDontDocument() is true This update ensures that if a class node returns true for isDontDocument(), it is not included in the map used for generating the all classes list. This also applies to QML types. Task-number: QTBUG-78940 Change-Id: I020cb0dd2f16187d5f6c75b400778b1518d7e05a Reviewed-by: Paul Wicking Reviewed-by: Martin Smith --- src/qdoc/node.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp index ea6e82536..c840c748d 100644 --- a/src/qdoc/node.cpp +++ b/src/qdoc/node.cpp @@ -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); -- cgit v1.2.3 From d8b9946892840b13c570254f89e158673cef13f2 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 14 Oct 2019 09:41:44 +0200 Subject: Bump version Change-Id: I58ce340a94bf70b44704e7af2b48952858c22f21 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From 78f52a4027da110bf14468b575c7262b4d28d65e Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Mon, 14 Oct 2019 10:28:56 +0300 Subject: Add changes file for Qt 5.13.2 Change-Id: Ibe11b7fa1130754ab0a6b1c2379d7e80909dc757 Reviewed-by: Friedemann Kleint Reviewed-by: Eskil Abrahamsen Blomfeldt --- dist/changes-5.13.2 | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 dist/changes-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. -- cgit v1.2.3 From bb4f88952b792fa5479e28a67738a61e6346b671 Mon Sep 17 00:00:00 2001 From: Thibaut Cuvelier Date: Sat, 12 Oct 2019 01:08:18 +0200 Subject: Correct a few typos in qdoc Change-Id: I6b9a66f15308ecbbdbeaf2dc66de3875b16dd03f Reviewed-by: Paul Wicking Reviewed-by: Edward Welbourne --- src/qdoc/generator.cpp | 4 ++-- src/qdoc/htmlgenerator.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp index d5caa8bd0..3bb3ab13a 100644 --- a/src/qdoc/generator.cpp +++ b/src/qdoc/generator.cpp @@ -1467,7 +1467,7 @@ void Generator::generateInvokableNote(const Node* node, CodeMarker* marker) /*! Generate the documentation for \a relative. i.e. \a relative - is the node that reporesentas the entity where a qdoc comment + is the node that represents the entity where a qdoc comment was found, and \a text represents the qdoc comment. */ bool Generator::generateText(const Text& text, @@ -1707,7 +1707,7 @@ void Generator::generateOverloadedSignal(const Node* node, CodeMarker* marker) /*! - Traverses the database recursivly to generate all the documentation. + Traverses the database recursively to generate all the documentation. */ void Generator::generateDocs() { diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index a2eb42af8..3b1de12ae 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -3020,7 +3020,7 @@ void HtmlGenerator::generateAnnotatedLists(const Node* relative, the classes in the class map \a nmm and then generates a compact list of the class names alphabetized on the part of the name not including the common prefix. You can tell - the function to use \a comonPrefix as the common prefix, + the function to use \a commonPrefix as the common prefix, but normally you let it figure it out itself by looking at the name of the first and last classes in the class map \a nmm. -- cgit v1.2.3