summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlparser_p.h
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-05-06 00:56:28 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-05-06 01:01:17 (GMT)
commit547223a4f31067ed34acabd9a2d8a0b7645fd3f8 (patch)
treeb4e676646c7f9b569428784d255c22fdca9467df /src/declarative/qml/qmlparser_p.h
parentb291ab1f5ebb496d7eb7aae04c3f06d57a4f547d (diff)
downloadQt-547223a4f31067ed34acabd9a2d8a0b7645fd3f8.zip
Qt-547223a4f31067ed34acabd9a2d8a0b7645fd3f8.tar.gz
Qt-547223a4f31067ed34acabd9a2d8a0b7645fd3f8.tar.bz2
Fix crash
As QMetaObject::indexOfProperty() downcasts QMetaObject's that have the DynamicMetaObject flag set, we must ensure that we use a QAbstractDynamicMetaObject whereever we set this flag, otherwise it may crash.
Diffstat (limited to 'src/declarative/qml/qmlparser_p.h')
-rw-r--r--src/declarative/qml/qmlparser_p.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlparser_p.h b/src/declarative/qml/qmlparser_p.h
index 676e25e..2c9b0f1 100644
--- a/src/declarative/qml/qmlparser_p.h
+++ b/src/declarative/qml/qmlparser_p.h
@@ -94,7 +94,8 @@ namespace QmlParser
const QMetaObject *metatype;
// The synthesized metaobject, if QML added signals or properties to
// this type. Otherwise null
- QMetaObject *extObject;
+ QMetaObject *extObjectData;
+ QAbstractDynamicMetaObject extObject;
Property *getDefaultProperty();
Property *getProperty(const QByteArray &name, bool create=true);