summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-0826-97/+252
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-05-078-11/+13
| |\
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-076-9/+12
| | |\
| | | * Make sure cancelling image loading cancels progress reporting.Martin Jones2009-05-076-9/+12
| | * | Fix double-click.Warwick Allison2009-05-071-1/+0
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-0713-53/+172
| | |\ \ | | | |/
| | * | Space after tagsWarwick Allison2009-05-071-1/+1
| * | | Fixes for the slider.Yann Bodson2009-05-073-2/+5
| | |/ | |/|
| * | Fix loading of components containing sub components through QmlDomKai Koehne2009-05-073-6/+14
| * | Add test case for QmlDom - loading a component with sub componentsKai Koehne2009-05-072-1/+17
| * | 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-0716-42/+458
| | |\ \ | | | |/
| | * | Focus handling for 'new' dialog.Ian Walters2009-05-073-8/+20
| * | | Get view to view transitions working properly... for PathView.Martin Jones2009-05-076-40/+123
| | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-0743-607/+1381
| |\ \
| * | | Menus for video recordingWarwick Allison2009-05-073-29/+59
| * | | docWarwick Allison2009-05-071-2/+3
* | | | Warn when dereferencing a non-existant nameAaron Kennedy2009-05-082-0/+2
| |/ / |/| |
* | | Add property view to the debuggerAaron Kennedy2009-05-075-3/+205
* | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-0728-557/+800
|\ \ \ | | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Ian Walters2009-05-0722-98/+726
| |\ \
| * | | Use KeyProxyIan Walters2009-05-072-3/+7
| * | | Use focus property, not active focus for control focusIan Walters2009-05-072-18/+9
| * | | KeyProxy to send to focused child of focus realms.Ian Walters2009-05-073-2/+11
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Ian Walters2009-05-07121-1912/+2500
| |\ \ \
| * | | | Move 'final' contacts application to demos.Ian Walters2009-05-0723-537/+776
* | | | | Add a QmlDebuggerStatus interface elements can use to interact with the debuggerAaron Kennedy2009-05-0710-10/+193
| |_|/ / |/| | |
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-071-0/+25
|\ \ \ \ | | |_|/ | |/| |
| * | | Forgot progress bar.Martin Jones2009-05-071-0/+25
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-078-38/+181
|\ \ \ \ | |/ / /
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-076-20/+60
| |\ \ \
| * | | | Don't crashMartin Jones2009-05-072-14/+15
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-0735-575/+346
| |\ \ \ \
| * | | | | Viewing the same image twice showed no image the second time.Martin Jones2009-05-073-3/+17
| * | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-05-0779-605/+1220
| |\ \ \ \ \
| * | | | | | Add progress reporting to Image and use it in the flickr demo.Martin Jones2009-05-076-11/+93
| * | | | | | Doc.Martin Jones2009-05-061-11/+57
* | | | | | | Disable watcher table selectionAaron Kennedy2009-05-071-0/+1
* | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-077-20/+334
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Tweaks to viewer.Michael Brasser2009-05-073-6/+34
| * | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-072-0/+280
| |\ \ \ \ \ \
| | * | | | | | Add missing 'Quit' menu item.Yann Bodson2009-05-071-0/+6
| | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-05-071-1/+6
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Use VisualModelYann Bodson2009-05-071-0/+274
| * | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-0734-579/+86
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-05-0720-243/+547
| |\ \ \ \ \ \
| * | | | | | | Use correct 'from' value for repeating animations.Michael Brasser2009-05-073-14/+20
* | | | | | | | Add "watchers" to debuggerAaron Kennedy2009-05-076-40/+185
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-05-0716-37/+66
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-05-0738-784/+561
| |\ \ \ \ \ \