diff options
| author | Frank Meerkoetter <frank.meerkoetter@basyskom.com> | 2015-07-20 20:35:34 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-08-18 20:25:38 +0000 |
| commit | 7a4967986ed5cfa3418bdd53a8ea8a34e100241a (patch) | |
| tree | bb0dd8cd52900327c5fa6fcfc71a713c37398a70 /src/qml/qml/qqmlvmemetaobject.cpp | |
| parent | 0720dea139e735b3438968f42c9abf7b198cd69b (diff) | |
Port list properties away from QQmlVmeVariant
The index into the list of list properties (an int) is now also
stored as a QV4::Value.
Change-Id: I16809c5027ed3c4264aab6dfed8b4519adf83e2a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index d4ad0f2a9a..1e60b593f1 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -546,7 +546,7 @@ QQmlVMEMetaObject::QQmlVMEMetaObject(QObject *obj, int t = (metaData->propertyData() + ii)->propertyType; if (t == list_type) { listProperties.append(List(methodOffset() + ii, this)); - data[ii].setValue(listProperties.count() - 1); + writeProperty(ii, listProperties.count() - 1); } else if (!needsJSWrapper && (t == qobject_type || t == variant_type)) { needsJSWrapper = true; } @@ -993,7 +993,7 @@ int QQmlVMEMetaObject::metaCall(QMetaObject::Call c, int _id, void **a) break; } if (t == qMetaTypeId<QQmlListProperty<QObject> >()) { - int listIndex = data[id].asInt(); + const int listIndex = readPropertyAsInt(id); const List *list = &listProperties.at(listIndex); *reinterpret_cast<QQmlListProperty<QObject> *>(a[0]) = QQmlListProperty<QObject>(object, const_cast<List *>(list), |