summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-11-04 06:27:15 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-11-04 06:27:15 (GMT)
commit867be3fd7a2017377e8ae5cc3ab789b3b01733bd (patch)
tree7e8ae170237570ea391807db70f2f3c76c612804 /examples
parent53e486c0e8d23d535711debdd3a71c8ef2211c58 (diff)
parentce14a4a0bc290018e597d0a4f8e9f279c63d4cc0 (diff)
downloadQt-867be3fd7a2017377e8ae5cc3ab789b3b01733bd.zip
Qt-867be3fd7a2017377e8ae5cc3ab789b3b01733bd.tar.gz
Qt-867be3fd7a2017377e8ae5cc3ab789b3b01733bd.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6
Diffstat (limited to 'examples')
-rw-r--r--examples/animation/stickman/lifecycle.cpp4
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;