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(-) (limited to 'src') 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(-) (limited to 'src') 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