Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.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);