diff options
| -rw-r--r-- | src/corelib/animation/qvariantanimation.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/animation/qvariantanimation.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index 7117092c54..75b8a3fbbf 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -448,7 +448,7 @@ void QVariantAnimation::registerInterpolator(QVariantAnimation::Interpolator fun template<typename T> static inline QVariantAnimation::Interpolator castToInterpolator(QVariant (*func)(const T &from, const T &to, qreal progress)) { - return reinterpret_cast<QVariantAnimation::Interpolator>(func); + return reinterpret_cast<QVariantAnimation::Interpolator>(reinterpret_cast<void(*)()>(func)); } QVariantAnimation::Interpolator QVariantAnimationPrivate::getInterpolator(int interpolationType) diff --git a/src/corelib/animation/qvariantanimation.h b/src/corelib/animation/qvariantanimation.h index f21832b256..0d007487b9 100644 --- a/src/corelib/animation/qvariantanimation.h +++ b/src/corelib/animation/qvariantanimation.h @@ -113,7 +113,7 @@ private: template <typename T> void qRegisterAnimationInterpolator(QVariant (*func)(const T &from, const T &to, qreal progress)) { - QVariantAnimation::registerInterpolator(reinterpret_cast<QVariantAnimation::Interpolator>(func), qMetaTypeId<T>()); + QVariantAnimation::registerInterpolator(reinterpret_cast<QVariantAnimation::Interpolator>(reinterpret_cast<void(*)()>(func)), qMetaTypeId<T>()); } #endif //QT_NO_ANIMATION |