summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlvmemetaobject.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-08-10 01:34:21 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-08-10 01:34:21 (GMT)
commit1682279a946955e8a08a3287e0642c32fa6e0d01 (patch)
tree9a2c995085a2b97cadf1cb04ee0e4b0e394cb2fe /src/declarative/qml/qmlvmemetaobject.cpp
parentc5865c9a8dbd3c5be11069aff59935aa9b9a75bb (diff)
downloadQt-1682279a946955e8a08a3287e0642c32fa6e0d01.zip
Qt-1682279a946955e8a08a3287e0642c32fa6e0d01.tar.gz
Qt-1682279a946955e8a08a3287e0642c32fa6e0d01.tar.bz2
Fix crash in property aliases
Since 588093b3e12dd5039bcc4ee545d9d9112d25394f id objects are stored in the special idValues array, not in the generic propertyValues list.
Diffstat (limited to 'src/declarative/qml/qmlvmemetaobject.cpp')
-rw-r--r--src/declarative/qml/qmlvmemetaobject.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlvmemetaobject.cpp b/src/declarative/qml/qmlvmemetaobject.cpp
index 33a31a4..9ce63b1 100644
--- a/src/declarative/qml/qmlvmemetaobject.cpp
+++ b/src/declarative/qml/qmlvmemetaobject.cpp
@@ -168,8 +168,7 @@ int QmlVMEMetaObject::metaCall(QMetaObject::Call c, int _id, void **a)
QmlContextPrivate *ctxtPriv =
(QmlContextPrivate *)QObjectPrivate::get(ctxt);
- QObject *target =
- *(QObject **)ctxtPriv->propertyValues[d->contextIdx].data();
+ QObject *target = ctxtPriv->idValues[d->contextIdx].data();
if (!target) return -1;
if (c == QMetaObject::ReadProperty && !aConnected.testBit(id)) {