diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-04 14:33:40 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-09-04 14:33:40 +0200 |
commit | f255b1e8e297e7e1363921580007145cff574e0d (patch) | |
tree | 9a799be282e6c0d6544d9f8c872073f83e6c0475 /examples/widgets/animation/sub-attaq/qanimationstate.cpp | |
parent | 7e8705f6632428a8d9a937ab5fe087999347b3dd (diff) | |
parent | bf8fcab8bb92ff534c5cec048d6dbebb3b73a348 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Change-Id: I54741635460bb2d8f3fd0be535ee1968d6c442bb
Diffstat (limited to 'examples/widgets/animation/sub-attaq/qanimationstate.cpp')
-rw-r--r-- | examples/widgets/animation/sub-attaq/qanimationstate.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/widgets/animation/sub-attaq/qanimationstate.cpp b/examples/widgets/animation/sub-attaq/qanimationstate.cpp index ce99f9080d..6da085561b 100644 --- a/examples/widgets/animation/sub-attaq/qanimationstate.cpp +++ b/examples/widgets/animation/sub-attaq/qanimationstate.cpp @@ -50,7 +50,7 @@ #include "qanimationstate.h" -#include <QtCore/qstate.h> +#include <QAbstractAnimation> QT_BEGIN_NAMESPACE @@ -106,7 +106,7 @@ void QAnimationState::setAnimation(QAbstractAnimation *animation) return; //Disconnect from the previous animation if exist - if(m_animation) + if (m_animation) disconnect(m_animation, &QAbstractAnimation::finished, this, &QAnimationState::animationFinished); m_animation = animation; |