diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-18 07:14:27 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-06-18 07:14:27 (GMT) |
| commit | a6b9ed06db7470cae4d7ce92e3a15a61e4602549 (patch) | |
| tree | 01c4daab8256d77c1e7d1eb3620d70c42d65bcea /src/declarative | |
| parent | ed19fa0b1538f5c6ebbb545eab4d7cf50db0a4a9 (diff) | |
| parent | b36efd48eda01e41cade18d2156128cd32732c4c (diff) | |
| download | Qt-a6b9ed06db7470cae4d7ce92e3a15a61e4602549.zip Qt-a6b9ed06db7470cae4d7ce92e3a15a61e4602549.tar.gz Qt-a6b9ed06db7470cae4d7ce92e3a15a61e4602549.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qmlmetaproperty.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp index a152807..52036c2 100644 --- a/src/declarative/qml/qmlmetaproperty.cpp +++ b/src/declarative/qml/qmlmetaproperty.cpp @@ -814,6 +814,16 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) default: + { + if ((uint)t >= QVariant::UserType && vt == QVariant::String) { + QmlMetaType::StringConverter con = QmlMetaType::customStringConverter(t); + if (con) { + QVariant v = con(value.toString()); + prop.write(object, v); + return; + } + } + } break; } prop.write(object, value); |