diff options
Diffstat (limited to 'src/qml/qml/qqmlproperty.cpp')
-rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index 42bf0dd657..09b735ae9e 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -1585,11 +1585,14 @@ bool QQmlPropertyPrivate::writeBinding(QObject *object, propertyType = propertyMetaObject.className(); } } else if (value.userType() != QVariant::Invalid) { - valueType = QMetaType::typeName(value.userType()); + if (value.userType() == QMetaType::VoidStar) + valueType = "null"; + else + valueType = QMetaType::typeName(value.userType()); } if (!valueType) - valueType = "null"; + valueType = "undefined"; if (!propertyType) propertyType = QMetaType::typeName(type); if (!propertyType) |