diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-04 04:49:20 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-04 04:49:20 (GMT) |
commit | eda079761194a96783cdb8d49c79eb2c9c0b7dac (patch) | |
tree | 4ca35b23b09e6c3d1d2fb11ec943c9347bb5719b /src/declarative/util/qdeclarativeanimation.cpp | |
parent | 4164a11032b64fe5a557515f283fa0e4c6d0260d (diff) | |
download | Qt-eda079761194a96783cdb8d49c79eb2c9c0b7dac.zip Qt-eda079761194a96783cdb8d49c79eb2c9c0b7dac.tar.gz Qt-eda079761194a96783cdb8d49c79eb2c9c0b7dac.tar.bz2 |
Compile without QVariant::EasingCurve in Qt 4.6.2.
Diffstat (limited to 'src/declarative/util/qdeclarativeanimation.cpp')
-rw-r--r-- | src/declarative/util/qdeclarativeanimation.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp index b14de19..f33d7c7 100644 --- a/src/declarative/util/qdeclarativeanimation.cpp +++ b/src/declarative/util/qdeclarativeanimation.cpp @@ -52,6 +52,7 @@ #include <qdeclarativestringconverters_p.h> #include <qdeclarativeglobal_p.h> #include <qdeclarativemetatype_p.h> +#include <qdeclarativevaluetype_p.h> #include <qdeclarativeproperty_p.h> #include <qvariant.h> @@ -1710,12 +1711,13 @@ void QDeclarativePropertyAnimationPrivate::convertVariant(QVariant &variant, int break; } default: - if ((uint)type >= QVariant::UserType) { + if (QDeclarativeValueTypeFactory::isValueType((uint)type)) { + variant.convert((QVariant::Type)type); + } else { QDeclarativeMetaType::StringConverter converter = QDeclarativeMetaType::customStringConverter(type); if (converter) variant = converter(variant.toString()); - } else - variant.convert((QVariant::Type)type); + } break; } } |