feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmljsInterpreter: avoid ambiguities about major import version

Browse Source 
Both CppComponentValues are created and available in the code model.
In case of a context lookup it seems to be random which one is taken.

This patch ensures that the code model only contains the object
with the highest version.

Change-Id: Icd1ac1c7d62e277bbd8a2747c3504457be5dd8d6
Reviewed-by: Christian Kamm <kamm@incasoftware.de>
This commit is contained in:
Thomas Hartmann
2012-09-25 11:42:24 +02:00
parent a90abe9e6f
commit d48756d75b
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/libs/qmljs/qmljsinterpreter.cpp
View File

@@ -1358,7 +1358,8 @@ template void CppQmlTypes::load< QHash<QString, FakeMetaObject::ConstPtr> >(cons
QList<const CppComponentValue *> CppQmlTypes::createObjectsForImport(const QString &package, ComponentVersion version)
{
QList<const CppComponentValue *> exportedObjects;
QHash<QString, const CppComponentValue *> exportedObjects;
QList<const CppComponentValue *> newObjects;
// make new exported objects
@@ -1398,8 +1399,11 @@ QList<const CppComponentValue *> CppQmlTypes::createObjectsForImport(const QStri
// use package.cppname importversion as key
_objectsByQualifiedName.insert(key, newComponent);
if (exported)
exportedObjects += newComponent;
if (exported) {
if (!exportedObjects.contains(name) // we might have the same type in different versions
|| (newComponent->componentVersion() > exportedObjects.value(name)->componentVersion()))
exportedObjects.insert(name, newComponent);
}
newObjects += newComponent;
}
}
@@ -1437,7 +1441,7 @@ QList<const CppComponentValue *> CppQmlTypes::createObjectsForImport(const QStri
}
}
return exportedObjects;
return exportedObjects.values();
}
bool CppQmlTypes::hasModule(const QString &module) const