diff options
| author | Ville Voutilainen <ville.voutilainen@qt.io> | 2018-02-07 18:25:05 +0200 |
|---|---|---|
| committer | Ville Voutilainen <ville.voutilainen@qt.io> | 2018-02-14 05:43:55 +0000 |
| commit | 517daa6e73fe6fd098741282bfb01cdac36c048a (patch) | |
| tree | 7e77cbc91af2df23c482917a4d81b96cdc244b03 /src/corelib/animation | |
| parent | c97632385ec178d34f57062ca834b9908d92f327 (diff) | |
Fix GCC 8 warning in qvariantanimation
qtbase/src/corelib/animation/qvariantanimation.cpp:451:13: error: cast between incompatible function types from ‘QVariant (*)(const QRectF&, const QRectF&, qreal)’ {aka ‘QVariant (*)(const QRectF&, const QRectF&, double)’} to ‘QVariantAnimation::Interpolator’ {aka ‘QVariant (*)(const void*, const void*, double)’} [-Werror=cast-function-type]
Change-Id: I5398316adaa0f12fbbdfdb200fd796de284821ef
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/corelib/animation')
| -rw-r--r-- | src/corelib/animation/qvariantanimation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index 7117092c54..e0d7db144a 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) |