summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlmetaproperty_p.h
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2009-05-15 00:30:03 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2009-05-15 00:30:03 (GMT)
commite03075954936444feda8670330e94b87d82deb79 (patch)
tree8b42b9b8855ba9f6050a25f66aaf8462cffcf96e /src/declarative/qml/qmlmetaproperty_p.h
parenta896219edac2db3321e5c012bcdb830c698efc1e (diff)
downloadQt-e03075954936444feda8670330e94b87d82deb79.zip
Qt-e03075954936444feda8670330e94b87d82deb79.tar.gz
Qt-e03075954936444feda8670330e94b87d82deb79.tar.bz2
Fix SetProperties not always setting properties correctly.
QmlMetaProperty no longer holds on to a QMetaProperty, as it may become invalidated for a dynamic object built using QmlOpenMetaObject. Reviewed-by: Aaron Kennedy
Diffstat (limited to 'src/declarative/qml/qmlmetaproperty_p.h')
-rw-r--r--src/declarative/qml/qmlmetaproperty_p.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlmetaproperty_p.h b/src/declarative/qml/qmlmetaproperty_p.h
index 1ea38e9..738bfec 100644
--- a/src/declarative/qml/qmlmetaproperty_p.h
+++ b/src/declarative/qml/qmlmetaproperty_p.h
@@ -54,7 +54,7 @@ public:
QmlMetaPropertyPrivate(const QmlMetaPropertyPrivate &other)
: name(other.name), signal(other.signal), context(other.context),
coreIdx(other.coreIdx), type(other.type), attachedFunc(other.attachedFunc),
- object(other.object), prop(other.prop), propType(other.propType),
+ object(other.object), propType(other.propType),
category(other.category) {}
QString name;
@@ -64,7 +64,6 @@ public:
uint type;
int attachedFunc;
QObject *object;
- QMetaProperty prop;
int propType;
mutable QmlMetaProperty::PropertyCategory category;