diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-22 04:52:44 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-22 04:52:44 (GMT) |
| commit | f2c5ea07b2ed5f96bd32f9a1d71ec9613c240fa6 (patch) | |
| tree | 390ae15f24cd5b6af85b9bc74c39fd90ba03144b /bin | |
| parent | 1139eb432a18d556efb4ecfc079e82c2e2093b96 (diff) | |
| parent | 3f39c3380f97339a1ffb9d13d7b184a8315d3821 (diff) | |
| download | Qt-f2c5ea07b2ed5f96bd32f9a1d71ec9613c240fa6.zip Qt-f2c5ea07b2ed5f96bd32f9a1d71ec9613c240fa6.tar.gz Qt-f2c5ea07b2ed5f96bd32f9a1d71ec9613c240fa6.tar.bz2 | |
Merge branch 'kinetic-animations' of ../../qt/kinetic into kinetic-declarativeui
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/snapshot | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/bin/snapshot b/bin/snapshot index 8cf3be2..783d15c 100644 --- a/bin/snapshot +++ b/bin/snapshot @@ -39,6 +39,7 @@ my @files = ( "corelib/animation/qsequentialanimationgroup.cpp", "corelib/animation/qsequentialanimationgroup.h", "corelib/animation/qsequentialanimationgroup_p.h", + "gui/animation/qguivariantanimation.cpp", "corelib/statemachine/statemachine.pri", "corelib/statemachine/qabstractstate.cpp", "corelib/statemachine/qabstractstate.h", @@ -49,8 +50,6 @@ my @files = ( "corelib/statemachine/qactionstate.h", "corelib/statemachine/qactionstate_p.h", "corelib/statemachine/qactionstate.cpp", - "corelib/statemachine/qanimationstate.cpp", - "corelib/statemachine/qanimationstate.h", "corelib/statemachine/qboundevent_p.h", "corelib/statemachine/qeventtransition.cpp", "corelib/statemachine/qeventtransition.h", @@ -77,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", @@ -144,7 +143,6 @@ my %animation_examples = ( "bomb.cpp", "bomb.h", "custompropertyanimation.h", - "custompropertyanimation_p.h", "custompropertyanimation.cpp", "graphicsscene.cpp", "graphicsscene.h", @@ -254,7 +252,6 @@ sub copyFile $filecontents =~s/QAbstractStateGroup/QtAbstractStateGroup/g; $filecontents =~s/QAbstractTransition/QtAbstractTransition/g; $filecontents =~s/QActionState/QtActionState/g; - $filecontents =~s/QAnimationState/QtAnimationState/g; $filecontents =~s/QEventTransition/QtEventTransition/g; $filecontents =~s/QFinalState/QtFinalState/g; $filecontents =~s/QHistoryState/QtHistoryState/g; @@ -263,12 +260,11 @@ sub copyFile $filecontents =~s/QSignalTransition/QtSignalTransition/g; $filecontents =~s/QState/QtState/g; $filecontents =~s/QStateAction/QtStateAction/g; - $filecontents =~s/QStateSetPropertyAction/QtStateSetPropertyAction/g; $filecontents =~s/QStateInvokeMethodAction/QtStateInvokeMethodAction/g; $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; |