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>

7 files changed, 8 insertions, 26 deletions

diff --git a/src/qdoc/qdoc/src/qdoc/docbookgenerator.cpp b/src/qdoc/qdoc/src/qdoc/docbookgenerator.cpp
index 9c8901cc6..8d5d4fb30 100644
--- a/src/qdoc/qdoc/src/qdoc/docbookgenerator.cpp
+++ b/src/qdoc/qdoc/src/qdoc/docbookgenerator.cpp
@@ -2137,16 +2137,14 @@ void DocBookGenerator::generateSortedQmlNames(const Node *base, const NodeList &
 {
     // From Generator::appendSortedQmlNames.
     QMap<QString, Node *> classMap;
-    int index = 0;
 
     for (auto sub : subs)
-        if (!base->isQtQuickNode() || !sub->isQtQuickNode()
-            || (base->logicalModuleName() == sub->logicalModuleName()))
-            classMap[sub->plainFullName(base).toLower()] = sub;
+        classMap[sub->plainFullName(base).toLower()] = sub;
 
     QStringList names = classMap.keys();
     names.sort();
 
+    int index = 0;
     for (const QString &name : names) {
         generateFullName(classMap.value(name), base);
         m_writer->writeCharacters(Utilities::comma(index++, names.size()));
diff --git a/src/qdoc/qdoc/src/qdoc/functionnode.h b/src/qdoc/qdoc/src/qdoc/functionnode.h
index beccba3b7..dca8c7e44 100644
--- a/src/qdoc/qdoc/src/qdoc/functionnode.h
+++ b/src/qdoc/qdoc/src/qdoc/functionnode.h
@@ -122,7 +122,6 @@ public:
     }
     [[nodiscard]] QString element() const override { return parent()->name(); }
     [[nodiscard]] bool isAttached() const override { return m_attached; }
-    [[nodiscard]] bool isQtQuickNode() const override { return parent()->isQtQuickNode(); }
     [[nodiscard]] QString qmlTypeName() const override { return parent()->qmlTypeName(); }
     [[nodiscard]] QString logicalModuleName() const override
     {
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;
 }
 
diff --git a/src/qdoc/qdoc/src/qdoc/node.cpp b/src/qdoc/qdoc/src/qdoc/node.cpp
index 8246c0461..1aadbdeb1 100644
--- a/src/qdoc/qdoc/src/qdoc/node.cpp
+++ b/src/qdoc/qdoc/src/qdoc/node.cpp
@@ -409,10 +409,6 @@ bool Node::nodeNameLessThan(const Node *n1, const Node *n2)
   function will return \e true.
 */
 
-/*! \fn bool Node::isQtQuickNode() const
-  Returns true if this node represents a QML element in the QtQuick module.
-*/
-
 /*! \fn bool Node::isRelatableType() const
   Returns true if this node is something you can relate things to with
   the \e relates command. NamespaceNode, ClassNode, HeaderNode, and
diff --git a/src/qdoc/qdoc/src/qdoc/node.h b/src/qdoc/qdoc/src/qdoc/node.h
index 4b227cad0..3b5eb56bd 100644
--- a/src/qdoc/qdoc/src/qdoc/node.h
+++ b/src/qdoc/qdoc/src/qdoc/node.h
@@ -180,7 +180,6 @@ public:
     [[nodiscard]] virtual bool isInternal() const;
     [[nodiscard]] virtual bool isMacro() const { return false; }
     [[nodiscard]] virtual bool isPageNode() const { return false; } // means "generates a doc page"
-    [[nodiscard]] virtual bool isQtQuickNode() const { return false; }
     [[nodiscard]] virtual bool isRelatableType() const { return false; }
     [[nodiscard]] virtual bool isMarkedReimp() const { return false; }
     [[nodiscard]] virtual bool isPropertyGroup() const { return false; }
diff --git a/src/qdoc/qdoc/src/qdoc/qmlpropertynode.h b/src/qdoc/qdoc/src/qdoc/qmlpropertynode.h
index 19d1c9485..f966949c1 100644
--- a/src/qdoc/qdoc/src/qdoc/qmlpropertynode.h
+++ b/src/qdoc/qdoc/src/qdoc/qmlpropertynode.h
@@ -32,7 +32,6 @@ public:
     [[nodiscard]] bool isReadOnly();
     [[nodiscard]] bool isAlias() const override { return m_isAlias; }
     [[nodiscard]] bool isAttached() const override { return m_attached; }
-    [[nodiscard]] bool isQtQuickNode() const override { return parent()->isQtQuickNode(); }
     [[nodiscard]] QString qmlTypeName() const override { return parent()->qmlTypeName(); }
     [[nodiscard]] QString logicalModuleName() const override
     {
diff --git a/src/qdoc/qdoc/src/qdoc/qmltypenode.h b/src/qdoc/qdoc/src/qdoc/qmltypenode.h
index fd18a2294..d7cd5ff2b 100644
--- a/src/qdoc/qdoc/src/qdoc/qmltypenode.h
+++ b/src/qdoc/qdoc/src/qdoc/qmltypenode.h
@@ -23,10 +23,6 @@ class QmlTypeNode : public Aggregate
 public:
     QmlTypeNode(Aggregate *parent, const QString &name, Node::NodeType type);
     [[nodiscard]] bool isFirstClassAggregate() const override { return true; }
-    [[nodiscard]] bool isQtQuickNode() const override
-    {
-        return (logicalModuleName() == QLatin1String("QtQuick"));
-    }
     ClassNode *classNode() override { return m_classNode; }
     void setClassNode(ClassNode *cn) override { m_classNode = cn; }
     [[nodiscard]] bool isAbstract() const override { return m_abstract; }