diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-08-21 03:28:39 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-08-21 03:28:39 (GMT) |
| commit | af23b7a78ce50d747efc06cd26ea5b69349df811 (patch) | |
| tree | 9199d28b4bbd32b3ba4de35486aeadaf626bd069 /src/declarative/util/qmlanimation.cpp | |
| parent | 08a4fffc4c93c324f95f5759c620287330c68d9d (diff) | |
| parent | 61486c42722a6ab5701c331645d6c25bce81a17e (diff) | |
| download | Qt-af23b7a78ce50d747efc06cd26ea5b69349df811.zip Qt-af23b7a78ce50d747efc06cd26ea5b69349df811.tar.gz Qt-af23b7a78ce50d747efc06cd26ea5b69349df811.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlanimation.cpp')
| -rw-r--r-- | src/declarative/util/qmlanimation.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index e5b7c47..0e93cc7 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -1462,6 +1462,10 @@ void QmlPropertyAnimationPrivate::convertVariant(QVariant &variant, int type) variant.setValue(QmlStringConverters::colorFromString(variant.toString())); break; } + case QVariant::Vector3D: { + variant.setValue(QmlStringConverters::vector3DFromString(variant.toString())); + break; + } default: if ((uint)type >= QVariant::UserType) { QmlMetaType::StringConverter converter = QmlMetaType::customStringConverter(type); |