summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-03-29 04:17:14 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-03-29 04:17:44 (GMT)
commit3943b97addec5436af595333150858c48c2f6ca6 (patch)
treeff4e9b69408c53446cca23ec4960d90b7b779dd9
parentda587063eab13e238002aebb05908cd420425c36 (diff)
downloadQt-3943b97addec5436af595333150858c48c2f6ca6.zip
Qt-3943b97addec5436af595333150858c48c2f6ca6.tar.gz
Qt-3943b97addec5436af595333150858c48c2f6ca6.tar.bz2
Fix for qdeclarativelanguage::listProperties
-rw-r--r--src/declarative/qml/qdeclarativevmemetaobject.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativevmemetaobject.cpp b/src/declarative/qml/qdeclarativevmemetaobject.cpp
index 7a08a2c..2404fdd 100644
--- a/src/declarative/qml/qdeclarativevmemetaobject.cpp
+++ b/src/declarative/qml/qdeclarativevmemetaobject.cpp
@@ -480,9 +480,12 @@ int QDeclarativeVMEMetaObject::metaCall(QMetaObject::Call c, int _id, void **a)
break;
}
if (t == qMetaTypeId<QDeclarativeListProperty<QObject> >()) {
+ int listIndex = data[id].asInt();
+ const List *list = listProperties.at(listIndex);
*reinterpret_cast<QDeclarativeListProperty<QObject> *>(a[0]) =
- QDeclarativeListProperty<QObject>(object, (void *)&listProperties.at(data[id].asInt()),
- list_append, list_count, list_at, list_clear);
+ QDeclarativeListProperty<QObject>(object, (void *)list,
+ list_append, list_count, list_at,
+ list_clear);
}
} else if (c == QMetaObject::WriteProperty) {