Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removing QT_EXPERIMENTAL_SOLUTION from the animation api | Leonardo Sobral Cunha | 2009-05-19 | 13 | -84/+10 |
| | |||||
* | Removed unused method from QVariantAnimationPrivate | Leonardo Sobral Cunha | 2009-05-19 | 2 | -7/+0 |
| | |||||
* | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-05-19 | 2 | -46/+46 |
|\ | | | | | | | into kinetic-animations | ||||
| * | Removed memory leak in QEasingCurvePrivate | Leonardo Sobral Cunha | 2009-05-19 | 1 | -0/+1 |
| | | | | | | | | Task-number: 253898 | ||||
| * | Whitespace cleanup in QEasingCurve | Leonardo Sobral Cunha | 2009-05-19 | 1 | -45/+44 |
| | | |||||
| * | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-19 | 6 | -44/+54 |
| |\ | |||||
| * | | doc: Update signature of eventTest() in documentation | Eskil Abrahamsen Blomfeldt | 2009-05-15 | 1 | -1/+1 |
| | | | | | | | | | | | | eventTest() is now non-const. | ||||
* | | | Doc: Added information about ownership of animations. | David Boddie | 2009-05-19 | 1 | -7/+14 |
| |/ |/| | | | | | Reviewed-by: Thierry Bastian | ||||
* | | Avoid resetting the QVariantAnimation::currentValue when changing state | Leonardo Sobral Cunha | 2009-05-15 | 1 | -2/+0 |
| | | | | | | | | Reviewed-by: janarve | ||||
* | | General refactors in QVariantAnimation | Leonardo Sobral Cunha | 2009-05-15 | 2 | -27/+35 |
| | | | | | | | | Reviewed-by: janarve | ||||
* | | Update current value on QVariantAnimation::setKeyValues | Leonardo Sobral Cunha | 2009-05-15 | 1 | -0/+1 |
| | | | | | | | | | | | | | | The current value was udpated on setKeyValueAt, but not on setKeyValues and this was leading to a semantic inconsistency. Reviewed-by: janarve | ||||
* | | Avoid interpolating if we have less than 2 key values in QVariantAnimation | Leonardo Sobral Cunha | 2009-05-15 | 1 | -4/+10 |
| | | | | | | | | | | | | | | If we have less than 2 key values, we should neither try to interpolate nor set the current value. Reviewed-by: janarve | ||||
* | | Indentation and whitespace fixes in animation api | Leonardo Sobral Cunha | 2009-05-15 | 5 | -13/+10 |
|/ | |||||
* | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-14 | 3 | -1/+5 |
|\ | |||||
| * | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-05-13 | 19 | -295/+115 |
| |\ | | | | | | | | | | into kinetic-animations | ||||
| | * | correctly handle multiple event transitions for same (object,event) | Kent Hansen | 2009-05-13 | 2 | -7/+14 |
| | | | | | | | | | | | | | | | | | | The event filter was not removed at the right time. We now store the number of active event transitions for a particular (object,event) and only remove the filtering when the count drops to zero. | ||||
| * | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-05-12 | 238 | -3127/+6257 |
| |\ \ | | | | | | | | | | | | | into kinetic-animations | ||||
| * \ \ | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-04-29 | 6 | -131/+171 |
| |\ \ \ | | | | | | | | | | | | | | | | into kinetic-animations | ||||
| * | | | | Merged local changes. | David Boddie | 2009-04-29 | 3 | -1/+5 |
| | | | | | |||||
* | | | | | Make QAbstractTransition::eventTest() non-const | Eskil Abrahamsen Blomfeldt | 2009-05-14 | 17 | -18/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | We decided to remove the const of the eventTest() since some transitions have dynamic conditions and need to update when eventTest() is called. | ||||
* | | | | | correctly handle multiple event transitions for same (object,event) | Kent Hansen | 2009-05-13 | 2 | -7/+14 |
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | The event filter was not removed at the right time. We now store the number of active event transitions for a particular (object,event) and only remove the filtering when the count drops to zero. | ||||
* | | | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-13 | 1 | -55/+85 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | Geir Vattekar | 2009-05-13 | 5 | -16/+24 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | into kinetic-animations | ||||
| * | | | | Doc: Work on QStateMachine class description | Geir Vattekar | 2009-05-13 | 1 | -55/+85 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kent Hansen | ||||
| * | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations | Alexis Menard | 2009-05-12 | 202 | -2834/+5597 |
| |\ \ \ \ | |||||
* | | | | | | kill the QT_STATEMACHINE_SOLUTION define | Kent Hansen | 2009-05-13 | 19 | -233/+16 |
| |_|/ / / |/| | | | | | | | | | | | | | | We won't release another Qt Solution, so the define is no longer needed. | ||||
* | | | | | correctly handle multiple signal transitions for same (object,signal) | Kent Hansen | 2009-05-12 | 3 | -15/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The signal was not disconnected at the right time. We now store the number of active signal transitions for a particular (object,signal) and only disconnect when the count drops to zero. | ||||
* | | | | | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | Alexis Menard | 2009-05-12 | 69 | -3370/+1729 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-statemachine Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| * | | | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-12 | 3 | -7/+65 |
| |\ \ \ \ | |||||
| | * | | | | Doc: Work on QPauseAnimation | Geir Vattekar | 2009-05-11 | 1 | -0/+16 |
| | | | | | | |||||
| | * | | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | Geir Vattekar | 2009-05-11 | 5 | -12/+74 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into kinetic-animations | ||||
| | * | | | | | Doc: Work on QParallelAnimationGroup and QSequentialAnimationGroup | Geir Vattekar | 2009-05-11 | 2 | -7/+49 |
| | | | | | | | |||||
| * | | | | | | Fixes crash when calling QState::setErrorState() with null pointer | Eskil Abrahamsen Blomfeldt | 2009-05-12 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | When the state is null, it isn't the root state. | ||||
| * | | | | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-08 | 4 | -44/+114 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Doc: Work on QAnimationGroup class description. | Geir Vattekar | 2009-05-08 | 1 | -12/+40 |
| | | | | | | |||||
| | * | | | | Correct spelling. setConsitentTiming -> setConsistentTiming | Michael Brasser | 2009-05-08 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | Geir Vattekar | 2009-05-07 | 30 | -145/+272 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into kinetic-animations | ||||
| | | * | | | | change the API of private class for QAbstractAnimation to allow setting | Thierry Bastian | 2009-05-07 | 2 | -14/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the timer interval. We also export the private clas so it can be used by other modules | ||||
| | * | | | | | Doc: Work on QPropertyAnimation class description | Geir Vattekar | 2009-05-07 | 1 | -18/+39 |
| | | | | | | | |||||
| * | | | | | | gracefully handle deletion of transition's target state | Kent Hansen | 2009-05-08 | 3 | -4/+17 |
| | | | | | | | |||||
| * | | | | | | get rid of warnings | Kent Hansen | 2009-05-08 | 1 | -2/+0 |
| | | | | | | | |||||
| * | | | | | | make sure connections and event filters are removed when state machine halts | Kent Hansen | 2009-05-08 | 2 | -0/+17 |
| | | | | | | | |||||
| * | | | | | | don't create transition to null state | Kent Hansen | 2009-05-08 | 1 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | don't add signal transition if target is null or signal doesn't exist | Kent Hansen | 2009-05-07 | 1 | -0/+9 |
| | | | | | | | |||||
| * | | | | | | Make it impossible to have root state as source or target of transition or ↵ | Eskil Abrahamsen Blomfeldt | 2009-05-07 | 3 | -4/+26 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as error state Since the root state has no ancestors, it cannot be source or target in transitions since there will be no LCA for the transition, which is required for the algorithm of enterStates and exitStates. In SCXML the root state cannot be target or source of a transition. By the same logic, it cannot be an error state. The root state will always have a valid machine, since it's added to a machine immediately, which makes this code possible. | ||||
| * | | | | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-07 | 3 | -3/+18 |
| |\ \ \ \ \ | |||||
| | * | | | | | Addeed a warning if one is trying to animate a property that's not part | Thierry Bastian | 2009-05-07 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the object Task-number: 251763 | ||||
| | * | | | | | Provide a way in private API to have a consistent timer for animations. | Thierry Bastian | 2009-05-07 | 2 | -3/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for better testing because from now on we can rely on the results to be always the same and not rely on timer accuracy any more. Task-number: 251764 Reviewed-by: leo | ||||
| * | | | | | | add QStateMachine::isRunning() | Kent Hansen | 2009-05-07 | 2 | -0/+13 |
| | | | | | | | |||||
| * | | | | | | store top-level animation in dedicated variable | Kent Hansen | 2009-05-07 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The animation itself is used by subsequent code, so we mustn't change it. |