From d61c673d54ba5cf7e52ea0d8510fbfa2e4f7dd4b Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@qt.io>
Date: Mon, 30 Jul 2018 12:35:31 +0200
Subject: [PATCH] qdoc: Fix generated C++ and QML type lists
As of change 03b8f9d9, for nodes read from an index, QDoc creates a Doc
instance that evaluates as empty (Node::hasDoc() returns false). This
resulted in 'All C++ Classes' and 'All QML Types' pages to have no
content as the code that selects the listed nodes had a check against
an empty Doc.
Remove this check as unnecessary: for a type to be listed it's enough
for it to be marked as public.
Task-number: QTBUG-69693
Change-Id: I35a61c99ef3d44023601705be26e74e695cd1d0e
Reviewed-by: Martin Smith <martin.smith@qt.io>
---
src/qdoc/qdocdatabase.cpp | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/qdoc/qdocdatabase.cpp b/src/qdoc/qdocdatabase.cpp
index fa8d97a18..8766622b8 100644
--- a/src/qdoc/qdocdatabase.cpp
+++ b/src/qdoc/qdocdatabase.cpp
@@ -1027,7 +1027,8 @@ void QDocDatabase::findAllClasses(Aggregate* node)
while (c != node->childNodes().constEnd()) {
if ((*c)->access() != Node::Private && (!(*c)->isInternal() || showInternal_) &&
(*c)->tree()->camelCaseModuleName() != QString("QDoc")) {
- if ((*c)->type() == Node::Class && !(*c)->doc().isEmpty()) {
+
+ if ((*c)->type() == Node::Class) {
QString className = (*c)->name();
if ((*c)->parent() &&
(*c)->parent()->type() == Node::Namespace &&
@@ -1036,8 +1037,8 @@ void QDocDatabase::findAllClasses(Aggregate* node)
cppClasses_.insert(className.toLower(), *c);
}
- else if (((*c)->isQmlType() || (*c)->isQmlBasicType() ||
- (*c)->isJsType() || (*c)->isJsBasicType()) && !(*c)->doc().isEmpty()) {
+ else if ((*c)->isQmlType() || (*c)->isQmlBasicType() ||
+ (*c)->isJsType() || (*c)->isJsBasicType()) {
QString qmlTypeName = (*c)->name().toLower();
if (qmlTypeName.startsWith(QLatin1String("QML:"), Qt::CaseInsensitive))
qmlTypes_.insert(qmlTypeName.mid(4),*c);
--
GitLab