diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-12-18 10:14:57 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2019-12-18 10:15:32 +0100 |
| commit | 1776037b0443dc57d59afe0772a83b1d47aced14 (patch) | |
| tree | 56213eee7188e5f1d2e4abe290b3757603c835ef /src/animation/frontend/qabstractanimationclip.cpp | |
| parent | c2ea752f684290d156c500c6a7174fe3f27fa086 (diff) | |
| parent | c754eb2883394852f155e31f5366fa25a4ffad42 (diff) | |
Merge branch '5.15' into dev
Change-Id: I731aa986e1cc45b3af920db1a23f256927beecf7
Diffstat (limited to 'src/animation/frontend/qabstractanimationclip.cpp')
| -rw-r--r-- | src/animation/frontend/qabstractanimationclip.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/animation/frontend/qabstractanimationclip.cpp b/src/animation/frontend/qabstractanimationclip.cpp index e662a1408..08133072c 100644 --- a/src/animation/frontend/qabstractanimationclip.cpp +++ b/src/animation/frontend/qabstractanimationclip.cpp @@ -36,7 +36,6 @@ #include "qabstractanimationclip.h" #include "qabstractanimationclip_p.h" -#include <Qt3DCore/qpropertyupdatedchange.h> QT_BEGIN_NAMESPACE @@ -122,7 +121,7 @@ void QAbstractAnimationClipPrivate::setDuration(float duration) animator->setRunning(true); \endcode - \sa QAnimationClip, QAnimationClipLoader + \sa Qt3DAnimation::QAnimationClip, Qt3DAnimation::QAnimationClipLoader */ /*! @@ -134,6 +133,11 @@ QAbstractAnimationClip::QAbstractAnimationClip(QAbstractAnimationClipPrivate &dd { } +// TODO Unused remove in Qt6 +void QAbstractAnimationClip::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &) +{ +} + /*! Destroys this animation clip. */ |