Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-07-23 | 6 | -8/+20 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Make sure action events are reversed when not part of a transition. | Michael Brasser | 2009-07-23 | 1 | -1/+4 |
| | | |||||
| * | Stricter matching for ParentChangeAction. | Michael Brasser | 2009-07-23 | 5 | -7/+16 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-07-23 | 43 | -494/+581 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Fix possible crash in XmlListModel. | Michael Brasser | 2009-07-23 | 1 | -0/+2 |
| | | |||||
| * | Fix State when handling. | Michael Brasser | 2009-07-23 | 2 | -4/+3 |
| | | |||||
| * | Minor header cleanup. | Michael Brasser | 2009-07-23 | 3 | -2/+2 |
| | | |||||
| * | remove the id property in QFxItem | Lars Knoll | 2009-07-22 | 2 | -32/+0 |
| | | | | | | | | | | id's are handled by QML directly; the id property here is not actually used anymore. | ||||
| * | unify z-value handling in graphics and fx items. | Lars Knoll | 2009-07-22 | 7 | -33/+12 |
| | | | | | | | | | | | | 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 QFxItem | Lars Knoll | 2009-07-22 | 12 | -50/+0 |
| | | | | | | | | | | propertyInfo was not used by anything, let's just get rid of it. | ||||
| * | More cleanups in QFxItem | Lars Knoll | 2009-07-22 | 3 | -55/+12 |
| | | | | | | | | | | Remove the pos, x and y properties and use the ones in QGraphicsObject instead | ||||
| * | First round of cleanups for QFxItem | Lars Knoll | 2009-07-22 | 6 | -148/+31 |
| | | | | | | | | | | Removed some methods that are already implemented in QGraphicsItem/Object. | ||||
| * | Fix GraphicsObjectContainer. | Michael Brasser | 2009-07-22 | 2 | -0/+2 |
| | | |||||
| * | Remove moveToParent property. | Michael Brasser | 2009-07-22 | 8 | -138/+152 |
| | | | | | | | | Functionality has been moved to ParentChange. | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-21 | 57 | -1032/+971 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-07-21 | 10 | -31/+336 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-21 | 2 | -5/+5 |
| | | |\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | Move the Script interface of QmlComponent to QmlBindableComponent | Alan Alpert | 2009-07-21 | 7 | -27/+286 |
| | | | | | |||||
| | | * | | Update AnimatedImage item to be more similar to Animations | Alan Alpert | 2009-07-20 | 3 | -4/+50 |
| | | | | | | | | | | | | | | | | | | | | Now has playing and paused properties that should behave the same. | ||||
| | * | | | Fix repaint errors. | Michael Brasser | 2009-07-21 | 1 | -2/+7 |
| | | |/ | | |/| | | | | | | | | | Make sure the old bounding rect is repainted when we change size. | ||||
| | * | | Doc clarification. | Michael Brasser | 2009-07-20 | 1 | -2/+1 |
| | | | | |||||
| | * | | Fix crash. | Michael Brasser | 2009-07-20 | 1 | -3/+4 |
| | |/ | |||||
| * | | Add some (disabled) test code for limiting image size. | Warwick Allison | 2009-07-21 | 1 | -1/+24 |
| | | | | | | | | | | | | | | | QFxImage et al could benefit from a limit feature, especially for remote images. | ||||
* | | | Add prototype value type support | Aaron Kennedy | 2009-07-23 | 15 | -124/+758 |
| |/ |/| | |||||
* | | Remove unnecessary methods from QmlBinding | Aaron Kennedy | 2009-07-20 | 2 | -14/+3 |
| | | | | | | | | QmlBinding is no longer instantiable from QML, so this stuff isn't needed. | ||||
* | | Prevent expression evaluation data from overlapping | Aaron Kennedy | 2009-07-20 | 3 | -4/+20 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-07-20 | 18 | -141/+164 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-20 | 8 | -21/+43 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-07-20 | 9 | -115/+109 |
| | |\ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Add an inSync property that holds whether the target has "caught up" | Martin Jones | 2009-07-20 | 2 | -5/+27 |
| | | | | | | | | | | | | | | | | | | | | Useful for determining when the target has finished animating. | ||||
| | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-07-20 | 158 | -16861/+5092 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-07-15 | 4 | -11/+138 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | | Remove unnecessary semicolons | Martin Jones | 2009-07-14 | 6 | -16/+16 |
| | | | | | | | |||||
| * | | | | | | Pause instead of stop when playing == false. | Alan Alpert | 2009-07-20 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix bug in AnimatedImage where it wouldn't show until played | Alan Alpert | 2009-07-20 | 2 | -4/+11 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-20 | 20 | -85/+154 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-20 | 4 | -1/+15 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | | Fix warning. | Michael Brasser | 2009-07-20 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Add missing docs. | Michael Brasser | 2009-07-20 | 3 | -0/+14 |
| | | | |_|/ | | | |/| | | |||||
| | * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-07-19 | 15 | -44/+99 |
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Remove debuggery | Warwick Allison | 2009-07-17 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Add selection control to QFxLineEdit | Alan Alpert | 2009-07-20 | 3 | -113/+93 |
| | | | | | | | | | | | | | | | | | | | | | | | | Should behave the same as in QFxTextEdit | ||||
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-17 | 12 | -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 Alpert | 2009-07-17 | 113 | -14121/+2103 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ \ \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-07-16 | 30 | -644/+546 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | | | | Fix a bug in QmlFollow | Alan Alpert | 2009-07-16 | 1 | -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 handler | Aaron Kennedy | 2009-07-20 | 12 | -327/+245 |
| | | | | | | | | | |||||
* | | | | | | | | | Rename QmlBindableValue to QmlBinding | Aaron Kennedy | 2009-07-20 | 28 | -109/+100 |
| | | | | | | | | | |||||
* | | | | | | | | | Simplify binding optimization | Aaron Kennedy | 2009-07-20 | 4 | -423/+116 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-07-20 | 11 | -41/+54 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui |