qdoc: Corrected error in QDocDatabase::findQmlType()

It was still using the QML module version number as
part of the search key. e.g. it tried to find the
type node for QtQuick.Controls::Button using
QtQuick.Controls2.Button, but now it searches without
the 2.

Task-number: QTBUG-34173
Change-Id: Ibc8b6d9ef4ceebb20c1be00ec3bc9190c51bcdf3
Reviewed-by: Topi Reiniö <[email protected]>
Reviewed-by: Jerome Pasion <[email protected]>
Reviewed-by: Nico Vertriest <[email protected]>

1 files changed, 2 insertions, 33 deletions

diff --git a/src/tools/qdoc/qdocdatabase.cpp b/src/tools/qdoc/qdocdatabase.cpp
index e371d448c66..f2ecb02a2fb 100644
--- a/src/tools/qdoc/qdocdatabase.cpp
+++ b/src/tools/qdoc/qdocdatabase.cpp
@@ -357,23 +357,10 @@ QmlClassNode* QDocDatabase::findQmlType(const ImportRec& import, const QString&
         else
             qmName = import.importUri_;
         for (int i=0; i<dotSplit.size(); ++i) {
-            QString qmid = qmName + import.version_;
-            QString qualifiedName = qmid + "::" + dotSplit[i];
+            QString qualifiedName = qmName + "::" + dotSplit[i];
             QmlClassNode* qcn = qmlTypeMap_.value(qualifiedName);
-            if (qcn) {
+            if (qcn)
                 return qcn;
-            }
-            if (import.version_.size() > 1) {
-                int dot = import.version_.lastIndexOf(QChar('.'));
-                if (dot > 0) {
-                    qmid = import.name_ + import.version_.left(dot);
-                    qualifiedName = qmid + "::" + dotSplit[i];
-                    qcn = qmlTypeMap_.value(qualifiedName);
-                    if (qcn) {
-                        return qcn;
-                    }
-                }
-            }
         }
     }
     return 0;
@@ -1000,24 +987,6 @@ void QDocDatabase::resolveQmlInheritance(InnerNode* root)
     }
 }
 
-#if 0
-void QDocDatabase::resolveQmlInheritance(InnerNode* root)
-{
-    // Dop we need recursion?
-    foreach (Node* child, root->childNodes()) {
-        if (child->type() == Node::Document && child->subType() == Node::QmlClass) {
-            QmlClassNode* qcn = static_cast<QmlClassNode*>(child);
-            if ((qcn->qmlBaseNode() == 0) && !qcn->qmlBaseName().isEmpty()) {
-                QmlClassNode* bqcn = findQmlType(QString(), qcn->qmlBaseName());
-                if (bqcn) {
-                    qcn->setQmlBaseNode(bqcn);
-                }
-            }
-        }
-    }
-}
-#endif
-
 /*!
  */
 void QDocDatabase::resolveTargets(InnerNode* root)