From 12afec6c2f89264b7344f9221763898c77a396fc Mon Sep 17 00:00:00 2001 From: Ville Voutilainen Date: Wed, 28 Feb 2018 16:26:58 +0200 Subject: Silence a GCC 8 warning in qquickanimation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qtdeclarative/src/quick/util/qquickanimation.cpp:1669:109: error: cast between incompatible function types from ‘QVariant (*)(qreal&, qreal&, qreal)’ {aka ‘QVariant (*)(double&, double&, double)’} to ‘QVariantAnimation::Interpolator’ {aka ‘QVariant (*)(const void*, const void*, double)’} [-Werror=cast-function-type] d->interpolator = reinterpret_cast(&_q_interpolateClockwiseRotation); Change-Id: I8da70ef666deb3cbdbf05c5bac89f705a2ec5ea8 Reviewed-by: Simon Hausmann --- src/quick/util/qquickanimation.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/quick/util') diff --git a/src/quick/util/qquickanimation.cpp b/src/quick/util/qquickanimation.cpp index c936ba4e93..a89f237499 100644 --- a/src/quick/util/qquickanimation.cpp +++ b/src/quick/util/qquickanimation.cpp @@ -1666,13 +1666,13 @@ void QQuickRotationAnimation::setDirection(QQuickRotationAnimation::RotationDire d->direction = direction; switch(d->direction) { case Clockwise: - d->interpolator = reinterpret_cast(&_q_interpolateClockwiseRotation); + d->interpolator = reinterpret_cast(reinterpret_cast(&_q_interpolateClockwiseRotation)); break; case Counterclockwise: - d->interpolator = reinterpret_cast(&_q_interpolateCounterclockwiseRotation); + d->interpolator = reinterpret_cast(reinterpret_cast(&_q_interpolateCounterclockwiseRotation)); break; case Shortest: - d->interpolator = reinterpret_cast(&_q_interpolateShortestRotation); + d->interpolator = reinterpret_cast(reinterpret_cast(&_q_interpolateShortestRotation)); break; default: d->interpolator = QVariantAnimationPrivate::getInterpolator(d->interpolatorType); -- cgit v1.2.3