From fdc55ec837c79f1b42896b56f5be2c4abb5183ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Fri, 18 May 2012 17:30:03 +0200 Subject: Simplify QVariant::convert and QVariant::canConvert calls. QVariant::Type casts are not necessary in Qt5. Change-Id: Ia2e7d8fa367a59c23bd06993db36d96a0a46a229 Reviewed-by: Roberto Raggi --- src/qml/qml/qqmlproperty.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qml/qml/qqmlproperty.cpp') diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index d68d8a9517..761b75acf4 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -1371,7 +1371,7 @@ bool QQmlPropertyPrivate::write(QObject *object, v = QQmlStringConverters::variantFromString(value.toString(), propertyType, &ok); if (!ok) { v = value; - if (v.convert((QVariant::Type)propertyType)) { + if (v.convert(propertyType)) { ok = true; } else if ((uint)propertyType >= QVariant::UserType && variantType == QVariant::String) { QQmlMetaType::StringConverter con = QQmlMetaType::customStringConverter(propertyType); -- cgit v1.2.3