diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-08-01 10:27:17 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-10 05:40:49 +0200 |
| commit | 4350877d6deb58f36df24164c6edde3302a3f1a3 (patch) | |
| tree | 5b1b121c1ce21aff1717de500282a5951f4e1267 /src/qml/qml/qqmlvmemetaobject.cpp | |
| parent | 34ae6deb78c30a80570e0c0dda7b2f071abdbf68 (diff) | |
Permit value types with metatype IDs >= QMetaType::User
Remove the assumption that value types must be types defined by
Qt, having metatype IDs below QMetaType::User.
Task-number: QTBUG-26352
Change-Id: Ib5a56ff2e7892e82adf17a3a1e7517a0c9fe0534
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlvmemetaobject.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvmemetaobject.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp index ce574875e3..902a6073b8 100644 --- a/src/qml/qml/qqmlvmemetaobject.cpp +++ b/src/qml/qml/qqmlvmemetaobject.cpp @@ -627,10 +627,7 @@ int QQmlVMEMetaObject::metaCall(QMetaObject::Call c, int _id, void **a) if (type != QVariant::Invalid) { if (valueIndex != -1) { - QQmlEnginePrivate *ep = ctxt?QQmlEnginePrivate::get(ctxt->engine):0; - QQmlValueType *valueType = 0; - if (ep) valueType = ep->valueTypes[type]; - else valueType = QQmlValueTypeFactory::valueType(type); + QQmlValueType *valueType = QQmlValueTypeFactory::valueType(type); Q_ASSERT(valueType); // @@ -683,9 +680,6 @@ int QQmlVMEMetaObject::metaCall(QMetaObject::Call c, int _id, void **a) updated = true; } - if (!ep) - delete valueType; - if (updated) return -1; } else { @@ -880,9 +874,7 @@ int QQmlVMEMetaObject::metaCall(QMetaObject::Call c, int _id, void **a) if (d->isValueTypeAlias()) { // Value type property - QQmlEnginePrivate *ep = QQmlEnginePrivate::get(ctxt->engine); - - QQmlValueType *valueType = ep->valueTypes[d->valueType()]; + QQmlValueType *valueType = QQmlValueTypeFactory::valueType(d->valueType()); Q_ASSERT(valueType); valueType->read(target, d->propertyIndex()); |