Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-14 | 2 | -6/+26 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Workaround QUrl::toLocalFile not knowing about qrc: | Warwick Allison | 2009-10-14 | 2 | -6/+26 |
| | | | | | | | | QNetworkAccess does similar things. | ||||
* | | Add list accessors for Item::children and Item::resources | Aaron Kennedy | 2009-10-14 | 1 | -10/+18 |
|/ | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-10-13 | 3 | -23/+240 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Make sure effects are still included. | Michael Brasser | 2009-10-13 | 1 | -0/+2 |
| | | |||||
| * | Add basic QML docs for the effects. | Michael Brasser | 2009-10-12 | 3 | -24/+239 |
| | | |||||
* | | More i18n | Warwick Allison | 2009-10-13 | 4 | -22/+22 |
|/ | |||||
* | Use utf8 instead of latin1 where appropriate | Aaron Kennedy | 2009-10-12 | 3 | -12/+11 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-10-09 | 6 | -76/+54 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-10-09 | 5 | -102/+135 |
| |\ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: examples/declarative/layouts/Button.qml | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-09 | 4 | -72/+89 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt | ||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-09 | 2 | -45/+82 |
| | | |\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | No need for temporary currentItem | Martin Jones | 2009-10-09 | 2 | -27/+7 |
| | | | | | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-08 | 4 | -8/+8 |
| | |\ \ \ | | | |/ / | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt | ||||
| | * | | | Fix visual model crash at shutdown due to dangling pointer | Aaron Kennedy | 2009-10-08 | 1 | -30/+46 |
| | | | | | |||||
| * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-10-09 | 9 | -39/+40 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Remove redundant QFxItem::activeFocusChanged(); is not used anywhere, | Bea Lam | 2009-10-07 | 3 | -19/+1 |
| | | | | | | | | | | | | | | | | | | | | presumedly replaced by QFxItem::focusChanged(). | ||||
* | | | | | Add missing NOTIFY | Yann Bodson | 2009-10-09 | 8 | -13/+19 |
| |_|_|/ |/| | | | |||||
* | | | | GraphicsObjectContainer cleanup. | Michael Brasser | 2009-10-09 | 2 | -45/+82 |
| |/ / |/| | | | | | | | | | | | Also fixes initial size of widget if the container has an explicit size set. | ||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-08 | 3 | -12/+12 |
|\ \ \ | | |/ | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-10-08 | 1 | -19/+19 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Rename preserveSelection to persistentSelection | Alan Alpert | 2009-10-08 | 3 | -12/+12 |
| | | | | | | | | | | | | | | | | Task-number: QT-1113 | ||||
* | | | | Remove a bunch of unneeded semicolons. | Martin Jones | 2009-10-08 | 4 | -8/+8 |
| |/ / |/| | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-08 | 1 | -0/+1 |
|\ \ \ | |/ / | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Fix QFxTextInput | Alan Alpert | 2009-10-07 | 1 | -0/+1 |
| |/ | | | | | | | It was accepting input on both press and release, for some reason | ||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-06 | 3 | -32/+65 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Simplify Rectangle painting. | Michael Brasser | 2009-10-06 | 1 | -30/+7 |
| | | |||||
| * | Added properties highlightMoveSpeed and highlightResizeSpeed (ListView) | Christiaan Janssen | 2009-10-06 | 2 | -2/+58 |
| | | | | | | | | | | | | | | | | The speed of the moving and resizing animations of the highlight component were hardcoded, now they are accessible through these new properties. Reviewed-by: thartman | ||||
* | | Auto tests for QmlTimer | Martin Jones | 2009-10-06 | 1 | -19/+19 |
|/ | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-06 | 1 | -2/+7 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | doc fixes | Yann Bodson | 2009-10-06 | 1 | -0/+2 |
| | | |||||
| * | Fix display of rounded Rectangles with border and odd radius. | Christian Kamm | 2009-10-05 | 1 | -2/+5 |
| | | | | | | | | | | | | Due to a rounding issue the sum of the margins was larger than the pixmap size, causing qDrawBorderPixmap to only draw the corners and leaving the sides and center blank. | ||||
* | | Some docs on data models. | Martin Jones | 2009-10-06 | 5 | -1/+13 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-05 | 5 | -21/+119 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | update doc | Yann Bodson | 2009-10-05 | 1 | -13/+10 |
| | | |||||
| * | Change .sci syntax to match BorderImage. | Yann Bodson | 2009-10-05 | 1 | -5/+5 |
| | | |||||
| * | Experiment with syncing GraphicsObjectContainer and QGraphicsWidget sizes. | Michael Brasser | 2009-10-05 | 2 | -2/+103 |
| | | |||||
| * | Fix Rectangle size when drawing with qDrawBorderPixmap. | Michael Brasser | 2009-10-05 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-05 | 6 | -51/+17 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Update Rectangle to use qDrawBorderPixmap. | Michael Brasser | 2009-10-05 | 1 | -35/+3 |
| | | |||||
| * | Make compile. | Michael Brasser | 2009-10-04 | 1 | -1/+1 |
| | | |||||
| * | Enable QGraphicsBloomEffect in QML. | Andreas Aardal Hanssen | 2009-10-02 | 1 | -0/+4 |
| | | | | | | | | | | | | Also add this to the effect example. Reviewed-by: Aaron Kennedy | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-10-02 | 5 | -25/+45 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Fix repeater item ordering | Alan Alpert | 2009-09-30 | 2 | -15/+2 |
| | | | | | | | | | | | | | | | Note that while QT-2241 exists there will still be an issue with the specific usecase of placing a repeater inside a positioner | ||||
| * | | Try to restore stacking order when restoring from a ParentChange. | Michael Brasser | 2009-10-02 | 1 | -0/+7 |
| | | | |||||
* | | | Have repeater handle items being added/removed/moved by the model. | Martin Jones | 2009-09-30 | 2 | -3/+24 |
| | | | | | | | | | | | | | | | | | | | | | Currently this just recreates every item. Once repeater is able to correctly insert child items this needs to be revisited. Task-number: QT-745 | ||||
* | | | Allow GridView key navigation to be overridden. | Martin Jones | 2009-09-30 | 3 | -40/+138 |
| |/ |/| | | | | | Also add GridView example. | ||||
* | | Make sure the delayed press event is exactly the same as the original. | Martin Jones | 2009-09-29 | 1 | -2/+9 |
| | | |||||
* | | Some fixes for ListView key handling. | Martin Jones | 2009-09-29 | 2 | -8/+34 |
|/ | | | | | Accept auto repeated keys in wrap mode even at the ends. Allow Keys.onLeftPressed, etc. to override default key handling. | ||||
* | Give more error information on failed image loading. | Michael Brasser | 2009-09-28 | 1 | -0/+1 |
| |