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

qmljs: set cpp object to the latest version exported

Browse Source 
m_objectsByQualifiedName did not prefer the latest meta object
revision, as consequence at type exported both anonymously and with a
name, would pick up one version randomly.

Change-Id: I91baf2729d0a0bda61205a62d9a38d04b4da058e
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
This commit is contained in:
Marco Benelli
2015-09-14 12:48:05 +02:00
parent 68f6eec47a
commit e69bb933e3
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1487,6 +1487,7 @@ QList<const CppComponentValue *> CppQmlTypes::createObjectsForImport(const QStri
if (m_objectsByQualifiedName.contains(key)) if (m_objectsByQualifiedName.contains(key))
continue; continue;
ComponentVersion cppVersion;
foreach (const FakeMetaObject::Export &bestExport, bestExports) { foreach (const FakeMetaObject::Export &bestExport, bestExports) {
QString name = bestExport.type; QString name = bestExport.type;
bool exported = true; bool exported = true;
@@ -1501,7 +1502,10 @@ QList<const CppComponentValue *> CppQmlTypes::createObjectsForImport(const QStri
fmoo.originId); fmoo.originId);
// use package.cppname importversion as key // use package.cppname importversion as key
m_objectsByQualifiedName.insert(key, newComponent); if (cppVersion <= bestExport.version) {
cppVersion = bestExport.version;
m_objectsByQualifiedName.insert(key, newComponent);
}
if (exported) { if (exported) {
if (!exportedObjects.contains(name) // we might have the same type in different versions if (!exportedObjects.contains(name) // we might have the same type in different versions
|| (newComponent->componentVersion() > exportedObjects.value(name)->componentVersion())) || (newComponent->componentVersion() > exportedObjects.value(name)->componentVersion()))