diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-09-09 05:14:50 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-09-09 05:14:50 (GMT) |
| commit | d03ed1d1ff45ff484f35ace9d90f6c84dd73aa21 (patch) | |
| tree | 954527301ce27777e5ec26f0b9c9abaee07e5481 /src/declarative/util | |
| parent | 6878a0b7c507d21366cacee0a09bafeb81726d82 (diff) | |
| parent | a57af1d6856ffa3a50eb1e0cdd1653b7b4ebdb41 (diff) | |
| download | Qt-d03ed1d1ff45ff484f35ace9d90f6c84dd73aa21.zip Qt-d03ed1d1ff45ff484f35ace9d90f6c84dd73aa21.tar.gz Qt-d03ed1d1ff45ff484f35ace9d90f6c84dd73aa21.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util')
| -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; } |