summaryrefslogtreecommitdiffstats
path: root/demos/sub-attaq/torpedo.cpp
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-19 16:35:06 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-11-19 16:35:06 (GMT)
commit901b0391d15ab72830fcfd73048eeff03fb9ed07 (patch)
treecf5f2f2eab83301bf08952426f25eb54a90e9ac4 /demos/sub-attaq/torpedo.cpp
parentbb4e301ce6762ab300618c579bd65ea1ee17dc2d (diff)
parent34044853d4315309920a481a585f96ba7b3fb140 (diff)
downloadQt-901b0391d15ab72830fcfd73048eeff03fb9ed07.zip
Qt-901b0391d15ab72830fcfd73048eeff03fb9ed07.tar.gz
Qt-901b0391d15ab72830fcfd73048eeff03fb9ed07.tar.bz2
Merge remote branch 'mainline/4.6' into 4.6
Diffstat (limited to 'demos/sub-attaq/torpedo.cpp')
-rw-r--r--demos/sub-attaq/torpedo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/sub-attaq/torpedo.cpp b/demos/sub-attaq/torpedo.cpp
index 95f88e6..1f4ce16 100644
--- a/demos/sub-attaq/torpedo.cpp
+++ b/demos/sub-attaq/torpedo.cpp
@@ -64,7 +64,7 @@ void Torpedo::launch()
launchAnimation->setEndValue(QPointF(x(),qobject_cast<GraphicsScene *>(scene())->sealLevel() - 15));
launchAnimation->setEasingCurve(QEasingCurve::InQuad);
launchAnimation->setDuration(y()/currentSpeed*10);
- connect(launchAnimation,SIGNAL(valueChanged(const QVariant &)),this,SLOT(onAnimationLaunchValueChanged(const QVariant &)));
+ connect(launchAnimation,SIGNAL(valueChanged(QVariant)),this,SLOT(onAnimationLaunchValueChanged(QVariant)));
connect(this,SIGNAL(torpedoExploded()), launchAnimation, SLOT(stop()));
//We setup the state machine of the torpedo