summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)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 in...David Boddie2009-05-1319-295/+115
| |\
| | * correctly handle multiple event transitions for same (object,event)Kent Hansen2009-05-132-7/+14
| * | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...David Boddie2009-05-12238-3127/+6257
| |\ \
| * \ \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...David Boddie2009-04-296-131/+171
| |\ \ \
| * | | | Merged local changes.David Boddie2009-04-293-1/+5
* | | | | Make QAbstractTransition::eventTest() non-constEskil Abrahamsen Blomfeldt2009-05-1417-18/+18
* | | | | correctly handle multiple event transitions for same (object,event)Kent Hansen2009-05-132-7/+14
| |_|_|/ |/| | |
* | | | 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-135-16/+24
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Doc: Work on QStateMachine class descriptionGeir Vattekar2009-05-131-55/+85
| * | | | 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
| |_|/ / / |/| | | |
* | | | | correctly handle multiple signal transitions for same (object,signal)Kent Hansen2009-05-123-15/+23
* | | | | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ...Alexis Menard2009-05-1269-3370/+1729
|\ \ \ \ \ | |/ / / /
| * | | | 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 in...Geir Vattekar2009-05-115-12/+74
| | |\ \ \ \
| | * | | | | 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
| | |/ / / / | |/| | | |
| * | | | | 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-0730-145/+272
| | |\ \ \ \
| | | * | | | 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-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 as...Eskil Abrahamsen Blomfeldt2009-05-073-4/+26
| | |/ / / / | |/| | | |
| * | | | | 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
| | * | | | | 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-072-0/+13
| * | | | | | store top-level animation in dedicated variableKent Hansen2009-05-071-3/+4
| * | | | | | doc: Add documentation for NoCommonAncestorForTransitionError enumEskil Abrahamsen Blomfeldt2009-05-071-0/+5
| * | | | | | Rename NoDefaultStateInHistoryState -> NoDefaultStateInHistoryStateError for ...Eskil Abrahamsen Blomfeldt2009-05-072-5/+5
| * | | | | | Fix infinite loop when source and target of transition are in different treesEskil Abrahamsen Blomfeldt2009-05-072-15/+34
| * | | | | | Make sure machine enters error state if history state has no default stateEskil Abrahamsen Blomfeldt2009-05-071-10/+10
| |/ / / / /
| * | | | | Remove superfluous codeEskil Abrahamsen Blomfeldt2009-05-061-7/+0
| * | | | | Fix bogus default start value when interrupting an animation that has anEskil Abrahamsen Blomfeldt2009-05-061-5/+7
| * | | | | 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