diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2011-08-01 17:08:06 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-30 13:18:28 +0200 |
| commit | 101dfc3bf2694d822d44f7632a2cc7dd1196f67c (patch) | |
| tree | 7bd64142831cb53ab39a3f68b848d180187bbd97 /src/declarative/qml/qdeclarativecompiler.cpp | |
| parent | cffc600f310cec5a8a2b6622fa260f930883cbf4 (diff) | |
Fix initialization of QDeclarativeVMEMetaData::PropertyData for variant properties.
The propertyType member for variant properties needs to be initialized to -1 (at least
according to QDeclarativeVMEMetaObject::metaCall).
Change-Id: I44f226f2bce3732f3a4220fe24617b5cb2292f97
Reviewed-on: http://codereview.qt.nokia.com/3778
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'src/declarative/qml/qdeclarativecompiler.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativecompiler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 6874c2a415..6c4bbb4d8f 100644 --- a/src/declarative/qml/qdeclarativecompiler.cpp +++ b/src/declarative/qml/qdeclarativecompiler.cpp @@ -2623,7 +2623,7 @@ bool QDeclarativeCompiler::buildDynamicMeta(QDeclarativeParser::Object *obj, Dyn typeRefs[p->type] = builder.newString(strlen(builtinTypes[p->type].cppType)); typeRef = typeRefs[p->type]; if (p->type == Object::DynamicProperty::Variant) - propertyType = qMetaTypeId<QVariant>(); + propertyType = -1; } else { Q_ASSERT(p->type == Object::DynamicProperty::CustomList || |