summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-143-1/+5
|\
| * Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-05-1319-295/+115
| |\ | | | | | | | | | into kinetic-animations
| | * correctly handle multiple event transitions for same (object,event)Kent Hansen2009-05-132-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 Boddie2009-05-12238-3127/+6257
| |\ \ | | | | | | | | | | | | into kinetic-animations
| * \ \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-04-296-131/+171
| |\ \ \ | | | | | | | | | | | | | | | into kinetic-animations
| * | | | Merged local changes.David Boddie2009-04-293-1/+5
| | | | |
* | | | | Make QAbstractTransition::eventTest() non-constEskil Abrahamsen Blomfeldt2009-05-1417-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 Hansen2009-05-132-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-statemachineKent Hansen2009-05-131-55/+85
|\ \ \ \
| * \ \ \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Geir Vattekar2009-05-135-16/+24
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | into kinetic-animations
| * | | | Doc: Work on QStateMachine class descriptionGeir Vattekar2009-05-131-55/+85
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Kent Hansen
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-05-12202-2834/+5597
| |\ \ \ \
* | | | | | kill the QT_STATEMACHINE_SOLUTION defineKent Hansen2009-05-1319-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 Hansen2009-05-123-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 Menard2009-05-1269-3370/+1729
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-statemachine Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-123-7/+65
| |\ \ \ \
| | * | | | Doc: Work on QPauseAnimationGeir Vattekar2009-05-111-0/+16
| | | | | |
| | * | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Geir Vattekar2009-05-115-12/+74
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into kinetic-animations
| | * | | | | Doc: Work on QParallelAnimationGroup and QSequentialAnimationGroupGeir Vattekar2009-05-112-7/+49
| | | | | | |
| * | | | | | Fixes crash when calling QState::setErrorState() with null pointerEskil Abrahamsen Blomfeldt2009-05-121-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | When the state is null, it isn't the root state.
| * | | | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-084-44/+114
| |\ \ \ \ \ | | |/ / / /
| | * | | | Doc: Work on QAnimationGroup class description.Geir Vattekar2009-05-081-12/+40
| | | | | |
| | * | | | Correct spelling. setConsitentTiming -> setConsistentTimingMichael Brasser2009-05-082-2/+2
| | | | | |
| | * | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Geir Vattekar2009-05-0730-145/+272
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into kinetic-animations
| | | * | | | change the API of private class for QAbstractAnimation to allow settingThierry Bastian2009-05-072-14/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the timer interval. We also export the private clas so it can be used by other modules
| | * | | | | Doc: Work on QPropertyAnimation class descriptionGeir Vattekar2009-05-071-18/+39
| | | | | | |
| * | | | | | gracefully handle deletion of transition's target stateKent Hansen2009-05-083-4/+17
| | | | | | |
| * | | | | | get rid of warningsKent Hansen2009-05-081-2/+0
| | | | | | |
| * | | | | | make sure connections and event filters are removed when state machine haltsKent Hansen2009-05-082-0/+17
| | | | | | |
| * | | | | | don't create transition to null stateKent Hansen2009-05-081-2/+5
| | | | | | |
| * | | | | | don't add signal transition if target is null or signal doesn't existKent Hansen2009-05-071-0/+9
| | | | | | |
| * | | | | | Make it impossible to have root state as source or target of transition or ↵Eskil Abrahamsen Blomfeldt2009-05-073-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-statemachineKent Hansen2009-05-073-3/+18
| |\ \ \ \ \
| | * | | | | Addeed a warning if one is trying to animate a property that's not partThierry Bastian2009-05-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the object Task-number: 251763
| | * | | | | Provide a way in private API to have a consistent timer for animations.Thierry Bastian2009-05-072-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 Hansen2009-05-072-0/+13
| | | | | | |
| * | | | | | store top-level animation in dedicated variableKent Hansen2009-05-071-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The animation itself is used by subsequent code, so we mustn't change it.
| * | | | | | doc: Add documentation for NoCommonAncestorForTransitionError enumEskil Abrahamsen Blomfeldt2009-05-071-0/+5
| | | | | | |
| * | | | | | Rename NoDefaultStateInHistoryState -> NoDefaultStateInHistoryStateError for ↵Eskil Abrahamsen Blomfeldt2009-05-072-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistency The other error values have Error in the name for namespacing purposes.
| * | | | | | Fix infinite loop when source and target of transition are in different treesEskil Abrahamsen Blomfeldt2009-05-072-15/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SCXML algorithm depends on the guarantee that there is always an LCA regardless of the state list. The case where the targets are in a different tree than the source (e.g. if you have not given the target state a parent) is a bug. The fix is to set an error when this happens in exitStates() and exit states as if the pending error states were the target states. In enterStates we will detect the error and skip the step of selecting states to enter, and instead just enter the pending error states. This breaks transitions to and from the root state, which is not supported by the SCXML algorithm.
| * | | | | | Make sure machine enters error state if history state has no default stateEskil Abrahamsen Blomfeldt2009-05-071-10/+10
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep searching the parent hierarchy for error states even if a state in the hierarchy cannot be cast to QState. Also make currentErrorState==0 an assert, since there should always be an error state (we default to the special initialErrorState if we are unable to find anything else), otherwise the machine might get into an undefined state (e.g. configuration is empty)
| * | | | | Remove superfluous codeEskil Abrahamsen Blomfeldt2009-05-061-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have gone back to the old definition of implicit start values where the a new default start value is sniffed every time the animation is restarted, so we do not need to emulate this behavior ourselves anymore. Behavior should be identical.
| * | | | | Fix bogus default start value when interrupting an animation that has anEskil Abrahamsen Blomfeldt2009-05-061-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implicit end value. We need to stop the animation prior to setting the end value to an invalid variant, otherwise the current value of the property will be updated based on the new end value and randomness will occur.
| * | | | | doc improvementsKent Hansen2009-05-054-23/+51
| | | | | |
| * | | | | get rid of warningsKent Hansen2009-05-052-1/+3
| | | | | |
| * | | | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-052-100/+153
| |\ \ \ \ \ | | |/ / / /
| | * | | | Doc: Work on QAbstractAnimation class descriptionGeir Vattekar2009-05-051-46/+49
| | | | | |
| | * | | | Doc: Git merge conflict in QVariantAnimationGeir Vattekar2009-05-051-7/+0
| | | | | |
| | * | | | Doc: Updated QVariantAnimation class descriptionGeir Vattekar2009-05-052-47/+114
| | | |_|/ | | |/| |
| | * | | Small refactor of QVariantAnimation::updateCurrentValueThierry Bastian2009-04-291-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we only test the inequality of the new value compared to the previous one in case we have something conected to currentValueChanged signal. The comparison is quite heavy in QVariant. So avoiding it a good thing.
generated by cgit v0.12 at 2024-12-27 13:16:45 (GMT)