diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-16 08:51:25 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-16 08:51:25 (GMT) |
| commit | f34edb5f7f5ecddf4602727b7a981fadc1d4d4b4 (patch) | |
| tree | f0e171d6270255d50d0a225e67a4935c52c700f2 /src/declarative/qml/qdeclarativedirparser.cpp | |
| parent | f32438ffccd8728143b93399e7cd251e72d23b55 (diff) | |
| parent | 7e4a9187bb11b794e45d95d2e9fae026d6b0d07d (diff) | |
| download | Qt-f34edb5f7f5ecddf4602727b7a981fadc1d4d4b4.zip Qt-f34edb5f7f5ecddf4602727b7a981fadc1d4d4b4.tar.gz Qt-f34edb5f7f5ecddf4602727b7a981fadc1d4d4b4.tar.bz2 | |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt into 4.8
Diffstat (limited to 'src/declarative/qml/qdeclarativedirparser.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativedirparser.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativedirparser.cpp b/src/declarative/qml/qdeclarativedirparser.cpp index b5ad33d..362b99c 100644 --- a/src/declarative/qml/qdeclarativedirparser.cpp +++ b/src/declarative/qml/qdeclarativedirparser.cpp @@ -160,6 +160,16 @@ bool QDeclarativeDirParser::parse() Component entry(sections[1], sections[2], -1, -1); entry.internal = true; _components.append(entry); + } else if (sections[0] == QLatin1String("typeinfo")) { + if (sectionCount != 2) { + reportError(lineNumber, -1, + QString::fromUtf8("typeinfo requires 1 argument, but %1 were provided").arg(sectionCount - 1)); + continue; + } +#ifdef QT_CREATOR + TypeInfo typeInfo(sections[1]); + _typeInfos.append(typeInfo); +#endif } else if (sectionCount == 2) { // No version specified (should only be used for relative qmldir files) @@ -229,4 +239,11 @@ QList<QDeclarativeDirParser::Component> QDeclarativeDirParser::components() cons return _components; } +#ifdef QT_CREATOR +QList<TypeInfo> QDeclarativeDirParser::typeInfos() const +{ + return _typeInfos; +} +#endif + QT_END_NAMESPACE |