diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-16 05:02:25 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-16 05:02:25 (GMT) |
| commit | 1962eaef07cb3adf73e7d8815ac470f62003a192 (patch) | |
| tree | 86b13f69b3dacce41aaad1656e10f674d087fec1 /src/declarative/qml/qmlparser.cpp | |
| parent | 1734f968773fade53a73c8ce04ea86de8df0b875 (diff) | |
| download | Qt-1962eaef07cb3adf73e7d8815ac470f62003a192.zip Qt-1962eaef07cb3adf73e7d8815ac470f62003a192.tar.gz Qt-1962eaef07cb3adf73e7d8815ac470f62003a192.tar.bz2 | |
Small cleanups
Diffstat (limited to 'src/declarative/qml/qmlparser.cpp')
| -rw-r--r-- | src/declarative/qml/qmlparser.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlparser.cpp b/src/declarative/qml/qmlparser.cpp index 8ee3b4e..e2d334e 100644 --- a/src/declarative/qml/qmlparser.cpp +++ b/src/declarative/qml/qmlparser.cpp @@ -62,8 +62,7 @@ QT_BEGIN_NAMESPACE using namespace QmlParser; QmlParser::Object::Object() -: type(-1), metatype(0), extObjectData(0), defaultProperty(0), - parserStatusCast(-1) +: type(-1), idIndex(-1), metatype(0), defaultProperty(0), parserStatusCast(-1) { } @@ -84,7 +83,7 @@ QmlParser::Object::~Object() const QMetaObject *Object::metaObject() const { - if (extObjectData && metatype) + if (!metadata.isEmpty() && metatype) return &extObject; else return metatype; |