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/v8/qv8valuetypewrapper.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/v8/qv8valuetypewrapper.cpp')
| -rw-r--r-- | src/qml/qml/v8/qv8valuetypewrapper.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/qml/v8/qv8valuetypewrapper.cpp b/src/qml/qml/v8/qv8valuetypewrapper.cpp index fe58546522..91875150ec 100644 --- a/src/qml/qml/v8/qv8valuetypewrapper.cpp +++ b/src/qml/qml/v8/qv8valuetypewrapper.cpp @@ -164,9 +164,8 @@ static bool readReferenceValue(QV8ValueTypeReferenceResource *reference) // overwritten with a different type in the meantime. // We need to modify this reference to the updated value type, if // possible, or return false if it is not a value type. - QQmlEngine *e = reference->engine->engine(); - if (QQmlValueTypeFactory::isValueType(variantReferenceType) && e) { - reference->type = QQmlEnginePrivate::get(e)->valueTypes[variantReferenceType]; + if (QQmlValueTypeFactory::isValueType(variantReferenceType)) { + reference->type = QQmlValueTypeFactory::valueType(variantReferenceType); if (!reference->type) { return false; } |