diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-29 04:24:14 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-29 04:24:14 (GMT) |
| commit | 8a5d7dc02dae77fec2dadd888fe6a79d5aefec6b (patch) | |
| tree | aed0f18a7064059542e0bf6a8842edc32f84788b | |
| parent | 03166b7e3c491caaebfa7cea8edd137f66058024 (diff) | |
| parent | 3943b97addec5436af595333150858c48c2f6ca6 (diff) | |
| download | Qt-8a5d7dc02dae77fec2dadd888fe6a79d5aefec6b.zip Qt-8a5d7dc02dae77fec2dadd888fe6a79d5aefec6b.tar.gz Qt-8a5d7dc02dae77fec2dadd888fe6a79d5aefec6b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | src/declarative/qml/qdeclarativevmemetaobject.cpp | 7 |
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) { |