summaryrefslogtreecommitdiffstats
path: root/demos
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-05-088-34/+201
|\
| * Fade TagEdit properlyWarwick Allison2009-05-081-0/+1
| * Minimal size is MediaButton size, center outside edit modeWarwick Allison2009-05-081-10/+8
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-088-102/+133
| |\
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Ian Walters2009-05-081-71/+58
| | |\
| | * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Ian Walters2009-05-084-23/+32
| | |\ \
| | * | | Add the ability to remove whole contacts.Ian Walters2009-05-084-29/+70
| * | | | tag inputWarwick Allison2009-05-084-5/+132
* | | | | Fix flickr2Yann Bodson2009-05-082-49/+35
| |_|_|/ |/| | |
* | | | Get the delegate scale correct at the ends of the path.Martin Jones2009-05-081-5/+4
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-083-3/+6
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-05-071-1/+1
| |\ \ \ | | |/ /
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-074-28/+46
| | |\ \
| | * | | Space after tagsWarwick Allison2009-05-071-1/+1
| * | | | Fixes for the slider.Yann Bodson2009-05-073-2/+5
| | |/ / | |/| |
* | | | More path to path fixing.Martin Jones2009-05-081-68/+56
|/ / /
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-073-8/+20
|\ \ \ | | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Ian Walters2009-05-071-2/+3
| |\ \ | | |/
| * | Focus handling for 'new' dialog.Ian Walters2009-05-073-8/+20
* | | Get view to view transitions working properly... for PathView.Martin Jones2009-05-071-20/+26
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-0715-0/+780
|\ \ | |/
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Ian Walters2009-05-074-4/+312
| |\
| * | Use KeyProxyIan Walters2009-05-072-3/+7
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Ian Walters2009-05-0722-397/+345
| |\ \
| * | | Move 'final' contacts application to demos.Ian Walters2009-05-0715-0/+776
* | | | docWarwick Allison2009-05-071-2/+3
| |_|/ |/| |
* | | Forgot progress bar.Martin Jones2009-05-071-0/+25
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-0720-541/+288
|\ \ \
| * | | Use VisualModelYann Bodson2009-05-071-0/+274
| | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-0718-541/+14
| |\ \
| | * | Remove phonebrowser demo. Flickr is better.Aaron Kennedy2009-05-0717-537/+0
| * | | Fix QmlXmlListModel on property changes, on empty results.Warwick Allison2009-05-072-4/+14
* | | | Viewing the same image twice showed no image the second time.Martin Jones2009-05-072-3/+6
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-071-4/+14
|\ \ \ \ | | |/ / | |/| |
| * | | Fix z handling to avoid uglynessAaron Kennedy2009-05-071-4/+14
| |/ /
* | | Add progress reporting to Image and use it in the flickr demo.Martin Jones2009-05-071-1/+7
|/ /
* | Small fix. Rotation was not set back to 0 properly.Yann Bodson2009-05-061-2/+3
* | Add a new Flickr demo.Yann Bodson2009-05-0618-0/+464
|/
* Merge branch 'shader-api' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team i...Michael Brasser2009-05-0612-735/+134
|\
| * Port boxes demo to use math3d throughoutRhys Weatherley2009-05-0112-732/+131
| * Rename QGLShader(Program)::errors() to log()Rhys Weatherley2009-05-011-3/+3
| * Merge branch 'shaderprograms' of git@scm.dev.nokia.troll.no:qt/rweathers-shad...Rhys Weatherley2009-05-017-550/+61
| |\
| | * Import shader implementation from before the history cut.Rhys Weatherley2009-03-237-550/+61
* | | Remove XML custom parser supportAaron Kennedy2009-05-051-1/+1
* | | Use QML signal syntaxAaron Kennedy2009-05-013-8/+3
* | | Use QML properties syntaxAaron Kennedy2009-05-018-55/+27
* | | whitespaceWarwick Allison2009-04-301-0/+1
* | | Port syntaxWarwick Allison2009-04-302-173/+479
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-04-3028-276/+469
|\ \ \
| * | | Convert phonebrowser.Yann Bodson2009-04-307-254/+447