From 101dfc3bf2694d822d44f7632a2cc7dd1196f67c Mon Sep 17 00:00:00 2001 From: Roberto Raggi Date: Mon, 1 Aug 2011 17:08:06 +0200 Subject: [PATCH] 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 Reviewed-by: Qt Sanity Bot --- src/declarative/qml/qdeclarativecompiler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp index 6874c2a..6c4bbb4 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(); + propertyType = -1; } else { Q_ASSERT(p->type == Object::DynamicProperty::CustomList || -- 2.7.4