From 517daa6e73fe6fd098741282bfb01cdac36c048a Mon Sep 17 00:00:00 2001
From: Ville Voutilainen <ville.voutilainen@qt.io>
Date: Wed, 7 Feb 2018 18:25:05 +0200
Subject: Fix GCC 8 warning in qvariantanimation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/corelib/animation/qvariantanimation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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)
-- 
cgit v1.2.3