summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-1017-59/+566
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Roberto Raggi2009-05-082-1/+2
| |\
| | * qdoc: Fixed default parameter.Martin Smith2009-05-081-1/+1
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Smith2009-05-087-14/+63
| | |\
| | * | qdoc: Fixed missing end of comment.Martin Smith2009-05-081-0/+1
| * | | Fixed possible crash when processing Ui object definitions.Roberto Raggi2009-05-081-3/+6
| | |/ | |/|
| * | Expose import statements in QmlDomDocumentKai Koehne2009-05-086-14/+54
| * | Add autotest for crash when compiling "Component {}"Kai Koehne2009-05-081-0/+9
| |/
| * qdoc: Added qlistmodelinterface.cpp to correct some qdoc warnings.Martin Smith2009-05-083-33/+134
| * Add canvas image captureAaron Kennedy2009-05-082-9/+90
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-081-6/+12
| |\
| | * Make sure qmlviewer uses raster graphcis system, or respects what wasMichael Brasser2009-05-081-6/+12
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-081-1/+3
| | |\
| | * \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...Michael Brasser2009-05-080-0/+0
| | |\ \
| | | * | Correct spelling. setConsitentTiming -> setConsistentTimingMichael Brasser2009-05-082-2/+2
| * | | | Add canvas debugger moduleAaron Kennedy2009-05-086-3/+269
| | |_|/ | |/| |
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-0841-303/+585
|\ \ \ \ | |/ / /
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-0841-303/+583
| |\ \ \ | | |/ /
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-0811-123/+300
| | |\ \
| | * | | Autotest format conversion.Michael Brasser2009-05-0840-302/+582
| * | | | Only print error on an actual errorAaron Kennedy2009-05-081-1/+3
* | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-081-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-05-088-70/+252
| |\ \ \ \ | | |/ / /
| * | | | phonebrowser.qml is goneYann Bodson2009-05-081-1/+1
* | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-08217-4722/+7031
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-08210-4705/+6832
| |\ \ \ \ | | |/ / /
| | * | | Add tags to flickr2Yann Bodson2009-05-081-5/+14
| | * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-05-08208-4653/+6785
| | |\ \ \ | | | |/ /
| | | * | Fix warning.Michael Brasser2009-05-081-1/+1
| | | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-0840-272/+904
| | | |\ \
| | | * | | Get autotests compiling again. Start converting syntax.Michael Brasser2009-05-0813-69/+69
| | | * | | More Transform work.Michael Brasser2009-05-083-20/+118
| | | * | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...Michael Brasser2009-05-07121-3767/+4508
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | 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
| | | | | * | 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
| | | | | * | | 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-073-6/+6
| | | | | * | | Fix infinite loop when source and target of transition are in different treesEskil Abrahamsen Blomfeldt2009-05-073-18/+36
| | | | | * | | Fix tests for history state and entering root stateEskil Abrahamsen Blomfeldt2009-05-071-5/+3
| | | | | * | | Make sure machine enters error state if history state has no default stateEskil Abrahamsen Blomfeldt2009-05-071-10/+10
| | | | | * | | Compile with new APIEskil Abrahamsen Blomfeldt2009-05-071-2/+2
| | | | | |/ /
| | | | | * | 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
| | | | | * | Instead of adding animations for all properties to all transitions, we useEskil Abrahamsen Blomfeldt2009-05-061-7/+11
| | | | | * | Add chase state and ability to detect and fire at other tanks. This reveals anEskil Abrahamsen Blomfeldt2009-05-062-4/+92