diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:16:29 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:23:19 +0200 |
| commit | f4b4c4f79b629498f3cddbbc10df8c1b4d6020d9 (patch) | |
| tree | 4119707660438ff58bd51f9cbe0f9e2a33f4b806 /examples/widgets/animation/sub-attaq/qanimationstate.h | |
| parent | 9bd6cec74dbbc5aece55dc0c8808494db29b9963 (diff) | |
| parent | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c
Diffstat (limited to 'examples/widgets/animation/sub-attaq/qanimationstate.h')
| -rw-r--r-- | examples/widgets/animation/sub-attaq/qanimationstate.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/examples/widgets/animation/sub-attaq/qanimationstate.h b/examples/widgets/animation/sub-attaq/qanimationstate.h index 063b119058..24759851ba 100644 --- a/examples/widgets/animation/sub-attaq/qanimationstate.h +++ b/examples/widgets/animation/sub-attaq/qanimationstate.h @@ -51,13 +51,7 @@ #ifndef QANIMATIONSTATE_H #define QANIMATIONSTATE_H -#ifndef QT_STATEMACHINE_SOLUTION -# include <QtCore/qstate.h> -# include <QtCore/qabstractanimation.h> -#else -# include "qstate.h" -# include "qabstractanimation.h" -#endif +#include <QState> QT_BEGIN_NAMESPACE @@ -67,7 +61,7 @@ class QAnimationState : public QState { Q_OBJECT public: - QAnimationState(QState *parent = 0); + QAnimationState(QState *parent = nullptr); ~QAnimationState(); void setAnimation(QAbstractAnimation *animation); |