diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-05-05 05:18:20 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-05-05 05:18:20 (GMT) |
| commit | 872c45c272ca71e8618475060aa28075e83fffce (patch) | |
| tree | 5a5a2ed3eaf15470160d0d7fe36a67b39c41e5ef /src/declarative/qml/qmlparser.cpp | |
| parent | 415708f85341448c6f30bbca6e31e48dbfde72a5 (diff) | |
| parent | 0725ca189ad30ec54a2a7a054404a50f20e2bfed (diff) | |
| download | Qt-872c45c272ca71e8618475060aa28075e83fffce.zip Qt-872c45c272ca71e8618475060aa28075e83fffce.tar.gz Qt-872c45c272ca71e8618475060aa28075e83fffce.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlparser.cpp')
| -rw-r--r-- | src/declarative/qml/qmlparser.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/declarative/qml/qmlparser.cpp b/src/declarative/qml/qmlparser.cpp index 87c8434..d862315 100644 --- a/src/declarative/qml/qmlparser.cpp +++ b/src/declarative/qml/qmlparser.cpp @@ -63,8 +63,7 @@ QT_BEGIN_NAMESPACE using namespace QmlParser; QmlParser::Object::Object() -: type(-1), metatype(0), extObject(0), defaultProperty(0), line(-1), column(-1), - dynamicPropertiesProperty(0), dynamicSignalsProperty(0) +: type(-1), metatype(0), extObject(0), defaultProperty(0), line(-1), column(-1) { } @@ -73,8 +72,6 @@ QmlParser::Object::~Object() if (defaultProperty) defaultProperty->release(); foreach(Property *prop, properties) prop->release(); - if (dynamicPropertiesProperty) dynamicPropertiesProperty->release(); - if (dynamicSignalsProperty) dynamicSignalsProperty->release(); } const QMetaObject *Object::metaObject() const |