summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* d-pointerize QmlOpenMetaObjectMartin Jones2009-05-114-61/+78
|
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-1117-39/+239
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Clean up QmlContext's and QmlExpression's when a context gets deletedAaron Kennedy2009-05-114-3/+49
| |
| * When a QmlContext is destroyed, associated objects must be disassociatedAaron Kennedy2009-05-115-4/+25
| |
| * Handle QmlParserStatus's and QmlBindableValeus being deleted during ↵Aaron Kennedy2009-05-1111-31/+164
| | | | | | | | component creation
| * CompileAaron Kennedy2009-05-111-2/+2
| |
* | Lower case role names are needed.Martin Jones2009-05-111-6/+7
|/
* Get QListModelInterface back in line with itemviews_ng.Martin Jones2009-05-102-23/+0
|
* Change QList_int typedef back to QList<int> - broke signal connection.Martin Jones2009-05-102-22/+9
|
* Make sure we correctly remove the PathView attached property object.Martin Jones2009-05-102-1/+7
| | | | If we don't, we get some nasty random crashes.
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-1015-53/+545
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Roberto Raggi2009-05-082-1/+2
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * qdoc: Fixed default parameter.Martin Smith2009-05-081-1/+1
| | |
| | * Merge branch 'kinetic-declarativeui' of ↵Martin Smith2009-05-086-14/+54
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | 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
| |/ | | | | | | | | Reviewed-by: erikv Reviewed-by: Roberto Raggi
| * qdoc: Added qlistmodelinterface.cpp to correct some qdoc warnings.Martin Smith2009-05-083-33/+134
| |
| * Add canvas image captureAaron Kennedy2009-05-082-9/+90
| |
| * Add canvas debugger moduleAaron Kennedy2009-05-086-3/+269
| |
* | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-081-1/+3
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Only print error on an actual errorAaron Kennedy2009-05-081-1/+3
| |
* | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-08119-3398/+3313
|\ \ | |/ | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-05-08113-3428/+3161
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * Fix warning.Michael Brasser2009-05-081-1/+1
| | |
| | * Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-05-0829-164/+639
| | |\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | Get autotests compiling again. Start converting syntax.Michael Brasser2009-05-081-1/+0
| | | |
| | * | More Transform work.Michael Brasser2009-05-082-18/+118
| | | | | | | | | | | | | | | | Add Rotatation. Mark poorly documented transforms as internal for now.
| | * | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Michael Brasser2009-05-0754-2682/+1332
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/corelib/animation/qabstractanimation.cpp src/corelib/animation/qabstractanimation_p.h src/corelib/animation/qpropertyanimation.cpp
| | | * \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Geir Vattekar2009-05-0730-145/+272
| | | |\ \ | | | | | | | | | | | | | | | | | | into kinetic-animations
| | | | * | change the API of private class for QAbstractAnimation to allow settingThierry Bastian2009-05-072-14/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the timer interval. We also export the private clas so it can be used by other modules
| | | | * | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-073-3/+18
| | | | |\ \
| | | | | * | Addeed a warning if one is trying to animate a property that's not partThierry Bastian2009-05-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the object Task-number: 251763
| | | | | * | Provide a way in private API to have a consistent timer for animations.Thierry Bastian2009-05-072-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for better testing because from now on we can rely on the results to be always the same and not rely on timer accuracy any more. Task-number: 251764 Reviewed-by: leo
| | | | * | | add QStateMachine::isRunning()Kent Hansen2009-05-072-0/+13
| | | | | | |
| | | | * | | store top-level animation in dedicated variableKent Hansen2009-05-071-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The animation itself is used by subsequent code, so we mustn't change it.
| | | | * | | doc: Add documentation for NoCommonAncestorForTransitionError enumEskil Abrahamsen Blomfeldt2009-05-071-0/+5
| | | | | | |
| | | | * | | Rename NoDefaultStateInHistoryState -> NoDefaultStateInHistoryStateError for ↵Eskil Abrahamsen Blomfeldt2009-05-072-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistency The other error values have Error in the name for namespacing purposes.
| | | | * | | Fix infinite loop when source and target of transition are in different treesEskil Abrahamsen Blomfeldt2009-05-072-15/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SCXML algorithm depends on the guarantee that there is always an LCA regardless of the state list. The case where the targets are in a different tree than the source (e.g. if you have not given the target state a parent) is a bug. The fix is to set an error when this happens in exitStates() and exit states as if the pending error states were the target states. In enterStates we will detect the error and skip the step of selecting states to enter, and instead just enter the pending error states. This breaks transitions to and from the root state, which is not supported by the SCXML algorithm.
| | | | * | | Make sure machine enters error state if history state has no default stateEskil Abrahamsen Blomfeldt2009-05-071-10/+10
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep searching the parent hierarchy for error states even if a state in the hierarchy cannot be cast to QState. Also make currentErrorState==0 an assert, since there should always be an error state (we default to the special initialErrorState if we are unable to find anything else), otherwise the machine might get into an undefined state (e.g. configuration is empty)
| | | | * | Remove superfluous codeEskil Abrahamsen Blomfeldt2009-05-061-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have gone back to the old definition of implicit start values where the a new default start value is sniffed every time the animation is restarted, so we do not need to emulate this behavior ourselves anymore. Behavior should be identical.
| | | | * | Fix bogus default start value when interrupting an animation that has anEskil Abrahamsen Blomfeldt2009-05-061-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implicit end value. We need to stop the animation prior to setting the end value to an invalid variant, otherwise the current value of the property will be updated based on the new end value and randomness will occur.
| | | | * | doc improvementsKent Hansen2009-05-054-23/+51
| | | | | |
| | | | * | get rid of warningsKent Hansen2009-05-052-1/+3
| | | | | |
| | | | * | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-052-100/+153
| | | | |\ \
| | | | * | | add event as argument to onEntry(), onExit() and onTransition()Kent Hansen2009-05-0526-72/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accessing the event can be useful. E.g., onEntry() can do some common event processing regardless of which transition caused the state to be entered; onTransition() can be used in combination with eventTest(), where eventTest() would first check that the input matches some criteria, and then the actual processing of that input would be done in onTransition.
| | | | * | | ignore QState::assignProperty() calls where the target object is 0Kent Hansen2009-05-041-0/+4
| | | | | | |
| | | | * | | When restoring properties in descendants of a state which assigns it a value,Eskil Abrahamsen Blomfeldt2009-04-301-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the property should be restored to the value assigned by the ancestor state. When restoreProperties is on, assigning a value in a state means it will have that value as long as the state is active, unless an active state deeper in the hierarchy assigns it a different value. This is basically a stack of "initial" values, but implemented using the parent hierarchy of the state instead.
| | | | * | | The intuitive interpretation of RestoreProperties is that a value isEskil Abrahamsen Blomfeldt2009-04-301-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | potentially restored once the state that set it is exited. So if you have a parent state P which sets 'foo' and then several child states of P, the property should not be restored as long as P is active, regardless of which transitions are taken inside P and what properties are being assigned there. Before, we would restore the property when we entered a state that did not assign it, ignoring what properties where being assigned in the parent.
| | | * | | | Doc: Work on QPropertyAnimation class descriptionGeir Vattekar2009-05-071-18/+39
| | | | |/ / | | | |/| |