diff options
author | Topi Reinio <topi.reinio@qt.io> | 2024-04-09 18:40:40 +0000 |
---|---|---|
committer | Topi Reinio <topi.reinio@qt.io> | 2024-04-12 11:17:08 +0000 |
commit | 141ef147527ba46c16ba7439a5b4f78e7fc2e613 (patch) | |
tree | 1516068b8ee8c0ac55b4aeb56da4c002486ad529 /src/qdoc/qdoc/src/qdoc/generator.cpp | |
parent | 765142a59a613f1fb6c5542a6e5ab54f3682c699 (diff) |
qdoc: Stop mistreating the QtQuick QML module
Node::isQtQuickNode() returned true for any QML node under
a module named "QtQuick". The reason why modules needed
special handling based on their name is lost to history.
Get rid of isQtQuickNode() and the code that uses it.
Change-Id: Ia0334b9a16a07bedecd51f9428733f840f8bd913
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/qdoc/qdoc/src/qdoc/generator.cpp')
-rw-r--r-- | src/qdoc/qdoc/src/qdoc/generator.cpp | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/qdoc/qdoc/src/qdoc/generator.cpp b/src/qdoc/qdoc/src/qdoc/generator.cpp index fa30e93c8..9ba4de976 100644 --- a/src/qdoc/qdoc/src/qdoc/generator.cpp +++ b/src/qdoc/qdoc/src/qdoc/generator.cpp @@ -168,20 +168,15 @@ int Generator::appendSortedQmlNames(Text &text, const Node *base, const NodeList QMap<QString, Text> classMap; for (const auto sub : subs) { - Text text; - if (!base->isQtQuickNode() || !sub->isQtQuickNode() - || (base->logicalModuleName() == sub->logicalModuleName())) { - appendFullName(text, sub, base); - classMap[text.toString().toLower()] = text; - } + Text full_name; + appendFullName(full_name, sub, base); + classMap[full_name.toString().toLower()] = full_name; } int index = 0; - const QStringList names = classMap.keys(); - for (const auto &name : names) { - text << classMap[name]; - text << Utilities::comma(index++, names.size()); - } + const auto &names = classMap.keys(); + for (const auto &name : names) + text << classMap[name] << Utilities::comma(index++, names.size()); return index; } |