diff options
| author | Christian Kamm <christian.d.kamm@nokia.com> | 2011-09-02 13:25:08 +0200 |
|---|---|---|
| committer | Christian Kamm <christian.d.kamm@nokia.com> | 2011-09-08 12:34:32 +0200 |
| commit | bfc95befa88fa2f65aca66d3a15a353b568ef89c (patch) | |
| tree | 451594d76c272edc4edc396a853b751d43b61403 /src/libs/qmljs | |
| parent | 10a956a8f7328412c6c76b3a1f9c56b85a783b38 (diff) | |
| download | qt-creator-bfc95befa88fa2f65aca66d3a15a353b568ef89c.tar.gz | |
QmlJS: Honor typeinfo lines in qmldir files.
Change-Id: I1ddad1eb031bc4b95671be4a474b5e8e72f6e350
Reviewed-on: http://codereview.qt-project.org/4137
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Diffstat (limited to 'src/libs/qmljs')
| -rw-r--r-- | src/libs/qmljs/qmljsdocument.cpp | 1 | ||||
| -rw-r--r-- | src/libs/qmljs/qmljsdocument.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/libs/qmljs/qmljsdocument.cpp b/src/libs/qmljs/qmljsdocument.cpp index 897c56a891..831e9fb160 100644 --- a/src/libs/qmljs/qmljsdocument.cpp +++ b/src/libs/qmljs/qmljsdocument.cpp @@ -373,6 +373,7 @@ LibraryInfo::LibraryInfo(const QmlDirParser &parser) : _status(Found) , _components(parser.components()) , _plugins(parser.plugins()) + , _typeinfos(parser.typeInfos()) , _dumpStatus(NoTypeInfo) { } diff --git a/src/libs/qmljs/qmljsdocument.h b/src/libs/qmljs/qmljsdocument.h index 9b6191d8fa..b2f824cecb 100644 --- a/src/libs/qmljs/qmljsdocument.h +++ b/src/libs/qmljs/qmljsdocument.h @@ -142,6 +142,7 @@ private: Status _status; QList<QmlDirParser::Component> _components; QList<QmlDirParser::Plugin> _plugins; + QList<QmlDirParser::TypeInfo> _typeinfos; typedef QList<LanguageUtils::FakeMetaObject::ConstPtr> FakeMetaObjectList; FakeMetaObjectList _metaObjects; @@ -159,6 +160,9 @@ public: QList<QmlDirParser::Plugin> plugins() const { return _plugins; } + QList<QmlDirParser::TypeInfo> typeInfos() const + { return _typeinfos; } + FakeMetaObjectList metaObjects() const { return _metaObjects; } |