diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-04-24 07:13:27 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-04-24 07:13:27 (GMT) |
| commit | 221ec8dae1b247d5f8fb03d947d13cb6541a5805 (patch) | |
| tree | 64c17a3b5e1e4b793300472ce43b4ea359505005 | |
| parent | ad1441fcb1c66ddafd890c1aa22a631d12c4ee0d (diff) | |
| parent | 04ce953e61acf5a73826b6207cf8bf2cdfce8f92 (diff) | |
| download | Qt-221ec8dae1b247d5f8fb03d947d13cb6541a5805.zip Qt-221ec8dae1b247d5f8fb03d947d13cb6541a5805.tar.gz Qt-221ec8dae1b247d5f8fb03d947d13cb6541a5805.tar.bz2 | |
Merge branch 'kinetic-animations' into kinetic-statemachine
| -rw-r--r-- | bin/snapshot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bin/snapshot b/bin/snapshot index fa9a2ac..783d15c 100644 --- a/bin/snapshot +++ b/bin/snapshot @@ -76,9 +76,9 @@ my @files = ( "corelib/statemachine/qstatemachine.h", "corelib/statemachine/qstatemachine_p.h", "corelib/statemachine/qstate_p.h", - "corelib/statemachine/qtransition.cpp", - "corelib/statemachine/qtransition.h", - "corelib/statemachine/qtransition_p.h", + "corelib/statemachine/qactiontransition.cpp", + "corelib/statemachine/qactiontransition.h", + "corelib/statemachine/qactiontransition_p.h", "gui/statemachine/qkeyeventtransition.h", "gui/statemachine/qkeyeventtransition.cpp", "gui/statemachine/qbasickeyeventtransition.cpp", @@ -264,7 +264,7 @@ sub copyFile $filecontents =~s/QStateFinishedEvent/QtStateFinishedEvent/g; $filecontents =~s/QStateFinishedTransition/QtStateFinishedTransition/g; $filecontents =~s/QStateMachine/QtStateMachine/g; - $filecontents =~s/QTransition/QtTransition/g; + $filecontents =~s/QActionTransition/QtActionTransition/g; $filecontents =~s/QMouseEventTransition/QtMouseEventTransition/g; $filecontents =~s/QKeyEventTransition/QtKeyEventTransition/g; $filecontents =~s/QGraphicsWidget/QtGraphicsWidget/g; |