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

QmlJSInterpreter: Register QML Types

Browse Source 
A Component in .qmltypes can have an array of exports which
may differ in type names too (possibly because of type deprecation).
Consider the type names to be aliases and create a CppComponentValue
for each of the alias.

Change-Id: I70cadab465aec3e7842abd7050549c77fb8342fc
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
This commit is contained in:
Aurindam Jana
2012-04-27 16:00:16 +02:00
parent 5195f855db
commit c908a4b9e6
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1367,7 +1367,11 @@ QList<const CppComponentValue *> CppQmlTypes::createObjectsForImport(const QStri
foreach (const FakeMetaObject::ConstPtr &fmo, _fakeMetaObjectsByPackage.value(package)) {
// find the highest-version export
FakeMetaObject::Export bestExport;
QList<QString> aliases;
foreach (const FakeMetaObject::Export &exp, fmo->exports()) {
// Store all aliases
if (!exp.type.isEmpty() && !aliases.contains(exp.type))
aliases.append(exp.type);
if (exp.package != package || (version.isValid() && exp.version > version))
continue;
if (!bestExport.isValid() || exp.version > bestExport.version)
@@ -1388,15 +1392,27 @@ QList<const CppComponentValue *> CppQmlTypes::createObjectsForImport(const QStri
name = fmo->className();
}
CppComponentValue *newObject = new CppComponentValue(
CppComponentValue *newComponent = new CppComponentValue(
fmo, name, package, bestExport.version, version,
bestExport.metaObjectRevision, _valueOwner);
// use package.cppname importversion as key
_objectsByQualifiedName.insert(key, newObject);
_objectsByQualifiedName.insert(key, newComponent);
// Create CppComponentValues for all the aliases
// TODO: Show warning for deprecated ones
aliases.removeOne(name);
QList<const CppComponentValue *> newComponents;
newComponents.append(newComponent);
foreach (const QString &alias, aliases) {
newComponents.append(new CppComponentValue(
fmo, alias, package, bestExport.version, version,
bestExport.metaObjectRevision, _valueOwner));
}
if (exported)
exportedObjects += newObject;
newObjects += newObject;
exportedObjects += newComponents;
newObjects += newComponents;
}
// set their prototypes, creating them if necessary