diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-03 15:29:58 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2009-11-03 15:29:58 (GMT) |
| commit | bf2ba79d1cdc0d5347d394a892bee287bc84fb81 (patch) | |
| tree | b6032f84dbad1fc1c4dea3c66a943aae5e560c84 /src/corelib/statemachine/qstatemachine_p.h | |
| parent | a4e7db378ecd11bc858f76beb33c56ccebef6308 (diff) | |
| parent | ddd1c40712a6a50b0574341087118fe4db67c3b2 (diff) | |
| download | Qt-bf2ba79d1cdc0d5347d394a892bee287bc84fb81.zip Qt-bf2ba79d1cdc0d5347d394a892bee287bc84fb81.tar.gz Qt-bf2ba79d1cdc0d5347d394a892bee287bc84fb81.tar.bz2 | |
Merge branch 'statemachine-api-changes' into 4.6
Conflicts:
doc/src/frameworks-technologies/statemachine.qdoc
src/corelib/statemachine/qstatemachine.cpp
Diffstat (limited to 'src/corelib/statemachine/qstatemachine_p.h')
| -rw-r--r-- | src/corelib/statemachine/qstatemachine_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h index 01c9361..aad5c67 100644 --- a/src/corelib/statemachine/qstatemachine_p.h +++ b/src/corelib/statemachine/qstatemachine_p.h @@ -207,7 +207,7 @@ public: QSet<QAbstractState *> pendingErrorStatesForDefaultEntry; #ifndef QT_NO_ANIMATION - bool animationsEnabled; + bool animated; QPair<QList<QAbstractAnimation*>, QList<QAbstractAnimation*> > initializeAnimation(QAbstractAnimation *abstractAnimation, |