Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2009-11-10 | 24 | -146/+207 |
|\ | | | | | | | into kinetic-declarativeui | ||||
| * | Oops... | Yann Bodson | 2009-11-10 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-11-10 | 19 | -631/+726 |
| |\ | | | | | | | | | | into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-10 | 12 | -602/+632 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | More Loader testing. | Martin Jones | 2009-11-10 | 8 | -29/+94 |
| | | | | |||||
| * | | | Ids should be lowercase | Yann Bodson | 2009-11-10 | 17 | -118/+114 |
| |/ / | |||||
* | | | Missing files | Bea Lam | 2009-11-10 | 2 | -0/+802 |
| |/ |/| | |||||
* | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2009-11-10 | 728 | -10993/+27508 |
|\ \ | |/ | | | | | into kinetic-declarativeui | ||||
| * | Fix docs missed after properties -> matchProperties rename. | Michael Brasser | 2009-11-10 | 1 | -3/+3 |
| | | |||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-10 | 8 | -1/+203 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-11-10 | 5 | -4/+72 |
| | |\ | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | Fix QmlTimer to be in line with animation API changes | Alan Alpert | 2009-11-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Flickable autotests | Yann Bodson | 2009-11-10 | 7 | -0/+202 |
| | | | | |||||
| * | | | Add scrollbar to flickable to test visualArea | Martin Jones | 2009-11-10 | 11 | -494/+508 |
| | |/ | |/| | |||||
| * | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-10 | 37 | -1745/+2526 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | ignore binaries | Warwick Allison | 2009-11-10 | 1 | -0/+1 |
| | |/ | |||||
| | * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-11-10 | 14 | -82/+159 |
| | |\ | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | | * | binaries | Warwick Allison | 2009-11-10 | 1 | -0/+6 |
| | | | | |||||
| | | * | missed file | Warwick Allison | 2009-11-10 | 1 | -0/+7 |
| | | | | |||||
| | | * | missed files | Warwick Allison | 2009-11-10 | 4 | -0/+28 |
| | | | | |||||
| | | * | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-10 | 99 | -3102/+9554 |
| | | |\ | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | Remove WebView::pagewidth and tidy up - it's not needed and interfered | Warwick Allison | 2009-11-10 | 5 | -71/+82 |
| | | | | | | | | | | | | | | | | | | | | with zoomFactor. | ||||
| | | * | | Distinguish between tranform smoothness (from Item) and smoothness | Warwick Allison | 2009-11-10 | 3 | -3/+34 |
| | | | | | | | | | | | | | | | | | | | | of the painted chunks (often want the latter not the former). | ||||
| | | * | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-10 | 39 | -81/+1319 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | Prepare for QTBUG-5290 being fixed. | Warwick Allison | 2009-11-09 | 1 | -7/+1 |
| | | | | | | |||||
| | | * | | | unwarn | Warwick Allison | 2009-11-09 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | rename | Yann Bodson | 2009-11-10 | 15 | -791/+0 |
| | | | | | | |||||
| | * | | | | improve Flickable visual test | Yann Bodson | 2009-11-10 | 18 | -872/+2366 |
| | | |_|/ | | |/| | | |||||
| * | | | | ListView and GridView tests. | Martin Jones | 2009-11-10 | 3 | -3/+70 |
| |/ / / | |||||
| * | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Yann Bodson | 2009-11-10 | 22 | -26/+2452 |
| |\ \ \ | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| | * | | | Improve text edit test | Alan Alpert | 2009-11-10 | 1 | -0/+52 |
| | | | | | |||||
| | * | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-10 | 19 | -7/+2380 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-10 | 73 | -3076/+6971 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | | More highlight testing. | Martin Jones | 2009-11-10 | 6 | -4/+92 |
| | | | | | | | |||||
| | | * | | | | ListView tests. | Martin Jones | 2009-11-10 | 3 | -3/+11 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-10 | 3 | -9/+9 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | | Test horizontal list | Martin Jones | 2009-11-10 | 9 | -0/+2243 |
| | | | | | | | |||||
| | | * | | | | More Keys testing. | Martin Jones | 2009-11-10 | 2 | -0/+34 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-10 | 19 | -5/+484 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | | Fix samegame tutorial 3 | Alan Alpert | 2009-11-10 | 2 | -19/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the js file hadn't been updated to avoid global vars Also updating a missed particles element | ||||
| * | | | | | | more Flipable tests | Yann Bodson | 2009-11-10 | 4 | -0/+131 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-11-10 | 54 | -3071/+6487 |
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-11-10 | 33 | -3063/+3647 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | | Clarify the role of positioner transitions | Alan Alpert | 2009-11-10 | 2 | -108/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are only for the positioner's position changes, other changes are under the designers control and the designer should animate them. Task-number: QT-2239 | ||||
| | | * | | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-10 | 1 | -3/+3 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | | | Positioners now watch for sibling order changes | Alan Alpert | 2009-11-10 | 3 | -9/+75 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2241 | ||||
| | | * | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-11-10 | 39 | -81/+1319 |
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | | * | | | | | Rerecord text visual tests | Alan Alpert | 2009-11-09 | 29 | -2946/+3542 |
| | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | Should have had mouse in there too. | ||||
| | * | | | | | Test (and fix) animation actions. | Michael Brasser | 2009-11-10 | 21 | -5/+2837 |
| | | |_|/ / | | |/| | | | |||||
| | * | | | | Fix animation tests. | Michael Brasser | 2009-11-10 | 1 | -3/+3 |
| | | |/ / | | |/| | |