diff options
| author | Geir Vattekar <geir.vattekar@trolltech.com> | 2009-05-07 13:56:50 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@trolltech.com> | 2009-05-07 13:56:50 (GMT) |
| commit | 90057dabcb99759bcb42c1c21db7151c69d98706 (patch) | |
| tree | c2215154650ea6ec0d9ad13cb4271cca55a62449 /examples/animation/sub-attaq/qanimationstate.h | |
| parent | 2a410483a29c0e821588fd94c3179f7ab775ebbf (diff) | |
| parent | 8b57ae82ef507db1912a35fbe5d60f2cc3668cdb (diff) | |
| download | Qt-90057dabcb99759bcb42c1c21db7151c69d98706.zip Qt-90057dabcb99759bcb42c1c21db7151c69d98706.tar.gz Qt-90057dabcb99759bcb42c1c21db7151c69d98706.tar.bz2 | |
Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-animations
Diffstat (limited to 'examples/animation/sub-attaq/qanimationstate.h')
| -rw-r--r-- | examples/animation/sub-attaq/qanimationstate.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/animation/sub-attaq/qanimationstate.h b/examples/animation/sub-attaq/qanimationstate.h index ddf5681..88c0a6d 100644 --- a/examples/animation/sub-attaq/qanimationstate.h +++ b/examples/animation/sub-attaq/qanimationstate.h @@ -74,8 +74,8 @@ Q_SIGNALS: void animationFinished(); protected: - void onEntry(); - void onExit(); + void onEntry(QEvent *); + void onExit(QEvent *); bool event(QEvent *e); private: |