diff options
author | Andy Nichols <andy.nichols@qt.io> | 2017-11-13 14:42:48 +0100 |
---|---|---|
committer | Andy Nichols <andy.nichols@qt.io> | 2017-11-14 10:26:22 +0000 |
commit | 77215f1219c6146c5d58fc21d4d8940ee477a6d7 (patch) | |
tree | 03790cac54632b2672e7e1b409067d9f1c59b275 | |
parent | 764b715b5f682ddb1bdb52f67b5a35d85af7ccf1 (diff) |
Fix warnings caused by QClipAnimator calling QNode::sceneChangeEvent
Calling the base implementation of sceneChangeEvent unnecessarily can
cause lots of warnings to be printed:
"sceneChangeEvent should have been subclassed"
To prevent this (and still work around the bug this line intended to
fix) a conditional has been added to make sure that we do not hit the
warning condition.
Change-Id: Ibaa771b4b58d6f4e38ba815bde1b635ed83867d2
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r-- | src/animation/frontend/qclipanimator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/animation/frontend/qclipanimator.cpp b/src/animation/frontend/qclipanimator.cpp index 79125a76e..6b503e87f 100644 --- a/src/animation/frontend/qclipanimator.cpp +++ b/src/animation/frontend/qclipanimator.cpp @@ -174,8 +174,9 @@ void QClipAnimator::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) QAnimationCallbackTriggerPtr callbackTrigger = qSharedPointerCast<Qt3DAnimation::QAnimationCallbackTrigger>(change); if (callbackTrigger->callback()) callbackTrigger->callback()->valueChanged(callbackTrigger->value()); + } else if (change->type() == Qt3DCore::PropertyUpdated) { + QAbstractClipAnimator::sceneChangeEvent(change); } - QAbstractClipAnimator::sceneChangeEvent(change); } } // namespace Qt3DAnimation |