diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 14:17:08 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 14:17:08 (GMT) |
| commit | 1072379e34be71dd7cbacf762a9a1647278e2b95 (patch) | |
| tree | 8bae3c0263ad57a7f7762211f7e917870fbe6bd2 | |
| parent | 5e8f97047a31a53a98c8bc71159e00cc56bda94d (diff) | |
| parent | 7fcda24112d690575007ddcb11e097a9c33e0f19 (diff) | |
| download | Qt-1072379e34be71dd7cbacf762a9a1647278e2b95.zip Qt-1072379e34be71dd7cbacf762a9a1647278e2b95.tar.gz Qt-1072379e34be71dd7cbacf762a9a1647278e2b95.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qml-team:
QmlDirParser: Fix typeInfo accessor.
| -rw-r--r-- | src/declarative/qml/qdeclarativedirparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativedirparser.cpp b/src/declarative/qml/qdeclarativedirparser.cpp index 362b99c..48ff46a 100644 --- a/src/declarative/qml/qdeclarativedirparser.cpp +++ b/src/declarative/qml/qdeclarativedirparser.cpp @@ -240,7 +240,7 @@ QList<QDeclarativeDirParser::Component> QDeclarativeDirParser::components() cons } #ifdef QT_CREATOR -QList<TypeInfo> QDeclarativeDirParser::typeInfos() const +QList<QDeclarativeDirParser::TypeInfo> QDeclarativeDirParser::typeInfos() const { return _typeInfos; } |