qdoc: Remove all collision node stuff from qdoc

Now that the qdoc link command has ability to tell qdoc which module
contains a link target or whether to link to a QML or CPP entity,
collision pages should no longer be necessary. In fact, qdoc hasn't
been generating any collisions for some time. This task removes all
the collision node code from qdoc.

Task-number: QTBUG-40506
Change-Id: I34d1980ca1c0fe4bb5ad27dd4b00e61fa7e6e335
Reviewed-by: Topi Reiniö <[email protected]>

1 files changed, 3 insertions, 11 deletions

diff --git a/src/tools/qdoc/qdocdatabase.cpp b/src/tools/qdoc/qdocdatabase.cpp
index e9e62fb7f3c..8211f35342b 100644
--- a/src/tools/qdoc/qdocdatabase.cpp
+++ b/src/tools/qdoc/qdocdatabase.cpp
@@ -785,15 +785,8 @@ QmlClassNode* QDocDatabase::findQmlType(const QString& qmid, const QString& name
 
     QStringList path(name);
     Node* n = forest_.findNodeByNameAndType(path, Node::QmlType);
-    if (n) {
-        if (n->isQmlType())
-            return static_cast<QmlClassNode*>(n);
-        else if (n->isCollisionNode()) {
-            NameCollisionNode* ncn;
-            ncn = static_cast<NameCollisionNode*>(n);
-            return static_cast<QmlClassNode*>(ncn->findAny(Node::QmlType, Node::NoSubType));
-        }
-    }
+    if (n && n->isQmlType())
+        return static_cast<QmlClassNode*>(n);
     return 0;
 }
 
@@ -1365,9 +1358,8 @@ const Node* QDocDatabase::findNodeForTarget(const QString& target, const Node* r
     const Node* node = 0;
     if (target.isEmpty())
         node = relative;
-    else if (target.endsWith(".html")) {
+    else if (target.endsWith(".html"))
         node = findNodeByNameAndType(QStringList(target), Node::Document);
-    }
     else {
         QStringList path = target.split("::");
         int flags = SearchBaseClasses | SearchEnumValues; // | NonFunction;