summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 in...Geir Vattekar2009-05-1353-498/+689
| |\
| * | Doc: Work on QStateMachine class descriptionGeir Vattekar2009-05-131-55/+85
* | | more statemachine docsKent Hansen2009-05-132-5/+40
* | | doc: Add screenshot for Tank Game ExampleEskil Abrahamsen Blomfeldt2009-05-131-0/+0
* | | kill the QT_STATEMACHINE_SOLUTION defineKent Hansen2009-05-1319-233/+16
* | | document statemachine/factorial exampleKent Hansen2009-05-134-26/+141
* | | doc: Correct names of snippets in docs for Tank Game exampleEskil Abrahamsen Blomfeldt2009-05-132-1/+5
* | | doc: Add documentation for Tank Game exampleEskil Abrahamsen Blomfeldt2009-05-132-0/+116
| |/ |/|
* | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-120-0/+0
|\ \ | |/
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-05-12535-23248/+21677
| |\
* | | correctly handle multiple signal transitions for same (object,signal)Kent Hansen2009-05-124-15/+68
* | | document the statemachine/eventtransitions exampleKent Hansen2009-05-123-3/+104
* | | add State Machine to examples overviewKent Hansen2009-05-121-0/+8
* | | Change name of "errorstate" example to "tankgame"Eskil Abrahamsen Blomfeldt2009-05-1226-29/+40
* | | Fixes: document statemachine/twowaybutton exampleKent Hansen2009-05-123-7/+98
* | | kill some simplistic/overlapping/under-developed examplesKent Hansen2009-05-129-445/+0
* | | document the statemachine/pingpong exampleKent Hansen2009-05-124-0/+122
* | | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ...Alexis Menard2009-05-12209-5230/+8072
|\ \ \
| * | | doc: Add documentation for animations, restore policy and polished signalEskil Abrahamsen Blomfeldt2009-05-121-0/+182
| * | | update license headersKent Hansen2009-05-122-6/+66
| * | | improve the docs for the trafficlight exampleKent Hansen2009-05-124-41/+49
| |/ /
| * | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-124-7/+66
| |\ \
| | * | Doc: Assign state machine overview to architecture group (get it inGeir Vattekar2009-05-111-0/+1
| | * | Doc: Work on QPauseAnimationGeir Vattekar2009-05-111-0/+16
| | * | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...Geir Vattekar2009-05-116-18/+165
| | |\ \
| | * | | Doc: Work on QParallelAnimationGroup and QSequentialAnimationGroupGeir Vattekar2009-05-112-7/+49
| * | | | redo statecharts in proper UML notation, expand documentationKent Hansen2009-05-128-22/+150
| * | | | Don't interrupt test before animation finishesEskil Abrahamsen Blomfeldt2009-05-121-2/+4
| * | | | Kill warning in removeDefaultAnimation() testEskil Abrahamsen Blomfeldt2009-05-121-2/+5
| * | | | Fixes crash when calling QState::setErrorState() with null pointerEskil Abrahamsen Blomfeldt2009-05-121-1/+1
| * | | | Avoid warnings in assignPropertyWithAnimation testEskil Abrahamsen Blomfeldt2009-05-121-0/+8
| * | | | Make selecting plugins more user friendly and platform independentEskil Abrahamsen Blomfeldt2009-05-115-18/+66
| | |/ / | |/| |
| * | | 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 in...Geir Vattekar2009-05-0768-321/+1124
| | |\ \
| | | * | change the API of private class for QAbstractAnimation to allow settingThierry Bastian2009-05-072-14/+35
| | * | | Doc: Work on QPropertyAnimation class descriptionGeir Vattekar2009-05-071-18/+39
| * | | | gracefully handle deletion of transition's target stateKent Hansen2009-05-084-4/+30
| * | | | get rid of warningsKent Hansen2009-05-081-2/+0
| * | | | Test what happens when target state doesn't have a parentKent Hansen2009-05-081-0/+25
| * | | | make sure connections and event filters are removed when state machine haltsKent Hansen2009-05-083-0/+21
| * | | | don't create transition to null stateKent Hansen2009-05-082-4/+28
| * | | | don't add signal transition if target is null or signal doesn't existKent Hansen2009-05-072-2/+30
| * | | | Make it impossible to have root state as source or target of transition or as...Eskil Abrahamsen Blomfeldt2009-05-074-6/+31
| | |/ / | |/| |
| * | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-074-5/+21
| |\ \ \
| | * | | Addeed a warning if one is trying to animate a property that's not partThierry Bastian2009-05-072-2/+5
| | * | | Provide a way in private API to have a consistent timer for animations.Thierry Bastian2009-05-072-3/+16
| * | | | add QStateMachine::isRunning()Kent Hansen2009-05-073-0/+55