summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-2689-0/+2345
|\ | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.h src/gui/graphicsview/qgraphicsitem_p.h
| * Merge branch '4.5'Thiago Macieira2009-05-221-0/+0
| |\ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qsharedmemory_unix.cpp
| | * Doc - updating the screenshotKavindra Devi Palaraja2009-05-221-0/+0
| | | | | | | | | | | | Reviewed-By: TrustMe
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Thierry Bastian2009-05-2247-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 Boddie2009-05-207-0/+108
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-193-3/+357
| |\ \ \
| | * | | Fixed access to members of an object.David Boddie2009-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | | Doc: Added architecture image to animation overview.Geir Vattekar2009-05-152-1/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-05-151-0/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | into kinetic-animations
| | * | | | Doc: Added a work in progress class hierarchy overview.David Boddie2009-05-151-0/+351
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Geir Vattekar
| * | | | | doc: Minor fixes + update UML diagrams for stick man exampleEskil Abrahamsen Blomfeldt2009-05-185-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 exampleEskil Abrahamsen Blomfeldt2009-05-153-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 Blomfeldt2009-05-143-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-statemachineKent Hansen2009-05-142-9/+9
| |\ \ \ \ | | |/ / /
| | * | | Doc: Marked up a link correctly.David Boddie2009-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie <dboddie@trolltech.com>
| | * | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-05-137-5/+259
| | |\ \ \ | | | | | | | | | | | | | | | | | | into kinetic-animations
| | * \ \ \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-05-1248-388/+1003
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into kinetic-animations
| | * | | | | Merged local changes.David Boddie2009-04-292-8/+8
| | | | | | |
| * | | | | | Pop up message when a tank wins the gameEskil Abrahamsen Blomfeldt2009-05-141-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 docsKent Hansen2009-05-132-5/+40
| | | | | |
| * | | | | doc: Add screenshot for Tank Game ExampleEskil Abrahamsen Blomfeldt2009-05-131-0/+0
| | | | | |
| * | | | | document statemachine/factorial exampleKent Hansen2009-05-133-0/+103
| | | | | |
| * | | | | doc: Correct names of snippets in docs for Tank Game exampleEskil Abrahamsen Blomfeldt2009-05-131-1/+1
| | | | | |
| * | | | | doc: Add documentation for Tank Game exampleEskil Abrahamsen Blomfeldt2009-05-132-0/+116
| | |/ / / | |/| | |
| * | | | document the statemachine/eventtransitions exampleKent Hansen2009-05-122-2/+89
| | | | |
| * | | | add State Machine to examples overviewKent Hansen2009-05-121-0/+8
| | | | |
| * | | | Fixes: document statemachine/twowaybutton exampleKent Hansen2009-05-122-0/+83
| | | | |
| * | | | document the statemachine/pingpong exampleKent Hansen2009-05-123-0/+108
| | | | |
| * | | | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Alexis Menard2009-05-1211-56/+435
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-statemachine Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * | | | 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-123-16/+27
| | | | | |
| | * | | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-121-0/+1
| | |\ \ \ \
| | | * | | | Doc: Assign state machine overview to architecture group (get it inGeir Vattekar2009-05-111-0/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | the overview list)
| | * | | | redo statecharts in proper UML notation, expand documentationKent Hansen2009-05-128-22/+150
| | |/ / /
| | * | | replace QState::Type with QState::childMode propertyKent Hansen2009-04-291-6/+5
| | | | | | | | | | | | | | | | | | | | Result of API review.
| | * | | move assignProperty() to QStateKent Hansen2009-04-291-5/+4
| | | | | | | | | | | | | | | | | | | | Doesn't belong in the abstract base class.
| | * | | kill the stateactions apiKent Hansen2009-04-221-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 docKent Hansen2009-04-171-6/+6
| | | | |
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-04-1754-479/+1319
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | * | | | Initial import of kinetic-animations branch from the old kineticAlexis Menard2009-04-173292-0/+227236
| | / / / | | | | | | | | | | | | | | | repository to the new repository
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachineAlexis Menard2009-05-1279-821/+1608
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | | | | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-173292-0/+227236
| / / / /
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-225-60/+355
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Sync the French addressbook tutorial with the English versionBenjamin Poulain2009-05-201-2/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Thierry
| * | | | Changing the addressbook tutorial so it doesn't leak.Daniel Molkentin2009-05-201-3/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Kavindra Palaraja <kavindra.palaraja@nokia.com>
| * | | | Merge branch '4.5' of ../qt-45-documentationDavid Boddie2009-05-203-55/+344
| |\ \ \ \
| | * \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5David Boddie2009-05-202-1/+262
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Martin Smith2009-05-201-1/+1
| | | |\ \ \
| | | | * | | Fix incorrect copyright year in some license headers.Jason McDonald2009-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me