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 /examples | |
| 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 'examples')
| -rw-r--r-- | examples/animation/stickman/lifecycle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/animation/stickman/lifecycle.cpp b/examples/animation/stickman/lifecycle.cpp index 250fb85..1b6f9cd 100644 --- a/examples/animation/stickman/lifecycle.cpp +++ b/examples/animation/stickman/lifecycle.cpp @@ -194,14 +194,14 @@ QState *LifeCycle::makeState(QState *parentState, const QString &animationFileNa topLevel->setInitialState(frameState); else //! [2] - previousState->addTransition(previousState, SIGNAL(polished()), frameState); + previousState->addTransition(previousState, SIGNAL(propertiesAssigned()), frameState); //! [2] previousState = frameState; } // Loop - previousState->addTransition(previousState, SIGNAL(polished()), topLevel->initialState()); + previousState->addTransition(previousState, SIGNAL(propertiesAssigned()), topLevel->initialState()); return topLevel; |