diff options
author | Liang Qi <liang.qi@qt.io> | 2018-09-26 15:39:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-10-12 14:26:15 +0000 |
commit | c593492d1678a2ec08f1bfffcb572459b3bc6c00 (patch) | |
tree | a9427b13e0f3aa252d68decc862de5acb4dc3b17 /src/corelib | |
parent | 0509383cf2852f2aebd1efd75413835747c8f341 (diff) |
Modernize the "animation" feature
Change-Id: Ibc164b3df3cf87db569ef4813de458a9067b7f7d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/corelib')
27 files changed, 45 insertions, 110 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index b3db200ed1..4d7ce038dd 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -153,8 +153,6 @@ #include <QtCore/qcoreevent.h> #include <QtCore/qpointer.h> -#ifndef QT_NO_ANIMATION - #define DEFAULT_TIMER_INTERVAL 16 #define PAUSE_TIMER_COARSE_THRESHOLD 2000 @@ -1485,5 +1483,3 @@ QT_END_NAMESPACE #include "moc_qabstractanimation.cpp" #include "moc_qabstractanimation_p.cpp" - -#endif //QT_NO_ANIMATION diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h index 0ff6bc5176..25b5726d56 100644 --- a/src/corelib/animation/qabstractanimation.h +++ b/src/corelib/animation/qabstractanimation.h @@ -42,10 +42,9 @@ #include <QtCore/qobject.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(animation); -#ifndef QT_NO_ANIMATION +QT_BEGIN_NAMESPACE class QAnimationGroup; class QSequentialAnimationGroup; @@ -169,11 +168,6 @@ private: }; - - - -#endif //QT_NO_ANIMATION - QT_END_NAMESPACE #endif // QABSTRACTANIMATION_H diff --git a/src/corelib/animation/qabstractanimation_p.h b/src/corelib/animation/qabstractanimation_p.h index 5593046e48..3b6e8d6cc4 100644 --- a/src/corelib/animation/qabstractanimation_p.h +++ b/src/corelib/animation/qabstractanimation_p.h @@ -58,7 +58,7 @@ #include <private/qobject_p.h> #include <qabstractanimation.h> -#ifndef QT_NO_ANIMATION +QT_REQUIRE_CONFIG(animation); QT_BEGIN_NAMESPACE @@ -296,6 +296,4 @@ private: QT_END_NAMESPACE -#endif //QT_NO_ANIMATION - #endif //QABSTRACTANIMATION_P_H diff --git a/src/corelib/animation/qanimationgroup.cpp b/src/corelib/animation/qanimationgroup.cpp index 486dc149ea..f47d99eb68 100644 --- a/src/corelib/animation/qanimationgroup.cpp +++ b/src/corelib/animation/qanimationgroup.cpp @@ -86,8 +86,6 @@ #include <QtCore/qcoreevent.h> #include "qanimationgroup_p.h" -#ifndef QT_NO_ANIMATION - #include <algorithm> QT_BEGIN_NAMESPACE @@ -300,5 +298,3 @@ void QAnimationGroupPrivate::animationRemoved(int index, QAbstractAnimation *) QT_END_NAMESPACE #include "moc_qanimationgroup.cpp" - -#endif //QT_NO_ANIMATION diff --git a/src/corelib/animation/qanimationgroup.h b/src/corelib/animation/qanimationgroup.h index 136ad3ca9f..7c7666f251 100644 --- a/src/corelib/animation/qanimationgroup.h +++ b/src/corelib/animation/qanimationgroup.h @@ -42,10 +42,9 @@ #include <QtCore/qabstractanimation.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(animation); -#ifndef QT_NO_ANIMATION +QT_BEGIN_NAMESPACE class QAnimationGroupPrivate; class Q_CORE_EXPORT QAnimationGroup : public QAbstractAnimation @@ -74,8 +73,6 @@ private: Q_DECLARE_PRIVATE(QAnimationGroup) }; -#endif //QT_NO_ANIMATION - QT_END_NAMESPACE #endif //QANIMATIONGROUP_H diff --git a/src/corelib/animation/qanimationgroup_p.h b/src/corelib/animation/qanimationgroup_p.h index 31c2cd08e8..ff759d11fd 100644 --- a/src/corelib/animation/qanimationgroup_p.h +++ b/src/corelib/animation/qanimationgroup_p.h @@ -57,7 +57,7 @@ #include "private/qabstractanimation_p.h" -#ifndef QT_NO_ANIMATION +QT_REQUIRE_CONFIG(animation); QT_BEGIN_NAMESPACE @@ -89,6 +89,4 @@ public: QT_END_NAMESPACE -#endif //QT_NO_ANIMATION - #endif //QANIMATIONGROUP_P_H diff --git a/src/corelib/animation/qparallelanimationgroup.cpp b/src/corelib/animation/qparallelanimationgroup.cpp index e4dfc1bd6e..1dcf006dd3 100644 --- a/src/corelib/animation/qparallelanimationgroup.cpp +++ b/src/corelib/animation/qparallelanimationgroup.cpp @@ -72,8 +72,6 @@ #include "qparallelanimationgroup_p.h" //#define QANIMATION_DEBUG -#ifndef QT_NO_ANIMATION - QT_BEGIN_NAMESPACE typedef QList<QAbstractAnimation *>::ConstIterator AnimationListConstIt; @@ -339,5 +337,3 @@ bool QParallelAnimationGroup::event(QEvent *event) QT_END_NAMESPACE #include "moc_qparallelanimationgroup.cpp" - -#endif //QT_NO_ANIMATION diff --git a/src/corelib/animation/qparallelanimationgroup.h b/src/corelib/animation/qparallelanimationgroup.h index 09a439ef24..683d933861 100644 --- a/src/corelib/animation/qparallelanimationgroup.h +++ b/src/corelib/animation/qparallelanimationgroup.h @@ -42,10 +42,9 @@ #include <QtCore/qanimationgroup.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(animation); -#ifndef QT_NO_ANIMATION +QT_BEGIN_NAMESPACE class QParallelAnimationGroupPrivate; class Q_CORE_EXPORT QParallelAnimationGroup : public QAnimationGroup @@ -72,8 +71,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_uncontrolledAnimationFinished()) }; -#endif //QT_NO_ANIMATION - QT_END_NAMESPACE #endif // QPARALLELANIMATIONGROUP diff --git a/src/corelib/animation/qparallelanimationgroup_p.h b/src/corelib/animation/qparallelanimationgroup_p.h index 1c9c3072f7..fc8f809d5a 100644 --- a/src/corelib/animation/qparallelanimationgroup_p.h +++ b/src/corelib/animation/qparallelanimationgroup_p.h @@ -55,7 +55,7 @@ #include "private/qanimationgroup_p.h" #include <QtCore/qhash.h> -#ifndef QT_NO_ANIMATION +QT_REQUIRE_CONFIG(animation); QT_BEGIN_NAMESPACE @@ -86,6 +86,4 @@ public: QT_END_NAMESPACE -#endif //QT_NO_ANIMATION - #endif //QPARALLELANIMATIONGROUP_P_H diff --git a/src/corelib/animation/qpauseanimation.cpp b/src/corelib/animation/qpauseanimation.cpp index 654ba701da..5f8a8b3590 100644 --- a/src/corelib/animation/qpauseanimation.cpp +++ b/src/corelib/animation/qpauseanimation.cpp @@ -64,9 +64,6 @@ #include "qpauseanimation.h" #include "qabstractanimation_p.h" - -#ifndef QT_NO_ANIMATION - QT_BEGIN_NAMESPACE class QPauseAnimationPrivate : public QAbstractAnimationPrivate @@ -150,5 +147,3 @@ void QPauseAnimation::updateCurrentTime(int) QT_END_NAMESPACE #include "moc_qpauseanimation.cpp" - -#endif //QT_NO_ANIMATION diff --git a/src/corelib/animation/qpauseanimation.h b/src/corelib/animation/qpauseanimation.h index e2095a39d6..6bdbeefdbd 100644 --- a/src/corelib/animation/qpauseanimation.h +++ b/src/corelib/animation/qpauseanimation.h @@ -42,10 +42,9 @@ #include <QtCore/qanimationgroup.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(animation); -#ifndef QT_NO_ANIMATION +QT_BEGIN_NAMESPACE class QPauseAnimationPrivate; @@ -70,8 +69,6 @@ private: Q_DECLARE_PRIVATE(QPauseAnimation) }; -#endif //QT_NO_ANIMATION - QT_END_NAMESPACE #endif // QPAUSEANIMATION_H diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp index 5ba2a1fa73..174121516b 100644 --- a/src/corelib/animation/qpropertyanimation.cpp +++ b/src/corelib/animation/qpropertyanimation.cpp @@ -93,8 +93,6 @@ #include <QtCore/QMutex> -#ifndef QT_NO_ANIMATION - QT_BEGIN_NAMESPACE void QPropertyAnimationPrivate::updateMetaProperty() @@ -315,5 +313,3 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State newState, #include "moc_qpropertyanimation.cpp" QT_END_NAMESPACE - -#endif //QT_NO_ANIMATION diff --git a/src/corelib/animation/qpropertyanimation.h b/src/corelib/animation/qpropertyanimation.h index 3270591d1d..a1caafcad5 100644 --- a/src/corelib/animation/qpropertyanimation.h +++ b/src/corelib/animation/qpropertyanimation.h @@ -42,10 +42,9 @@ #include <QtCore/qvariantanimation.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(animation); -#ifndef QT_NO_ANIMATION +QT_BEGIN_NAMESPACE class QPropertyAnimationPrivate; class Q_CORE_EXPORT QPropertyAnimation : public QVariantAnimation @@ -75,8 +74,6 @@ private: Q_DECLARE_PRIVATE(QPropertyAnimation) }; -#endif //QT_NO_ANIMATION - QT_END_NAMESPACE #endif // QPROPERTYANIMATION_H diff --git a/src/corelib/animation/qpropertyanimation_p.h b/src/corelib/animation/qpropertyanimation_p.h index cfb1f247e0..479762f573 100644 --- a/src/corelib/animation/qpropertyanimation_p.h +++ b/src/corelib/animation/qpropertyanimation_p.h @@ -55,7 +55,7 @@ #include "private/qvariantanimation_p.h" -#ifndef QT_NO_ANIMATION +QT_REQUIRE_CONFIG(animation); QT_BEGIN_NAMESPACE @@ -83,6 +83,4 @@ public: QT_END_NAMESPACE -#endif //QT_NO_ANIMATION - #endif //QPROPERTYANIMATION_P_H diff --git a/src/corelib/animation/qsequentialanimationgroup.cpp b/src/corelib/animation/qsequentialanimationgroup.cpp index f5f538337e..8af6b33722 100644 --- a/src/corelib/animation/qsequentialanimationgroup.cpp +++ b/src/corelib/animation/qsequentialanimationgroup.cpp @@ -83,8 +83,6 @@ #include <QtCore/qdebug.h> -#ifndef QT_NO_ANIMATION - QT_BEGIN_NAMESPACE typedef QList<QAbstractAnimation *>::ConstIterator AnimationListConstIt; @@ -582,5 +580,3 @@ void QSequentialAnimationGroupPrivate::animationRemoved(int index, QAbstractAnim QT_END_NAMESPACE #include "moc_qsequentialanimationgroup.cpp" - -#endif //QT_NO_ANIMATION diff --git a/src/corelib/animation/qsequentialanimationgroup.h b/src/corelib/animation/qsequentialanimationgroup.h index 1c8e67d256..a33ff07abf 100644 --- a/src/corelib/animation/qsequentialanimationgroup.h +++ b/src/corelib/animation/qsequentialanimationgroup.h @@ -42,10 +42,9 @@ #include <QtCore/qanimationgroup.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(animation); -#ifndef QT_NO_ANIMATION +QT_BEGIN_NAMESPACE class QPauseAnimation; class QSequentialAnimationGroupPrivate; @@ -82,8 +81,6 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_uncontrolledAnimationFinished()) }; -#endif //QT_NO_ANIMATION - QT_END_NAMESPACE #endif //QSEQUENTIALANIMATIONGROUP_H diff --git a/src/corelib/animation/qsequentialanimationgroup_p.h b/src/corelib/animation/qsequentialanimationgroup_p.h index e4f3d9c96a..88dac4f566 100644 --- a/src/corelib/animation/qsequentialanimationgroup_p.h +++ b/src/corelib/animation/qsequentialanimationgroup_p.h @@ -54,7 +54,7 @@ #include "qsequentialanimationgroup.h" #include "private/qanimationgroup_p.h" -#ifndef QT_NO_ANIMATION +QT_REQUIRE_CONFIG(animation); QT_BEGIN_NAMESPACE @@ -107,6 +107,4 @@ public: QT_END_NAMESPACE -#endif //QT_NO_ANIMATION - #endif //QSEQUENTIALANIMATIONGROUP_P_H diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index 3c90d71c7d..df533c5f4d 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -46,8 +46,6 @@ #include <algorithm> -#ifndef QT_NO_ANIMATION - QT_BEGIN_NAMESPACE /*! @@ -700,5 +698,3 @@ void QVariantAnimation::updateCurrentTime(int) QT_END_NAMESPACE #include "moc_qvariantanimation.cpp" - -#endif //QT_NO_ANIMATION diff --git a/src/corelib/animation/qvariantanimation.h b/src/corelib/animation/qvariantanimation.h index d6346e1706..e47fa14b1c 100644 --- a/src/corelib/animation/qvariantanimation.h +++ b/src/corelib/animation/qvariantanimation.h @@ -46,10 +46,9 @@ #include <QtCore/qvariant.h> #include <QtCore/qpair.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(animation); -#ifndef QT_NO_ANIMATION +QT_BEGIN_NAMESPACE class QVariantAnimationPrivate; class Q_CORE_EXPORT QVariantAnimation : public QAbstractAnimation @@ -116,8 +115,6 @@ void qRegisterAnimationInterpolator(QVariant (*func)(const T &from, const T &to, QVariantAnimation::registerInterpolator(reinterpret_cast<QVariantAnimation::Interpolator>(reinterpret_cast<void(*)()>(func)), qMetaTypeId<T>()); } -#endif //QT_NO_ANIMATION - QT_END_NAMESPACE #endif //QVARIANTANIMATION_H diff --git a/src/corelib/animation/qvariantanimation_p.h b/src/corelib/animation/qvariantanimation_p.h index 9f0f2e3030..57b59cf876 100644 --- a/src/corelib/animation/qvariantanimation_p.h +++ b/src/corelib/animation/qvariantanimation_p.h @@ -60,7 +60,7 @@ #include <type_traits> -#ifndef QT_NO_ANIMATION +QT_REQUIRE_CONFIG(animation); QT_BEGIN_NAMESPACE @@ -129,6 +129,4 @@ template<typename T > inline QVariant _q_interpolateVariant(const T &from, const QT_END_NAMESPACE -#endif //QT_NO_ANIMATION - #endif //QVARIANTANIMATION_P_H diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 7f62a6f1b0..1e4823f566 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -31,7 +31,7 @@ ANDROID_PERMISSIONS = \ # OpenBSD 6.0 will include environ in libc. freebsd|openbsd: QMAKE_LFLAGS_NOUNDEF = -include(animation/animation.pri) +qtConfig(animation): include(animation/animation.pri) include(global/global.pri) include(thread/thread.pri) include(tools/tools.pri) diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp index 272e681fb4..ebf33e120a 100644 --- a/src/corelib/statemachine/qabstracttransition.cpp +++ b/src/corelib/statemachine/qabstracttransition.cpp @@ -334,7 +334,7 @@ QStateMachine *QAbstractTransition::machine() const return d->machine(); } -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) /*! Adds the given \a animation to this transition. diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h index 9b35e0cdb6..18e12d3eb6 100644 --- a/src/corelib/statemachine/qabstracttransition.h +++ b/src/corelib/statemachine/qabstracttransition.h @@ -53,7 +53,7 @@ class QAbstractState; class QState; class QStateMachine; -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) class QAbstractAnimation; #endif @@ -86,7 +86,7 @@ public: QStateMachine *machine() const; -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) void addAnimation(QAbstractAnimation *animation); void removeAnimation(QAbstractAnimation *animation); QList<QAbstractAnimation*> animations() const; diff --git a/src/corelib/statemachine/qabstracttransition_p.h b/src/corelib/statemachine/qabstracttransition_p.h index e11514670e..663d777c75 100644 --- a/src/corelib/statemachine/qabstracttransition_p.h +++ b/src/corelib/statemachine/qabstracttransition_p.h @@ -85,7 +85,7 @@ public: QVector<QPointer<QAbstractState> > targetStates; QAbstractTransition::TransitionType transitionType; -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) QList<QAbstractAnimation*> animations; #endif }; diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 24734f99ac..7388d496d9 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -59,7 +59,7 @@ #include "qeventtransition_p.h" #endif -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) #include "qpropertyanimation.h" #include "qanimationgroup.h" #include <private/qvariantanimation_p.h> @@ -167,7 +167,7 @@ QT_BEGIN_NAMESPACE \sa start(), stop(), started(), stopped(), runningChanged() */ -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) /*! \property QStateMachine::animated @@ -401,7 +401,7 @@ QStateMachinePrivate::QStateMachinePrivate() error = QStateMachine::NoError; globalRestorePolicy = QState::DontRestoreProperties; signalEventGenerator = 0; -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) animated = true; #endif } @@ -700,12 +700,12 @@ void QStateMachinePrivate::microstep(QEvent *event, const QList<QAbstractTransit executeTransitionContent(event, enabledTransitions); -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) QList<QAbstractAnimation *> selectedAnimations = selectAnimations(enabledTransitions); #endif enterStates(event, exitedStates, enteredStates, statesForDefaultEntry, assignmentsForEnteredStates -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) , selectedAnimations #endif ); @@ -827,7 +827,7 @@ void QStateMachinePrivate::exitStates(QEvent *event, const QList<QAbstractState* #endif QAbstractStatePrivate::get(s)->callOnExit(event); -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) terminateActiveAnimations(s, assignmentsForEnteredStates); #else Q_UNUSED(assignmentsForEnteredStates); @@ -942,7 +942,7 @@ void QStateMachinePrivate::enterStates(QEvent *event, const QList<QAbstractState const QList<QAbstractState*> &statesToEnter_sorted, const QSet<QAbstractState*> &statesForDefaultEntry, QHash<QAbstractState*, QVector<QPropertyAssignment> > &propertyAssignmentsForState -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) , const QList<QAbstractAnimation *> &selectedAnimations #endif ) @@ -958,7 +958,7 @@ void QStateMachinePrivate::enterStates(QEvent *event, const QList<QAbstractState configuration.insert(s); registerTransitions(s); -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) initializeAnimations(s, selectedAnimations, exitedStates_sorted, propertyAssignmentsForState); #endif @@ -1002,7 +1002,7 @@ void QStateMachinePrivate::enterStates(QEvent *event, const QList<QAbstractState { QState *ss = toStandardState(s); if (ss - #ifndef QT_NO_ANIMATION + #if QT_CONFIG(animation) && !animationsForState.contains(s) #endif ) @@ -1513,7 +1513,7 @@ void QStateMachinePrivate::setError(QStateMachine::Error errorCode, QAbstractSta } } -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) QStateMachinePrivate::InitializeAnimationResult QStateMachinePrivate::initializeAnimation(QAbstractAnimation *abstractAnimation, @@ -1710,7 +1710,7 @@ void QStateMachinePrivate::initializeAnimations(QAbstractState *state, const QLi } } -#endif // !QT_NO_ANIMATION +#endif // animation QAbstractTransition *QStateMachinePrivate::createInitialTransition() const { @@ -1814,7 +1814,7 @@ void QStateMachinePrivate::_q_start() QHash<RestorableId, QVariant> pendingRestorables; QHash<QAbstractState*, QVector<QPropertyAssignment> > assignmentsForEnteredStates = computePropertyAssignments(enteredStates, pendingRestorables); -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) QList<QAbstractAnimation*> selectedAnimations = selectAnimations(transitions); #endif // enterStates() will set stopProcessingReason to Finished if a final @@ -1822,7 +1822,7 @@ void QStateMachinePrivate::_q_start() stopProcessingReason = EventQueueEmpty; enterStates(&nullEvent, exitedStates, enteredStates, statesForDefaultEntry, assignmentsForEnteredStates -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) , selectedAnimations #endif ); @@ -2957,7 +2957,7 @@ void QStateMachine::onExit(QEvent *event) QState::onExit(event); } -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) /*! Returns whether animations are enabled for this state machine. @@ -3004,7 +3004,7 @@ void QStateMachine::removeDefaultAnimation(QAbstractAnimation *animation) d->defaultAnimations.removeAll(animation); } -#endif // QT_NO_ANIMATION +#endif // animation // Begin moc-generated code -- modify carefully (check "HAND EDIT" parts)! diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index fd90b86fd5..e520285437 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -60,7 +60,7 @@ class Q_CORE_EXPORT QStateMachine : public QState Q_PROPERTY(QString errorString READ errorString) Q_PROPERTY(QState::RestorePolicy globalRestorePolicy READ globalRestorePolicy WRITE setGlobalRestorePolicy) Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged) -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) Q_PROPERTY(bool animated READ isAnimated WRITE setAnimated) #endif public: @@ -122,14 +122,14 @@ public: bool isRunning() const; -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) bool isAnimated() const; void setAnimated(bool enabled); void addDefaultAnimation(QAbstractAnimation *animation); QList<QAbstractAnimation *> defaultAnimations() const; void removeDefaultAnimation(QAbstractAnimation *animation); -#endif // QT_NO_ANIMATION +#endif // animation QState::RestorePolicy globalRestorePolicy() const; void setGlobalRestorePolicy(QState::RestorePolicy restorePolicy); @@ -175,7 +175,7 @@ private: Q_DECLARE_PRIVATE(QStateMachine) Q_PRIVATE_SLOT(d_func(), void _q_start()) Q_PRIVATE_SLOT(d_func(), void _q_process()) -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) Q_PRIVATE_SLOT(d_func(), void _q_animationFinished()) #endif Q_PRIVATE_SLOT(d_func(), void _q_startDelayedEventTimer(int, int)) diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h index c28b162305..f3366ca5f7 100644 --- a/src/corelib/statemachine/qstatemachine_p.h +++ b/src/corelib/statemachine/qstatemachine_p.h @@ -297,7 +297,7 @@ public: void initializeAnimations(QAbstractState *state, const QList<QAbstractAnimation*> &selectedAnimations, const QList<QAbstractState *> &exitedStates_sorted, QHash<QAbstractState *, QVector<QPropertyAssignment> > &assignmentsForEnteredStates); -#endif // QT_NO_ANIMATION +#endif // animation QSignalEventGenerator *signalEventGenerator; |