diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-11 09:04:05 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-12-11 09:22:21 +0100 |
commit | 07c6f38d38b32169a5bf80e5fe2db4b3b4cf2635 (patch) | |
tree | 457092d946c3c1f556431321d37abd210a21fd45 | |
parent | e5f41230d2fa1cdc126785f396e5a57cee728341 (diff) |
qquaternionanimation.cpp: Fix warning suppression
Quote the option, fixing g++ 8.3 warning about:
qquaternionanimation.cpp: In member function ‘void Qt3DCore::Quick::QQuaternionAnimation::setType(Qt3DCore::Quick::QQuaternionAnimation::Type)’:
qquaternionanimation.cpp:147:44: warning: missing option after ‘#pragma GCC diagnostic’ kind [-Wpragmas]
QT_WARNING_DISABLE_GCC(-Wcast-function-type) ^
qquaternionanimation.cpp:148:107: warning: cast between incompatible function types from ‘QVariant (*)(const QQuaternion&, const QQuaternion&, qreal)’ {aka ‘QVariant (*)(const QQuaternion&, const QQuaternion&, double)’} to ‘QVariantAnimation::Interpolator’ {aka ‘QVariant (*)(const void*, const void*, double)’} [-Wcast-function-type]
d->interpolator = reinterpret_cast<QVariantAnimation::Interpolator>(&q_quaternionNlerpInterpolator);
Amends 698bd5f22c79ecf777a0abe57a36676dc49fa8f3.
Change-Id: Ia68e2b5b198e658ef7ce9e930d8f3d4bd77fd2d2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-rw-r--r-- | src/quick3d/quick3d/qquaternionanimation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick3d/quick3d/qquaternionanimation.cpp b/src/quick3d/quick3d/qquaternionanimation.cpp index 22cc905f7..933a08ee4 100644 --- a/src/quick3d/quick3d/qquaternionanimation.cpp +++ b/src/quick3d/quick3d/qquaternionanimation.cpp @@ -144,7 +144,7 @@ void QQuaternionAnimation::setType(Type type) switch (type) { case Nlerp: QT_WARNING_PUSH -QT_WARNING_DISABLE_GCC(-Wcast-function-type) +QT_WARNING_DISABLE_GCC("-Wcast-function-type") d->interpolator = reinterpret_cast<QVariantAnimation::Interpolator>(&q_quaternionNlerpInterpolator); QT_WARNING_POP break; |