summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-11-2424-71/+349
|\
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2009-11-245-8/+89
| |\
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Michael Brasser2009-11-243-24/+24
| | |\
| | * | Prevent state changes within PropertyChanges.Michael Brasser2009-11-245-8/+89
| * | | Fix doc example codeBea Lam2009-11-241-18/+28
| | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2009-11-2425-112/+437
| |\ \ | | |/
| | * missed fileWarwick Allison2009-11-241-0/+20
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-2411-21/+73
| | |\
| | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Aaron Kennedy2009-11-2468-272/+523
| | | |\
| | | | * Doc.Michael Brasser2009-11-244-9/+39
| | | | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Michael Brasser2009-11-2411-111/+235
| | | | |\
| | | | * | Doc.Michael Brasser2009-11-233-8/+34
| | | * | | DocAaron Kennedy2009-11-234-4/+0
| | * | | | Tic-tac-toe.Warwick Allison2009-11-244-0/+115
| | | |_|/ | | |/| |
| * | | | Minor doc improvementsBea Lam2009-11-243-24/+24
* | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-11-23165-715/+4058
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-11-2353-143/+210
| |\ \ \ \
| | * \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-236-29/+33
| | |\ \ \ \ | | | |/ / /
| | | * | | Avoid warningsBea Lam2009-11-232-20/+6
| | | | |/ | | | |/|
| | | * | QmlView doc.Michael Brasser2009-11-231-0/+1
| | | * | QmlView doc.Michael Brasser2009-11-231-0/+3
| | | * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Michael Brasser2009-11-232-4/+8
| | | |\ \
| | | | * \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Bea Lam2009-11-2356-187/+411
| | | | |\ \
| | | | * | | Fix occasionally-failing debug tests.Bea Lam2009-11-232-4/+8
| | | * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Michael Brasser2009-11-2347-158/+211
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | * | | | Doc.Michael Brasser2009-11-231-5/+15
| | | | |_|/ | | | |/| |
| | * | | | Parameter order was wrong.Warwick Allison2009-11-231-1/+1
| | * | | | check warningsWarwick Allison2009-11-231-14/+24
| | * | | | Fix warningWarwick Allison2009-11-233-3/+3
| | * | | | Check error messages returned.Warwick Allison2009-11-231-14/+20
| | | |/ / | | |/| |
| | * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-237-77/+82
| | |\ \ \
| | * | | | Use console.log, not printWarwick Allison2009-11-232-2/+2
| | * | | | Use console.log, not printWarwick Allison2009-11-2312-40/+40
| | * | | | Use console.log, not print.Warwick Allison2009-11-2325-39/+60
| | * | | | Webkit console.log() compatibility.Warwick Allison2009-11-232-1/+27
| * | | | | toggle switch example documentationYann Bodson2009-11-233-59/+181
| | |/ / / | |/| | |
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-11-2328-36/+588
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Aaron Kennedy2009-11-238-28/+200
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-231-24/+68
| | | |\ \
| | | | * | Documentation fixesBill King2009-11-231-24/+68
| | | * | | Demonstrate "container" type objects.Warwick Allison2009-11-232-0/+71
| | | |/ /
| | | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-2320-8/+389
| | | |\ \
| | | | * | Doc.Michael Brasser2009-11-231-1/+1
| | | | |/
| | | * | Test error messages.Warwick Allison2009-11-231-0/+53
| | | * | Tidy (and fix) error messages.Warwick Allison2009-11-231-3/+3
| | | * | Test one-past-end setting (not error; same as append).Warwick Allison2009-11-231-0/+1
| | | * | Test setting property when not set before.Warwick Allison2009-11-231-0/+1
| | | * | Check initial preferredHeight.Warwick Allison2009-11-221-0/+1
| | | * | ignore chart exeWarwick Allison2009-11-221-0/+1
| | * | | CrashAaron Kennedy2009-11-231-1/+0
| | | |/ | | |/|