Fix the search of QML types.

Stop iterating the multi hash as soon as we find an element with
a different key.

Change-Id: Ie474708229b4040e66b17ceffc5be787856bc905
Reviewed-on: http://codereview.qt.nokia.com/3799
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index a084bd3..3bf04b3 100644 (file)
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -1273,7 +1273,7 @@ QDeclarativeType *QDeclarativeMetaType::qmlType(const QString &name, int version
     QDeclarativeMetaTypeData::Names::ConstIterator it = data->nameToType.find(name);
     while (it != data->nameToType.end()) {
         // XXX version_major<0 just a kludge for QDeclarativePropertyPrivate::initProperty
-        if (version_major<0 || (*it)->availableInVersion(version_major,version_minor))
+        if (it.key() == name && (version_major<0 || (*it)->availableInVersion(version_major,version_minor)))
             return (*it);
         ++it;
     }