summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixed #includesRoberto Raggi2009-05-1898-245/+247
|
* 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-1843-448/+477
|\ | | | | | | 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-1836-409/+401
| |\ | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qvariantanimation.cpp src/gui/graphicsview/qgraphicsitem.cpp
| | * 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-151-0/+1
| | | | | | | | | | | | | | | | | | | | | 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-151-4/+10
| | | | | | | | | | | | | | | | | | | | | 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-155-13/+10
| | |
| | * Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-143-1/+5
| | |\
| | | * Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-05-1319-295/+115
| | | |\ | | | | | | | | | | | | | | | into kinetic-animations
| | | | * correctly handle multiple event transitions for same (object,event)Kent Hansen2009-05-132-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-05-12238-3127/+6257
| | | |\ \ | | | | | | | | | | | | | | | | | | into kinetic-animations
| | | * \ \ Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵David Boddie2009-04-296-131/+171
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into kinetic-animations
| | | * | | | Merged local changes.David Boddie2009-04-293-1/+5
| | | | | | |
| | * | | | | Make QAbstractTransition::eventTest() non-constEskil Abrahamsen Blomfeldt2009-05-1417-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We decided to remove the const of the eventTest() since some transitions have dynamic conditions and need to update when eventTest() is called.
| | * | | | | correctly handle multiple event transitions for same (object,event)Kent Hansen2009-05-132-7/+14
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-135-16/+24
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | into kinetic-animations
| | | * | | | Doc: Work on QStateMachine class descriptionGeir Vattekar2009-05-131-55/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kent Hansen
| | | * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-05-12202-2834/+5597
| | | |\ \ \ \
| | * | | | | | 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.
| | * | | | | correctly handle multiple signal transitions for same (object,signal)Kent Hansen2009-05-123-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | | | Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Alexis Menard2009-05-1269-3370/+1729
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-statemachine Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| | | * | | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-123-7/+65
| | | |\ \ \ \
| | | | * | | | Doc: Work on QPauseAnimationGeir Vattekar2009-05-111-0/+16
| | | | | | | |
| | | | * | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic ↵Geir Vattekar2009-05-115-12/+74
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-animations
| | | | * | | | | Doc: Work on QParallelAnimationGroup and QSequentialAnimationGroupGeir Vattekar2009-05-112-7/+49
| | | | | | | | |
| | | * | | | | | Fixes crash when calling QState::setErrorState() with null pointerEskil Abrahamsen Blomfeldt2009-05-121-1/+1
| | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | When the state is null, it isn't the root state.
| | | * | | | | Merge branch 'kinetic-animations' into kinetic-statemachineKent Hansen2009-05-084-44/+114
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Doc: Work on QAnimationGroup class description.Geir Vattekar2009-05-081-12/+40
| | | | | | | |
| | | | * | | | Correct spelling. setConsitentTiming -> setConsistentTimingMichael Brasser2009-05-082-2/+2
| | | | | | | |
| | | * | | | | gracefully handle deletion of transition's target stateKent Hansen2009-05-083-4/+17
| | | | | | | |
| | | * | | | | get rid of warningsKent Hansen2009-05-081-2/+0
| | | | | | | |
| | | * | | | | make sure connections and event filters are removed when state machine haltsKent Hansen2009-05-082-0/+17
| | | | | | | |
| | | * | | | | don't create transition to null stateKent Hansen2009-05-081-2/+5
| | | | | | | |
| | | * | | | | don't add signal transition if target is null or signal doesn't existKent Hansen2009-05-071-0/+9
| | | | | | | |
| | | * | | | | Make it impossible to have root state as source or target of transition or ↵Eskil Abrahamsen Blomfeldt2009-05-073-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as error state Since the root state has no ancestors, it cannot be source or target in transitions since there will be no LCA for the transition, which is required for the algorithm of enterStates and exitStates. In SCXML the root state cannot be target or source of a transition. By the same logic, it cannot be an error state. The root state will always have a valid machine, since it's added to a machine immediately, which makes this code possible.
| | * | | | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachineAlexis Menard2009-05-12412-7887/+14298
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp
| * | \ \ \ \ \ \ Merge branch 'shader-api' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team ↵Michael Brasser2009-05-181-1/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: src/opengl/qglpixmapfilter.cpp
| | * | | | | | | | Mac OSX compile errors in shader usageRhys Weatherley2009-05-101-1/+1
| | | | | | | | | |
| * | | | | | | | | Better looking scale grid painting at small sizes.Michael Brasser2009-05-182-34/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is tailored for the common case (where left == right and top == bottom) and splits the area evenly rather than proportionally between the two sides.
| * | | | | | | | | Start work on translation support in Qml.Michael Brasser2009-05-184-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added basic support for qsTr in Qml, both in the engine and in lupdate.
generated by cgit v0.12 at 2024-10-25 17:24:59 (GMT)