diff options
Diffstat (limited to 'src/corelib/animation/qvariantanimation.cpp')
-rw-r--r-- | src/corelib/animation/qvariantanimation.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index f69d9dd8de..a6d013b11a 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -101,6 +101,7 @@ QT_BEGIN_NAMESPACE \list \li \l{QMetaType::}{Int} + \li \l{QMetaType::}{UInt} \li \l{QMetaType::}{Double} \li \l{QMetaType::}{Float} \li \l{QMetaType::}{QLine} @@ -470,6 +471,8 @@ QVariantAnimation::Interpolator QVariantAnimationPrivate::getInterpolator(int in { case QMetaType::Int: return castToInterpolator(_q_interpolateVariant<int>); + case QMetaType::UInt: + return castToInterpolator(_q_interpolateVariant<uint>); case QMetaType::Double: return castToInterpolator(_q_interpolateVariant<double>); case QMetaType::Float: @@ -617,7 +620,7 @@ void QVariantAnimation::setKeyValues(const KeyValues &keyValues) { Q_D(QVariantAnimation); d->keyValues = keyValues; - qSort(d->keyValues.begin(), d->keyValues.end(), animationValueLessThan); + std::sort(d->keyValues.begin(), d->keyValues.end(), animationValueLessThan); d->recalculateCurrentInterval(/*force=*/true); } |