Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-26 | 89 | -0/+2345 |
|\ | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.h src/gui/graphicsview/qgraphicsitem_p.h | ||||
| * | Merge branch '4.5' | Thiago Macieira | 2009-05-22 | 1 | -0/+0 |
| |\ | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qsharedmemory_unix.cpp | ||||
| | * | Doc - updating the screenshot | Kavindra Devi Palaraja | 2009-05-22 | 1 | -0/+0 |
| | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Thierry Bastian | 2009-05-22 | 47 | -173/+977 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-animations Conflicts: src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/tools.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicswidget.h src/gui/gui.pro | ||||
| * | | | Doc: Added a small example/test case for sequential animations. | David Boddie | 2009-05-20 | 7 | -0/+108 |
| | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| * | | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-19 | 3 | -3/+357 |
| |\ \ \ | |||||
| | * | | | Fixed access to members of an object. | David Boddie | 2009-05-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie | ||||
| | * | | | Doc: Added architecture image to animation overview. | Geir Vattekar | 2009-05-15 | 2 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie | ||||
| | * | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-05-15 | 1 | -0/+2 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | into kinetic-animations | ||||
| | * | | | | Doc: Added a work in progress class hierarchy overview. | David Boddie | 2009-05-15 | 1 | -0/+351 |
| | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Geir Vattekar | ||||
| * | | | | | doc: Minor fixes + update UML diagrams for stick man example | Eskil Abrahamsen Blomfeldt | 2009-05-18 | 5 | -4/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using StarUML this time, since there were "unregistered version" watermarks on the Enterprise Architect ones. Not as nice, but it's impossible to find a free UML tool which produces nice diagrams. | ||||
| * | | | | | doc: New state chart diagrams for Stickman example | Eskil Abrahamsen Blomfeldt | 2009-05-15 | 3 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These obviously cannot be used, since they have the "unregistered version" watermark on them. Didn't notice before now, so I might as well commit them for the time being. | ||||
| * | | | | | Remove the connectByAnimation() function and add some documentation for the ↵ | Eskil Abrahamsen Blomfeldt | 2009-05-14 | 3 | -0/+115 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stickman example The connectByAnimation() function is no longer needed since we have default animations. The docs are unfinished. | ||||
| * | | | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-14 | 2 | -9/+9 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Doc: Marked up a link correctly. | David Boddie | 2009-05-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie <dboddie@trolltech.com> | ||||
| | * | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-05-13 | 7 | -5/+259 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | into kinetic-animations | ||||
| | * \ \ \ | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | David Boddie | 2009-05-12 | 48 | -388/+1003 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into kinetic-animations | ||||
| | * | | | | | Merged local changes. | David Boddie | 2009-04-29 | 2 | -8/+8 |
| | | | | | | | |||||
| * | | | | | | Pop up message when a tank wins the game | Eskil Abrahamsen Blomfeldt | 2009-05-14 | 1 | -0/+2 |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Also fixed: Added some docs and moved the tanks a little so they don't start partly outside the scene rect. | ||||
| * | | | | | 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 |
| | | | | | | |||||
| * | | | | | document statemachine/factorial example | Kent Hansen | 2009-05-13 | 3 | -0/+103 |
| | | | | | | |||||
| * | | | | | doc: Correct names of snippets in docs for Tank Game example | Eskil Abrahamsen Blomfeldt | 2009-05-13 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | doc: Add documentation for Tank Game example | Eskil Abrahamsen Blomfeldt | 2009-05-13 | 2 | -0/+116 |
| | |/ / / | |/| | | | |||||
| * | | | | document the statemachine/eventtransitions example | Kent Hansen | 2009-05-12 | 2 | -2/+89 |
| | | | | | |||||
| * | | | | add State Machine to examples overview | Kent Hansen | 2009-05-12 | 1 | -0/+8 |
| | | | | | |||||
| * | | | | Fixes: document statemachine/twowaybutton example | Kent Hansen | 2009-05-12 | 2 | -0/+83 |
| | | | | | |||||
| * | | | | document the statemachine/pingpong example | Kent Hansen | 2009-05-12 | 3 | -0/+108 |
| | | | | | |||||
| * | | | | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ↵ | Alexis Menard | 2009-05-12 | 11 | -56/+435 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -16/+27 |
| | | | | | | |||||
| | * | | | | Merge branch 'kinetic-animations' into kinetic-statemachine | Kent Hansen | 2009-05-12 | 1 | -0/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | Doc: Assign state machine overview to architecture group (get it in | Geir Vattekar | 2009-05-11 | 1 | -0/+1 |
| | | |/ / / | | | | | | | | | | | | | | | | | | | the overview list) | ||||
| | * | | | | redo statecharts in proper UML notation, expand documentation | Kent Hansen | 2009-05-12 | 8 | -22/+150 |
| | |/ / / | |||||
| | * | | | replace QState::Type with QState::childMode property | Kent Hansen | 2009-04-29 | 1 | -6/+5 |
| | | | | | | | | | | | | | | | | | | | | Result of API review. | ||||
| | * | | | move assignProperty() to QState | Kent Hansen | 2009-04-29 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | | Doesn't belong in the abstract base class. | ||||
| | * | | | kill the stateactions api | Kent Hansen | 2009-04-22 | 1 | -4/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It just didn't give us that much. Typically you just reimplement onEntry/onExit/onTransition when you want to do something. We go back to the signals-and-slots approach: states have entered() and exited() signals that you can connect to. It's still possible to have an action-based API, but then you build it on top of the core API, which is OK. Replacing 4 public classes (and one layer in the hierarchy) with 2 signals feels good. | ||||
| | * | | | more doc | Kent Hansen | 2009-04-17 | 1 | -6/+6 |
| | | | | | |||||
| | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animations | Alexis Menard | 2009-04-17 | 54 | -479/+1319 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| | * | | | | Initial import of kinetic-animations branch from the old kinetic | Alexis Menard | 2009-04-17 | 3292 | -0/+227236 |
| | / / / | | | | | | | | | | | | | | | | repository to the new repository | ||||
| * | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachine | Alexis Menard | 2009-05-12 | 79 | -821/+1608 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| * | | | | | Initial import of statemachine branch from the old kinetic repository | Alexis Menard | 2009-04-17 | 3292 | -0/+227236 |
| / / / / | |||||
* | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-22 | 5 | -60/+355 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Sync the French addressbook tutorial with the English version | Benjamin Poulain | 2009-05-20 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: Thierry | ||||
| * | | | | Changing the addressbook tutorial so it doesn't leak. | Daniel Molkentin | 2009-05-20 | 1 | -3/+6 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-By: Kavindra Palaraja <kavindra.palaraja@nokia.com> | ||||
| * | | | | Merge branch '4.5' of ../qt-45-documentation | David Boddie | 2009-05-20 | 3 | -55/+344 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | David Boddie | 2009-05-20 | 2 | -1/+262 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5 | Martin Smith | 2009-05-20 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | | * | | | Fix incorrect copyright year in some license headers. | Jason McDonald | 2009-05-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me |