diff options
author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-10 13:48:20 (GMT) |
---|---|---|
committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-10 13:48:20 (GMT) |
commit | 9c1639b401a87b9a93d07f1b0ad9a18b19bf7cdc (patch) | |
tree | dac8e3891720babeaf1c8aae14245a062f3d4610 /demos/sub-attaq/boat.cpp | |
parent | 56077c71a771e0e92ead2244df51a85669529274 (diff) | |
parent | b6be1c595fa67ec034f04c8a93e57e593ceb97aa (diff) | |
download | Qt-9c1639b401a87b9a93d07f1b0ad9a18b19bf7cdc.zip Qt-9c1639b401a87b9a93d07f1b0ad9a18b19bf7cdc.tar.gz Qt-9c1639b401a87b9a93d07f1b0ad9a18b19bf7cdc.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6
Diffstat (limited to 'demos/sub-attaq/boat.cpp')
-rw-r--r-- | demos/sub-attaq/boat.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/demos/sub-attaq/boat.cpp b/demos/sub-attaq/boat.cpp index 0ad31b1..6fed9a9 100644 --- a/demos/sub-attaq/boat.cpp +++ b/demos/sub-attaq/boat.cpp @@ -62,7 +62,7 @@ static QAbstractAnimation *setupDestroyAnimation(Boat *boat) for (int i = 1; i <= 4; i++) { PixmapItem *step = new PixmapItem(QString("explosion/boat/step%1").arg(i),GraphicsScene::Big, boat); step->setZValue(6); - step->setOpacity(0); + step->setOpacity(0); //fade-in QPropertyAnimation *anim = new QPropertyAnimation(step, "opacity"); @@ -92,10 +92,10 @@ Boat::Boat() : PixmapItem(QString("boat"), GraphicsScene::Big), //The movement animation used to animate the boat movementAnimation = new QPropertyAnimation(this, "pos"); - //The movement animation used to animate the boat + //The destroy animation used to explode the boat destroyAnimation = setupDestroyAnimation(this); - //We setup the state machien of the boat + //We setup the state machine of the boat machine = new QStateMachine(this); QState *moving = new QState(machine); StopState *stopState = new StopState(this, moving); |