From c593492d1678a2ec08f1bfffcb572459b3bc6c00 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 26 Sep 2018 15:39:35 +0200 Subject: Modernize the "animation" feature Change-Id: Ibc164b3df3cf87db569ef4813de458a9067b7f7d Reviewed-by: Edward Welbourne Reviewed-by: Oswald Buddenhagen --- examples/widgets/animation/sub-attaq/qanimationstate.cpp | 5 ----- examples/widgets/animation/sub-attaq/qanimationstate.h | 5 ----- examples/widgets/widgets.pro | 1 + 3 files changed, 1 insertion(+), 10 deletions(-) (limited to 'examples') diff --git a/examples/widgets/animation/sub-attaq/qanimationstate.cpp b/examples/widgets/animation/sub-attaq/qanimationstate.cpp index 82bfdbf4b9..ae24af6da3 100644 --- a/examples/widgets/animation/sub-attaq/qanimationstate.cpp +++ b/examples/widgets/animation/sub-attaq/qanimationstate.cpp @@ -80,9 +80,6 @@ machine.start(); \sa QState, {The Animation Framework} */ - -#ifndef QT_NO_ANIMATION - /*! Constructs a new state with the given \a parent state. */ @@ -155,5 +152,3 @@ bool QAnimationState::event(QEvent *e) } QT_END_NAMESPACE - -#endif diff --git a/examples/widgets/animation/sub-attaq/qanimationstate.h b/examples/widgets/animation/sub-attaq/qanimationstate.h index 06ab4dfbcf..063b119058 100644 --- a/examples/widgets/animation/sub-attaq/qanimationstate.h +++ b/examples/widgets/animation/sub-attaq/qanimationstate.h @@ -61,9 +61,6 @@ QT_BEGIN_NAMESPACE - -#ifndef QT_NO_ANIMATION - class QAbstractAnimation; class QAnimationState : public QState @@ -89,8 +86,6 @@ private: QAbstractAnimation *m_animation; }; -#endif - QT_END_NAMESPACE #endif // QANIMATIONSTATE_H diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index f9d863b69e..7e52125125 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -27,4 +27,5 @@ qtHaveModule(gui):qtConfig(opengl): \ contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows !qtConfig(draganddrop): SUBDIRS -= draganddrop +!qtConfig(animation): SUBDIRS -= animation mac:SUBDIRS += mac -- cgit v1.2.3