Fix assert when binding to property variant.

Remove workarounds for the QVariant meta-type and use it directly and
remove QMetaObjectBuilder entirely and use the up to date copy in
qtbase.

Change-Id: I1ad601906d6b172adc7ce7bb63af28cd578eb5d7
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>

1 files changed, 1 insertions, 4 deletions

diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp
index 05bec635..ca528a38 100644
--- a/src/declarative/qml/qdeclarativeproperty.cpp
+++ b/src/declarative/qml/qdeclarativeproperty.cpp
@@ -444,10 +444,7 @@ int QDeclarativePropertyPrivate::propertyType() const
     if (isValueType()) {
         return valueType.valueTypePropType;
     } else if (type & QDeclarativeProperty::Property) {
-        if (core.propType == (int)QVariant::LastType)
-            return qMetaTypeId<QVariant>();
-        else
-            return core.propType;
+        return core.propType;
     } else {
         return QVariant::Invalid;
     }