summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Erik Verbruggen2009-05-1810-902/+1006
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Do not store empty type names in QmlMetaTypeKai Koehne2009-05-181-1/+2
| |
| * Renamed qualifiedObjectNameId.Roberto Raggi2009-05-183-12/+12
| |
| * Compile.Roberto Raggi2009-05-182-3/+3
| |
| * Introduced qualified type names in the grammar.Roberto Raggi2009-05-188-896/+989
| |
| * Allow mapping from QMetaObject * to corresponding QmlTypeKai Koehne2009-05-182-4/+14
| | | | | | | | | | | | | | | | This is needed in Bauhaus to get the QmlType of a parent QMetaObject. Also, mark QmlType class as to be exported. Reviewed-by: Aaron Kennedy
* | Fixed the addition of "id" to the list of QmlDomObject properties.Erik Verbruggen2009-05-181-2/+1
| |
* | Added "id" to the list of QmlDomObject properties, so we can get to theErik Verbruggen2009-05-181-5/+1
|/ | | | location information.
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-18123-1059/+2622
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-05-18111-1020/+2319
| |\ | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qvariantanimation.cpp src/gui/graphicsview/qgraphicsitem.cpp
| | * 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-1545-106/+293
| | |\ | | | | | | | | | | | | into kinetic-animations
| | | * Avoid resetting the QVariantAnimation::currentValue when changing stateLeonardo Sobral Cunha2009-05-151-2/+0
| | | | | | | | | | | | | | | | Reviewed-by: janarve
| | | * General refactors in QVariantAnimationLeonardo Sobral Cunha2009-05-152-27/+35
| | | | | | | | | | | | | | | | Reviewed-by: janarve
| | | * Update current value on QVariantAnimation::setKeyValuesLeonardo Sobral Cunha2009-05-152-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The current value was udpated on setKeyValueAt, but not on setKeyValues and this was leading to a semantic inconsistency. Reviewed-by: janarve
| | | * Avoid interpolating if we have less than 2 key values in QVariantAnimationLeonardo Sobral Cunha2009-05-152-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If we have less than 2 key values, we should neither try to interpolate nor set the current value. Reviewed-by: janarve
| | | * Indentation and whitespace fixes in animation apiLeonardo Sobral Cunha2009-05-156-15/+12
| | | |
| | | * Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-145-10/+14
| | | |\
| | | * | Fix top level compile in examples/animationEskil Abrahamsen Blomfeldt2009-05-141-3/+0
| | | | | | | | | | | | | | | | | | | | Three examples have been moved.
| | | * | Make QAbstractTransition::eventTest() non-constEskil Abrahamsen Blomfeldt2009-05-1429-45/+45
| | | | | | | | | | | | | | | | | | | | | | | | | We decided to remove the const of the eventTest() since some transitions have dynamic conditions and need to update when eventTest() is called.
| | | * | Pop up message when a tank wins the gameEskil Abrahamsen Blomfeldt2009-05-148-12/+113
| | | | | | | | | | | | | | | | | | | | | | | | | Also fixed: Added some docs and moved the tanks a little so they don't start partly outside the scene rect.
| | | * | Fix run-time error in Seek AI's state machineEskil Abrahamsen Blomfeldt2009-05-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Passed parent as 'tank', thus getting a null parent in the GoToLocation state, which breaks the machine when you transition into the state.
| | | * | Fix SpinState in Tank Game Example to spin more than 180 degreesEskil Abrahamsen Blomfeldt2009-05-142-2/+12
| | | | | | | | | | | | | | | | | | | | This was a leftover from when the setDirection() semantics were broken.
| | | * | correctly handle multiple event transitions for same (object,event)Kent Hansen2009-05-133-7/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The event filter was not removed at the right time. We now store the number of active event transitions for a particular (object,event) and only remove the filtering when the count drops to zero.
| | * | | Doc: Added a work in progress class hierarchy overview.David Boddie2009-05-151-0/+351
| | | |/ | | |/| | | | | | | | | Reviewed-by: Geir Vattekar
| | * | 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-1329-326/+464
| | |\ \ | | | | | | | | | | | | | | | into kinetic-animations
| | | * | correctly handle multiple event transitions for same (object,event)Kent Hansen2009-05-133-7/+62
| | | |/ | | | | | | | | | | | | | | | | | | | | The event filter was not removed at the right time. We now store the number of active event transitions for a particular (object,event) and only remove the filtering when the count drops to zero.
| | | * 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 ↵Geir Vattekar2009-05-1353-498/+689
| | | | |\ | | | | | | | | | | | | | | | | | | into kinetic-animations
| | | | * | Doc: Work on QStateMachine class descriptionGeir Vattekar2009-05-131-55/+85
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kent Hansen
| | | * | | more statemachine docsKent Hansen2009-05-132-5/+40
| | | | | |
| | | * | | doc: Add screenshot for Tank Game ExampleEskil Abrahamsen Blomfeldt2009-05-131-0/+0
| | | | | |
| | | * | | kill the QT_STATEMACHINE_SOLUTION defineKent Hansen2009-05-1319-233/+16
| | | | | | | | | | | | | | | | | | | | | | | | We won't release another Qt Solution, so the define is no longer needed.
| | | * | | document statemachine/factorial exampleKent Hansen2009-05-134-26/+141
| | | | | |
| | | * | | doc: Correct names of snippets in docs for Tank Game exampleEskil Abrahamsen Blomfeldt2009-05-132-1/+5
| | | | | |
| | | * | | doc: Add documentation for Tank Game exampleEskil Abrahamsen Blomfeldt2009-05-132-0/+116
| | | | |/ | | | |/|
| | * | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-05-12635-24172/+24102
| | |\ \ \ | | | |/ / | | | | | | | | | | into kinetic-animations
| | | * | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-120-0/+0
| | | |\ \ | | | | |/
| | | | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-05-12535-23248/+21677
| | | | |\
| | | * | | correctly handle multiple signal transitions for same (object,signal)Kent Hansen2009-05-124-15/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The signal was not disconnected at the right time. We now store the number of active signal transitions for a particular (object,signal) and only disconnect when the count drops to zero.
| | | * | | document the statemachine/eventtransitions exampleKent Hansen2009-05-123-3/+104
| | | | | |
| | | * | | add State Machine to examples overviewKent Hansen2009-05-121-0/+8
| | | | | |
| | | * | | Change name of "errorstate" example to "tankgame"Eskil Abrahamsen Blomfeldt2009-05-1226-29/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error state is not a big enough part of the example to justify naming it after it.
| | | * | | Fixes: document statemachine/twowaybutton exampleKent Hansen2009-05-123-7/+98
| | | | | |
| | | * | | kill some simplistic/overlapping/under-developed examplesKent Hansen2009-05-129-445/+0
| | | | | |
| | | * | | document the statemachine/pingpong exampleKent Hansen2009-05-124-0/+122
| | | | | |
| | | * | | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Alexis Menard2009-05-12209-5230/+8072
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | |
generated by cgit v0.12 at 2025-02-14 23:29:54 (GMT)