diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-07-24 04:50:34 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-07-24 04:50:34 (GMT) |
| commit | 3ff864cf3ec30af8f5a7522eef7bc170d7e99911 (patch) | |
| tree | 98e4befe5a1872ea8309d03f257c98a3cf35b0a7 | |
| parent | 60cd50b800b6e6cf185df170c1b2cb41108a82b6 (diff) | |
| download | Qt-3ff864cf3ec30af8f5a7522eef7bc170d7e99911.zip Qt-3ff864cf3ec30af8f5a7522eef7bc170d7e99911.tar.gz Qt-3ff864cf3ec30af8f5a7522eef7bc170d7e99911.tar.bz2 | |
Make custom string converters work for builtin variant metatypes
With QVector3D now being a builtin variant type, the string converter
code broke. This change looks for string converters for all kinds of
types, just as in the rest of the QML code.
| -rw-r--r-- | src/declarative/qml/qmlbinding.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp index 431dd66..41cef49 100644 --- a/src/declarative/qml/qmlbinding.cpp +++ b/src/declarative/qml/qmlbinding.cpp @@ -139,8 +139,7 @@ void QmlBinding::update() } else { QVariant value = this->value(); - if ((uint)d->property.propertyType() >= QVariant::UserType && - value.type() == QVariant::String) { + if (value.type() == QVariant::String) { QmlMetaType::StringConverter con = QmlMetaType::customStringConverter(d->property.propertyType()); if (con) value = con(value.toString()); |