summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-2921-117/+370
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: examples/animation/sub-attaq/states.cpp
| | | * | Build fix for mingwThierry Bastian2009-04-2718-54/+52
| | | | |
| | | * | Add an OSD to display game progress in the sceneAlexis Menard2009-04-2411-65/+320
| | | | |
| | * | | replace QState::Type with QState::childMode propertyKent Hansen2009-04-292-2/+2
| | | | | | | | | | | | | | | | | | | | Result of API review.
| | * | | Adapt to recent API changes and bug fixes.Eskil Abrahamsen Blomfeldt2009-04-291-2/+6
| | | | |
| | * | | modifiers --> modifiersMaskKent Hansen2009-04-291-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Result of API review. A == comparison of the modifiers is not useful. The common case is you want to test if one or more modifiers are set, i.e. a mask check.
| | * | | make history state constructibleKent Hansen2009-04-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decided in API review. The intention of QHistoryState not being constructible was so that people wouldn't subclass it and reimplement onEntry()/onExit(), thinking that those functions would actually get called (which they won't). However, we recently added the entered() signal to QAbstractState, so people are going to connect to it and ask why they never get the signal for a QHistoryState. We might as well make QHistoryState constructible and just document that it doesn't make sense to subclass it.
| | * | | say hello (again) to QAbstract{State,Transition}::machine()Kent Hansen2009-04-292-37/+18
| | | | | | | | | | | | | | | | | | | | It's useful and it's simple for us to expose, so let's.
| | * | | Work around an oddity in parallel states that causes all regions to exitEskil Abrahamsen Blomfeldt2009-04-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | if there is a transition from one of them (even if the target state of the transition is inside the region.)
| | * | | Some updates to the errorstate example.Eskil Abrahamsen Blomfeldt2009-04-2812-126/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added cannon firing. There are some problems left: For some reason the parallel state group does not work properly, so only one tank moves even if you add more. There also seems to be something wrong with historyState->setDefaultState().
| | * | | compile after api changesKent Hansen2009-04-283-8/+8
| | | | |
| | * | | Really broken plugin for errorState. Don't try to use this yet, it doesn'tEskil Abrahamsen Blomfeldt2009-04-243-0/+115
| | | | | | | | | | | | | | | | | | | | work at all.
| | * | | Unfinished tank AI game. The idea is that you plug in AIs for the tanks, andEskil Abrahamsen Blomfeldt2009-04-248-0/+619
| | |/ / | | | | | | | | | | | | | | | | one such plugin will have a run time error, so the game server needs to use errorState for handling errors.
| | * | Merge branch 'kinetic-statemachine' into kinetic-animationsKent Hansen2009-04-248-27/+12
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: examples/animation/piemenu/qgraphicspiemenu_p.h
| | | * | Remove API for setting specific restore policies on states. We have no clearEskil Abrahamsen Blomfeldt2009-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use case for this, so it has been removed. If the requirement arises we can add it back in later. Since it no longer makes sense to have it in QAbstractState, the RestorePolicy enum has been moved to QStateMachine.
| | | * | Compile.Eskil Abrahamsen Blomfeldt2009-04-231-2/+0
| | | | |
| | | * | Remove specific RestorePolicy per state from example. The semantics for thisEskil Abrahamsen Blomfeldt2009-04-233-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | have changed to something which is more intuitive, so it is no longer useful for this case.
| | | * | kill the stateactions apiKent Hansen2009-04-225-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | Moved the animation examples piemenu and photobrowser to examples/researchLeonardo Sobral Cunha2009-04-2316-0/+0
| | | | |
| | * | | Update copyright headers of animation examplesLeonardo Sobral Cunha2009-04-2354-110/+1937
| | | | |
| | * | | Fixes for solution package.Jan-Arve Sæther2009-04-225-6/+10
| | |/ /
| | * | include the right headerKent Hansen2009-04-212-2/+2
| | | |
| | * | compile fixThierry Bastian2009-04-201-1/+1
| | | |
| | * | cleanup in demoThierry Bastian2009-04-204-95/+30
| | | | | | | | | | | | | | | | sub-attaq doesn't use anymore animation private headers
| | * | iterationCount becomes loopCount againThierry Bastian2009-04-203-6/+5
| | | |
| | * | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-04-1740-38/+2096
| | |\ \
| | | * \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-04-1740-38/+2096
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | | * | | Initial import of kinetic-animations branch from the old kineticAlexis Menard2009-04-172095-0/+154496
| | | / / | | | | | | | | | | | | | | | repository to the new repository
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachineAlexis Menard2009-05-1267-56/+3493
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | | | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-172102-0/+155387
| / / /
* | | | Merge commit 'qt/master'Samuel Rødal2009-05-2037-37/+587
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtDavid Boddie2009-05-2014-28/+28
| |\ \ \
| | * | | Changing the addressbook tutorial so it doesn't leak.Daniel Molkentin2009-05-2014-28/+28
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Kavindra Palaraja <kavindra.palaraja@nokia.com>
| * | | | Doc: Used QApplication::translate() instead of QObject::tr().David Boddie2009-05-204-8/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | At some point, we may revise this to use plain C strings at first, then introduce the concept of translations. Reviewed-by: Trust Me
| * | | Doc: Compile fixes for tutorial examples.David Boddie2009-05-204-20/+21
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Merge branch '4.5' of ../qt-45-documentationDavid Boddie2009-05-209-9/+9
| |\ \ \
| | * | | Fix incorrect copyright year in some license headers.Jason McDonald2009-05-209-9/+9
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | | Doc: First attempt at a simpler widgets tutorial.David Boddie2009-05-209-0/+314
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 253710 Reviewed-by: Trust Me
| * | | | compile (rand())Warwick Allison2009-05-151-0/+1
| | | | |
| * | | | Merge branch 'master' of ../master into contiguouscacheIan Walters2009-05-1436-76/+93
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into contiguouscacheIan Walters2009-05-1236-46/+1471
| |\ \ \ \ \
| * | | | | | Update licensing headers.Ian Walters2009-04-073-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update files to have consistent licencesing with the rest of Qt.
| * | | | | | Merge branch 'master' into contiguouscacheIan Walters2009-04-0619-15/+1233
| |\ \ \ \ \ \
| * | | | | | | Rename OffsetVector to ContiguousCacheIan Walters2009-04-036-12/+12
| | | | | | | |
| * | | | | | | Squashed commit of the following:Rhys Weatherley2009-03-245-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 39de3862f5678b3226b4932eeb342c4a023d2f2b Author: Ian Walters <ian.walters@nokia.com> Date: Thu Feb 19 14:16:05 2009 +1000 Fixes: Test runs (and passes), doc links. Task: QT-308 Details: Minor changes related to the code having moved. commit 5a8910dd1018fb228d0e2e2819ea429577bfa834 Author: Ian Walters <ian.walters@nokia.com> Date: Thu Feb 19 09:47:20 2009 +1000 Fixes: Checkin of QOffsetVector stuff for branch Task: QT-308 Details: Files originally from research/qcircularbuffer This checkin likely won't compile. Just a copy for now.
* | | | | | | | Merge commit 'qt/master'Samuel Rødal2009-05-1339-82/+107
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge commit 'origin/4.5'Olivier Goffart2009-05-132-2/+22
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Adding documentation to the fancy browser exampleMorten Engvoldsen2009-05-122-2/+22
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added documentation to the fancy browser example. Task-number:252097 Rev-by: Geir Vattekar Rev-by: Ariya Hidayat
| * | | | | | Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-1234-74/+71
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | We introduce this new enum, we should be using it.
| * | | | | Merge branch '4.5'Thiago Macieira2009-05-112-5/+13
| |\ \ \ \ \ | | |/ / / /