summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix headersWarwick Allison2009-10-29286-4537/+4617
* fix headersWarwick Allison2009-10-2942-56/+1598
* fix merge duplicationWarwick Allison2009-10-291-1/+0
* Update viewport size when items are added/removed/resized.Martin Jones2009-10-282-4/+34
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-28160-7439/+541
|\
| * Fixed possible crash when inserting semicolon.Roberto Raggi2009-10-284-4/+4
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-285-2/+46
| |\
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-10-282-1/+28
| | |\
| | | * missing commitWarwick Allison2009-10-281-0/+27
| | | * Mac-safe sanity check.Warwick Allison2009-10-281-1/+1
| | * | Add missing fileAlan Alpert2009-10-281-0/+8
| | |/
| | * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2009-10-2869-85/+239
| | |\
| | * | Use ShellMode for creator plugin expression widget.Bea Lam2009-10-282-1/+10
| * | | DocAaron Kennedy2009-10-281-106/+107
| * | | Remove QML SQL classesAaron Kennedy2009-10-2873-7165/+2
| | |/ | |/|
| * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-285-10/+65
| |\ \
| | * | Incorporate latest optical theory.Warwick Allison2009-10-282-3/+15
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-28135-517/+1037
| | |\ \
| | * | | Test visibility.Warwick Allison2009-10-282-4/+16
| | * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-2829-160/+351
| | |\ \ \
| | * \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-2774-266/+2198
| | |\ \ \ \
| | * | | | | Test remote QML contentWarwick Allison2009-10-271-0/+28
| | * | | | | Fix remote content loading for absolute URLsWarwick Allison2009-10-271-3/+6
| * | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-2835-61/+106
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-10-28101-318/+622
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Yann Bodson2009-10-2854-95/+227
| | | |\ \ \ \ \
| | | * | | | | | cleanupYann Bodson2009-10-2820-42/+42
| | * | | | | | | Doc.Michael Brasser2009-10-2815-19/+64
| * | | | | | | | Make test more robustAaron Kennedy2009-10-281-8/+17
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-2814-84/+150
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Bea Lam2009-10-2873-383/+847
| | |\ \ \ \ \ \
| | * | | | | | | Must delete query objects once disconnected.Bea Lam2009-10-281-1/+8
| | * | | | | | | Show contents of list properties within the debugger (like the CreatorBea Lam2009-10-2810-76/+129
| | * | | | | | | Auto-select first tree item after reload.Bea Lam2009-10-282-2/+3
| | * | | | | | | Fix crash bug where watch is already deletedBea Lam2009-10-281-1/+2
| | * | | | | | | Check values when remove() is calledBea Lam2009-10-281-4/+8
| * | | | | | | | Make more mac friendlyAaron Kennedy2009-10-2829-6/+51
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-2841-186/+379
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-10-2841-184/+391
| |\ \ \ \ \ \ \
| | * | | | | | | WhoopsAaron Kennedy2009-10-281-1/+0
| | * | | | | | | Ensure all tests appear in pro fileAaron Kennedy2009-10-281-0/+3
| | * | | | | | | Use a nicer face imageAaron Kennedy2009-10-288-0/+7
| | * | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-2813-135/+94
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Yann Bodson2009-10-2815-28/+236
| | | |\ \ \ \ \ \
| | | * | | | | | | cleanupYann Bodson2009-10-2810-15/+15
| | | * | | | | | | cleanupYann Bodson2009-10-283-120/+79
| | * | | | | | | | "Compile"Aaron Kennedy2009-10-281-1/+1
| | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-10-2826-201/+377
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Yann Bodson2009-10-289-27/+129
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | * | | | | | make TextElideMode an enum of QFxText.Yann Bodson2009-10-283-18/+23