diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-07-29 06:41:41 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-07-29 06:41:41 (GMT) |
| commit | bccbd58365b1a4dfce32701254145ba124270665 (patch) | |
| tree | 7f03169fe44a0ff8a1687d84d8f61c3c934561f0 /demos/sub-attaq/submarine_p.h | |
| parent | c50124a15be1e564190f4bb115e2fc67a4c82036 (diff) | |
| parent | a45fe18569be1fc91e26f6e58d2f16bc8c6958de (diff) | |
| download | Qt-bccbd58365b1a4dfce32701254145ba124270665.zip Qt-bccbd58365b1a4dfce32701254145ba124270665.tar.gz Qt-bccbd58365b1a4dfce32701254145ba124270665.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'demos/sub-attaq/submarine_p.h')
| -rw-r--r-- | demos/sub-attaq/submarine_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/demos/sub-attaq/submarine_p.h b/demos/sub-attaq/submarine_p.h index e8df877..c04b25b 100644 --- a/demos/sub-attaq/submarine_p.h +++ b/demos/sub-attaq/submarine_p.h @@ -109,7 +109,7 @@ class ReturnState : public QAnimationState public: ReturnState(SubMarine *submarine, QState *parent = 0) : QAnimationState(parent) { - returnAnimation = new QPropertyAnimation(submarine, "yRotation"); + returnAnimation = new QPropertyAnimation(submarine->rotation3d(), "angle"); AnimationManager::self()->registerAnimation(returnAnimation); setAnimation(returnAnimation); this->submarine = submarine; @@ -119,7 +119,7 @@ protected: void onEntry(QEvent *e) { returnAnimation->stop(); - returnAnimation->setStartValue(submarine->yRotation()); + returnAnimation->setStartValue(submarine->rotation3d()->angle()); returnAnimation->setEndValue(submarine->currentDirection() == SubMarine::Right ? 360. : 180.); returnAnimation->setDuration(500); QAnimationState::onEntry(e); |