qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build without feature.animation 

Change-Id: Ia1b9ae3a35cbc73d0bbf27db234d0cd120d0b601
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Tasuku Suzuki 2017-01-14 13:20:30 +09:00
parent 9ad4e651d2
commit ca7f67e82b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/statemachine/qstatemachine_p.h
View File

@ -79,7 +79,7 @@ class QFinalState;
class QHistoryState; class QHistoryState;
class QState; class QState;
#ifndef QT_NO_ANIMATION #if QT_CONFIG(animation)
class QAbstractAnimation; class QAbstractAnimation;
#endif #endif
@ -123,7 +123,7 @@ public:
// private slots // private slots
void _q_start(); void _q_start();
void _q_process(); void _q_process();
#ifndef QT_NO_ANIMATION #if QT_CONFIG(animation)
void _q_animationFinished(); void _q_animationFinished();
#endif #endif
void _q_startDelayedEventTimer(int id, int delay); void _q_startDelayedEventTimer(int id, int delay);
@ -152,7 +152,7 @@ public:
const QList<QAbstractState*> &statesToEnter_sorted, const QList<QAbstractState*> &statesToEnter_sorted,
const QSet<QAbstractState*> &statesForDefaultEntry, const QSet<QAbstractState*> &statesForDefaultEntry,
QHash<QAbstractState *, QVector<QPropertyAssignment> > &propertyAssignmentsForState QHash<QAbstractState *, QVector<QPropertyAssignment> > &propertyAssignmentsForState
#ifndef QT_NO_ANIMATION #if QT_CONFIG(animation)
, const QList<QAbstractAnimation*> &selectedAnimations , const QList<QAbstractAnimation*> &selectedAnimations
#endif #endif
); );
@ -264,7 +264,7 @@ public:
QSet<QAbstractState *> pendingErrorStates; QSet<QAbstractState *> pendingErrorStates;
QSet<QAbstractState *> pendingErrorStatesForDefaultEntry; QSet<QAbstractState *> pendingErrorStatesForDefaultEntry;
#ifndef QT_NO_ANIMATION #if QT_CONFIG(animation)
bool animated; bool animated;
struct InitializeAnimationResult { struct InitializeAnimationResult {
@ -326,7 +326,9 @@ public:
static const Handler *handler; static const Handler *handler;
}; };
#if QT_CONFIG(animation)
Q_DECLARE_SHARED(QStateMachinePrivate::InitializeAnimationResult) Q_DECLARE_SHARED(QStateMachinePrivate::InitializeAnimationResult)
#endif
Q_CORE_EXPORT const QStateMachinePrivate::Handler *qcoreStateMachineHandler(); Q_CORE_EXPORT const QStateMachinePrivate::Handler *qcoreStateMachineHandler();