From ca7f67e82b380e1b45a29cb2d2982bfe5e773d4a Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <tasuku.suzuki@qt.io>
Date: Sat, 14 Jan 2017 13:20:30 +0900
Subject: Fix build without feature.animation

Change-Id: Ia1b9ae3a35cbc73d0bbf27db234d0cd120d0b601
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/corelib/statemachine/qstatemachine_p.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/corelib')

diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h
index 9418813afd..c28b162305 100644
--- a/src/corelib/statemachine/qstatemachine_p.h
+++ b/src/corelib/statemachine/qstatemachine_p.h
@@ -79,7 +79,7 @@ class QFinalState;
 class QHistoryState;
 class QState;
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
 class QAbstractAnimation;
 #endif
 
@@ -123,7 +123,7 @@ public:
     // private slots
     void _q_start();
     void _q_process();
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     void _q_animationFinished();
 #endif
     void _q_startDelayedEventTimer(int id, int delay);
@@ -152,7 +152,7 @@ public:
                              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
                      );
@@ -264,7 +264,7 @@ public:
     QSet<QAbstractState *> pendingErrorStates;
     QSet<QAbstractState *> pendingErrorStatesForDefaultEntry;
 
-#ifndef QT_NO_ANIMATION
+#if QT_CONFIG(animation)
     bool animated;
 
     struct InitializeAnimationResult {
@@ -326,7 +326,9 @@ public:
 
     static const Handler *handler;
 };
+#if QT_CONFIG(animation)
 Q_DECLARE_SHARED(QStateMachinePrivate::InitializeAnimationResult)
+#endif
 
 Q_CORE_EXPORT const QStateMachinePrivate::Handler *qcoreStateMachineHandler();
 
-- 
cgit v1.2.3