diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-06-25 06:37:28 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-06-25 06:37:28 (GMT) |
| commit | 03df7f73de6a1fd482876caaf377a61593df8a38 (patch) | |
| tree | c9e70014c4646d3b1b2a02369862a6557c87e15e /src/declarative/qml/qdeclarativecompiler.cpp | |
| parent | c91030e308f8cd9ad66e7de127a1f9dbbedd11d3 (diff) | |
| download | Qt-03df7f73de6a1fd482876caaf377a61593df8a38.zip Qt-03df7f73de6a1fd482876caaf377a61593df8a38.tar.gz Qt-03df7f73de6a1fd482876caaf377a61593df8a38.tar.bz2 | |
Test ListElement type via type system, not string comparison.
Task-number: QTBUG-11222
Reviewed-by: Aaron Kennedy
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 80a1093..a7cfa62 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -2176,6 +2176,18 @@ int QDeclarativeCompiler::evaluateEnum(const QByteArray& script) const return -1; } +const QMetaObject *QDeclarativeCompiler::resolveType(const QByteArray& name) const +{ + QDeclarativeType *qmltype = 0; + if (!enginePrivate->importDatabase.resolveType(unit->imports, name, &qmltype, + 0, 0, 0, 0)) + return 0; + if (!qmltype) + return 0; + return qmltype->metaObject(); +} + + // Ensures that the dynamic meta specification on obj is valid bool QDeclarativeCompiler::checkDynamicMeta(QDeclarativeParser::Object *obj) { |