Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-10-09 | 1 | -2/+2 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-09 | 1 | -37/+15 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Fix snow demo | Aaron Kennedy | 2009-10-09 | 1 | -2/+2 |
| | | | |||||
* | | | Do not use 'resources:' in examples | Yann Bodson | 2009-10-09 | 3 | -174/+168 |
| |/ |/| | |||||
* | | fixes gridview.qml | Yann Bodson | 2009-10-09 | 1 | -37/+15 |
|/ | | | | Task-number: QT-2271 | ||||
* | Fixes yahoonews.qml | Yann Bodson | 2009-10-09 | 1 | -86/+60 |
| | | | | Task-number: QT-2281 | ||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-10-09 | 4 | -33/+7 |
|\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: examples/declarative/layouts/Button.qml | ||||
| * | Fix example errors | Aaron Kennedy | 2009-10-09 | 3 | -7/+5 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-08 | 2 | -8/+8 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt | ||||
| * \ | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-08 | 12 | -136/+173 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-scriptopt | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-07 | 123 | -735/+1591 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into test Conflicts: demos/declarative/samegame/content/samegame.js tests/auto/declarative/qmlecmascript/tst_qmlecmascript.cpp | ||||
* | \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-10-09 | 23 | -137/+210 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | doc cleanup | Yann Bodson | 2009-10-08 | 2 | -8/+8 |
| | |_|/ | |/| | | |||||
| * | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-08 | 9 | -136/+136 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | move files to avoid duplication. | Yann Bodson | 2009-10-07 | 5 | -20/+0 |
| | | | | | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-10-07 | 42 | -197/+1011 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | Update 'hello world' tutorial. | Yann Bodson | 2009-10-07 | 5 | -77/+97 |
| | | | | | |||||
| * | | | | Allow dial to be built as an exe. | Martin Jones | 2009-10-08 | 3 | -0/+37 |
| | |/ / | |/| | | |||||
| * | | | Switch Same Game tutorial to using snippets properly | Alan Alpert | 2009-10-07 | 11 | -1/+37 |
| | | | | |||||
* | | | | Remove redundant support/ files. | Bea Lam | 2009-10-08 | 5 | -446/+0 |
| | | | | |||||
* | | | | Clean up | Bea Lam | 2009-10-08 | 8 | -98/+277 |
|/ / / | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-10-07 | 39 | -0/+975 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-10-07 | 65 | -557/+549 |
| |\ \ \ | | |/ / | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Add SameGame based advanced tutorial | Alan Alpert | 2009-10-07 | 39 | -0/+975 |
| | | | | | | | | | | | | | | | | | | | | Could use some cleanup, as I didn't manage to get code snippets working correctly. Also might benefit from being re-written by a good tutor. | ||||
* | | | | Remove QFxFlowView and flowview example (will be moved to | Bea Lam | 2009-10-07 | 3 | -197/+0 |
| |/ / |/| | | | | | | | | | | | research/declarative-ui-examples). Functionality should eventually be added to grid view. | ||||
* | | | lowercase ids | Yann Bodson | 2009-10-06 | 1 | -5/+5 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Yann Bodson | 2009-10-06 | 8 | -0/+60 |
|\ \ \ | |/ / | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-06 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-05 | 10 | -19/+20 |
| |\ \ \ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-10-05 | 14 | -52/+77 |
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | Allow GridView key navigation to be overridden. | Martin Jones | 2009-09-30 | 8 | -0/+60 |
| | | | | | | | | | | | | | | | | | | | | Also add GridView example. | ||||
* | | | | | lowercase ids | Yann Bodson | 2009-10-06 | 64 | -552/+544 |
| |_|_|/ |/| | | | |||||
* | | | | Fix following API changes. | Bea Lam | 2009-10-06 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-10-05 | 2 | -10/+10 |
|\ \ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | Change .sci syntax to match BorderImage. | Yann Bodson | 2009-10-05 | 2 | -10/+10 |
| | |/ | |/| | |||||
* | | | Fix example following API changes and fix window size for example 2. | Bea Lam | 2009-10-05 | 8 | -9/+10 |
|/ / | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-10-04 | 1 | -1/+17 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Enable QGraphicsBloomEffect in QML. | Andreas Aardal Hanssen | 2009-10-02 | 1 | -1/+17 |
| | | | | | | | | | | | | | | | | | | Also add this to the effect example. Reviewed-by: Aaron Kennedy | ||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Bea Lam | 2009-10-02 | 3 | -16/+17 |
|\ \ \ | |/ / | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | cleanup examples | Yann Bodson | 2009-10-02 | 3 | -16/+17 |
| | | | |||||
* | | | Update following component file name changes. | Bea Lam | 2009-10-02 | 1 | -22/+22 |
| | | | |||||
* | | | Make compile since QmlValuePropertySource is no longer a Qobject. | Bea Lam | 2009-10-02 | 6 | -4/+11 |
| | | | |||||
* | | | Use void return type for setter methods. | Bea Lam | 2009-10-02 | 2 | -8/+8 |
|/ / | |||||
* | | Enhance layout example | Alan Alpert | 2009-10-01 | 1 | -1/+2 |
|/ | | | | It's actually useful now. A lot slower too. | ||||
* | Update test | Aaron Kennedy | 2009-09-29 | 1 | -2/+2 |
| | |||||
* | Another focusscope test | Aaron Kennedy | 2009-09-29 | 1 | -0/+75 |
| | |||||
* | Only same-as-webkit iteration example (QML actually supports more) | Warwick Allison | 2009-09-24 | 1 | -8/+1 |
| | |||||
* | Use new property name | Aaron Kennedy | 2009-09-23 | 1 | -2/+2 |
| | |||||
* | Fix crash | Aaron Kennedy | 2009-09-23 | 1 | -2/+2 |
| | |||||
* | Replaced by testcases. | Warwick Allison | 2009-09-22 | 20 | -117/+0 |
| | | | | Was not a helpful example. |