summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* unify z-value handling in graphics and fx items.Lars Knoll2009-07-2210-36/+27
| | | | | | Add a ItemNegativeZStacksBehindParent flag to QGraphicsItem to get the behavior we need in QFxItems. Removed the z property in QFxItems.
* Remove an unused method in QFxItemLars Knoll2009-07-2212-50/+0
| | | | | propertyInfo was not used by anything, let's just get rid of it.
* More cleanups in QFxItemLars Knoll2009-07-224-56/+13
| | | | | Remove the pos, x and y properties and use the ones in QGraphicsObject instead
* First round of cleanups for QFxItemLars Knoll2009-07-227-150/+33
| | | | | Removed some methods that are already implemented in QGraphicsItem/Object.
* Fix GraphicsObjectContainer.Michael Brasser2009-07-222-0/+2
|
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-222-2/+11
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-2250-900/+860
| |\ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | Make setRoleNames() protected and improve docs.Martin Jones2009-07-222-2/+11
| | |
* | | Remove moveToParent property.Michael Brasser2009-07-228-138/+152
| |/ |/| | | | | Functionality has been moved to ParentChange.
* | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-2159-1032/+977
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-2110-31/+336
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-212-5/+5
| | |\ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | Move the Script interface of QmlComponent to QmlBindableComponentAlan Alpert2009-07-217-27/+286
| | | | |
| | * | | Update AnimatedImage item to be more similar to AnimationsAlan Alpert2009-07-203-4/+50
| | | | | | | | | | | | | | | | | | | | Now has playing and paused properties that should behave the same.
| * | | | Fix repaint errors.Michael Brasser2009-07-211-2/+7
| | |/ / | |/| | | | | | | | | | Make sure the old bounding rect is repainted when we change size.
| * | | Doc clarification.Michael Brasser2009-07-201-2/+1
| | | |
| * | | Fix crash.Michael Brasser2009-07-201-3/+4
| |/ /
| * | Remove unnecessary methods from QmlBindingAaron Kennedy2009-07-202-14/+3
| | | | | | | | | | | | QmlBinding is no longer instantiable from QML, so this stuff isn't needed.
| * | Prevent expression evaluation data from overlappingAaron Kennedy2009-07-203-4/+20
| | |
| * | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-2020-142/+172
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-208-21/+43
| | |\ \ | | | |/ | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-2011-116/+117
| | | |\ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | Add an inSync property that holds whether the target has "caught up"Martin Jones2009-07-202-5/+27
| | | | | | | | | | | | | | | | | | | | Useful for determining when the target has finished animating.
| | | * | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-201174-25012/+31860
| | | |\ \ | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * \ \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-154-11/+138
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | | * | | | Remove unnecessary semicolonsMartin Jones2009-07-146-16/+16
| | | | | | |
| | * | | | | Pause instead of stop when playing == false.Alan Alpert2009-07-201-1/+1
| | | | | | |
| | * | | | | Fix bug in AnimatedImage where it wouldn't show until playedAlan Alpert2009-07-202-4/+11
| | | |_|_|/ | | |/| | |
| | * | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-2029-90/+359
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | | Emit selectionChange when setSelection is calledAlan Alpert2009-07-201-0/+5
| | | | | | |
| | * | | | | Add selection control to QFxLineEditAlan Alpert2009-07-203-113/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Should behave the same as in QFxTextEdit
| | * | | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-1712-129/+71
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: demos/declarative/samegame/content/BoomBlock.qml
| | * \ \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-171108-20433/+25597
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * \ \ \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-1635-647/+572
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| | * | | | | | | | Fix a bug in QmlFollowAlan Alpert2009-07-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using a follow by turning it on and off at times was not working right.
| * | | | | | | | | Rework expression stuff to use a more efficient notify handlerAaron Kennedy2009-07-2013-327/+246
| | | | | | | | | |
| * | | | | | | | | Rename QmlBindableValue to QmlBindingAaron Kennedy2009-07-2028-109/+100
| | | | | | | | | |
| * | | | | | | | | Simplify binding optimizationAaron Kennedy2009-07-204-423/+116
| | | | | | | | | |
| * | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-2014-42/+56
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | | | | Add some basic QML benchmarksAaron Kennedy2009-07-171-0/+12
| | | | | | | | | |
* | | | | | | | | | Add some (disabled) test code for limiting image size.Warwick Allison2009-07-211-1/+24
| |_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QFxImage et al could benefit from a limit feature, especially for remote images.
* | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-201-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | | | | Compile fix.Michael Brasser2009-07-201-0/+2
| | | | | | | | | |
* | | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-205-2/+16
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | | | | Fix warning.Michael Brasser2009-07-201-1/+1
| | | | | | | | | |
| * | | | | | | | | Compile fix.Michael Brasser2009-07-201-1/+1
| | | | | | | | | |
| * | | | | | | | | Add missing docs.Michael Brasser2009-07-203-0/+14
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-07-1923-48/+301
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | | | Fix compilation after change 6626a9Leonardo Sobral Cunha2009-07-172-0/+3
| | | | | | | | |
| * | | | | | | | CompileEskil Abrahamsen Blomfeldt2009-07-1710-41/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 6626a9 broke compilation because several files indirectly depended on a #include that was removed.