diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-09 01:12:21 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-09 01:12:21 (GMT) |
| commit | 0f1ad0fb5bc5d601a4379eefe14a60c0b9fc6454 (patch) | |
| tree | 5eafa40e34fb311a22e125d90cba2958441427a4 /src/declarative | |
| parent | 1b08e9bf28ba4f2c49b9240abc59f805802bdc1d (diff) | |
| download | Qt-0f1ad0fb5bc5d601a4379eefe14a60c0b9fc6454.zip Qt-0f1ad0fb5bc5d601a4379eefe14a60c0b9fc6454.tar.gz Qt-0f1ad0fb5bc5d601a4379eefe14a60c0b9fc6454.tar.bz2 | |
Make sure animations convert between float and double when needed.
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/util/qmlanimation.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index 6047d4a..3edbc5f 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -1442,8 +1442,7 @@ QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,ParallelAnimation,QmlParallelAni void QmlPropertyAnimationPrivate::convertVariant(QVariant &variant, int type) { if (variant.type() != QVariant::String) { - if ((uint)type < QVariant::UserType) - variant.convert((QVariant::Type)type); + variant.convert((QVariant::Type)type); return; } |