Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 53 | -498/+689 |
| |\ | | | | | | | | | | into kinetic-animations | ||||
| * | | Doc: Work on QStateMachine class description | Geir Vattekar | 2009-05-13 | 1 | -55/+85 |
| | | | | | | | | | | | | Reviewed-by: Kent Hansen | ||||
* | | | more statemachine docs | Kent Hansen | 2009-05-13 | 2 | -5/+40 |
| | | | |||||
* | | | doc: Add screenshot for Tank Game Example | Eskil Abrahamsen Blomfeldt | 2009-05-13 | 1 | -0/+0 |
| | | | |||||
* | | | 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. | ||||
* | | | document statemachine/factorial example | Kent Hansen | 2009-05-13 | 4 | -26/+141 |
| | | | |||||
* | | | doc: Correct names of snippets in docs for Tank Game example | Eskil Abrahamsen Blomfeldt | 2009-05-13 | 2 | -1/+5 |
| | | | |||||
* | | | doc: Add documentation for Tank Game example | Eskil Abrahamsen Blomfeldt | 2009-05-13 | 2 | -0/+116 |
| |/ |/| | |||||
* | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-12 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations | Alexis Menard | 2009-05-12 | 535 | -23248/+21677 |
| |\ | |||||
* | | | correctly handle multiple signal transitions for same (object,signal) | Kent Hansen | 2009-05-12 | 4 | -15/+68 |
| | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | document the statemachine/eventtransitions example | Kent Hansen | 2009-05-12 | 3 | -3/+104 |
| | | | |||||
* | | | add State Machine to examples overview | Kent Hansen | 2009-05-12 | 1 | -0/+8 |
| | | | |||||
* | | | Change name of "errorstate" example to "tankgame" | Eskil Abrahamsen Blomfeldt | 2009-05-12 | 26 | -29/+40 |
| | | | | | | | | | | | | | | | The error state is not a big enough part of the example to justify naming it after it. | ||||
* | | | Fixes: document statemachine/twowaybutton example | Kent Hansen | 2009-05-12 | 3 | -7/+98 |
| | | | |||||
* | | | kill some simplistic/overlapping/under-developed examples | Kent Hansen | 2009-05-12 | 9 | -445/+0 |
| | | | |||||
* | | | document the statemachine/pingpong example | Kent Hansen | 2009-05-12 | 4 | -0/+122 |
| | | | |||||
* | | | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | Alexis Menard | 2009-05-12 | 209 | -5230/+8072 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-statemachine Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| * | | | doc: Add documentation for animations, restore policy and polished signal | Eskil Abrahamsen Blomfeldt | 2009-05-12 | 1 | -0/+182 |
| | | | | |||||
| * | | | update license headers | Kent Hansen | 2009-05-12 | 2 | -6/+66 |
| | | | | |||||
| * | | | improve the docs for the trafficlight example | Kent Hansen | 2009-05-12 | 4 | -41/+49 |
| |/ / | |||||
| * | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-12 | 4 | -7/+66 |
| |\ \ | |||||
| | * | | Doc: Assign state machine overview to architecture group (get it in | Geir Vattekar | 2009-05-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | the overview list) | ||||
| | * | | 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 | 6 | -18/+165 |
| | |\ \ | | | | | | | | | | | | | | | | into kinetic-animations | ||||
| | * | | | Doc: Work on QParallelAnimationGroup and QSequentialAnimationGroup | Geir Vattekar | 2009-05-11 | 2 | -7/+49 |
| | | | | | |||||
| * | | | | redo statecharts in proper UML notation, expand documentation | Kent Hansen | 2009-05-12 | 8 | -22/+150 |
| | | | | | |||||
| * | | | | Don't interrupt test before animation finishes | Eskil Abrahamsen Blomfeldt | 2009-05-12 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're testing if both animations actually run and finish, so we need to make sure one of the polished signals is emitted last, and then react to this. I've done this by setting the duration of the animation which animated the property set by s2Child, so that it's sufficient to listen to this polished signal. | ||||
| * | | | | Kill warning in removeDefaultAnimation() test | Eskil Abrahamsen Blomfeldt | 2009-05-12 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | Warning about animating non-existent properties. | ||||
| * | | | | 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. | ||||
| * | | | | Avoid warnings in assignPropertyWithAnimation test | Eskil Abrahamsen Blomfeldt | 2009-05-12 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | They added a warning when you animate a non-existent property, so we make sure the properties are defined. | ||||
| * | | | | Make selecting plugins more user friendly and platform independent | Eskil Abrahamsen Blomfeldt | 2009-05-11 | 5 | -18/+66 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | Using *.dll was just a placeholder here. The code is mostly copied from the Plug&Paint example, and goes through all the plugins to find the compatible ones with some hacks to find out the application directory on windows and mac. | ||||
| * | | | 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 | 68 | -321/+1124 |
| | |\ \ | | | | | | | | | | | | | | | | 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 | 4 | -4/+30 |
| | | | | | |||||
| * | | | | get rid of warnings | Kent Hansen | 2009-05-08 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | Test what happens when target state doesn't have a parent | Kent Hansen | 2009-05-08 | 1 | -0/+25 |
| | | | | | |||||
| * | | | | make sure connections and event filters are removed when state machine halts | Kent Hansen | 2009-05-08 | 3 | -0/+21 |
| | | | | | |||||
| * | | | | don't create transition to null state | Kent Hansen | 2009-05-08 | 2 | -4/+28 |
| | | | | | |||||
| * | | | | don't add signal transition if target is null or signal doesn't exist | Kent Hansen | 2009-05-07 | 2 | -2/+30 |
| | | | | | |||||
| * | | | | Make it impossible to have root state as source or target of transition or ↵ | Eskil Abrahamsen Blomfeldt | 2009-05-07 | 4 | -6/+31 |
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -5/+21 |
| |\ \ \ | |||||
| | * | | | Addeed a warning if one is trying to animate a property that's not part | Thierry Bastian | 2009-05-07 | 2 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -0/+55 |
| | | | | |