summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix QmlTimer to be in line with animation API changesAlan Alpert2009-11-101-1/+1
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-11-1037-1745/+2526
|\
| * ignore binariesWarwick Allison2009-11-101-0/+1
| * Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Yann Bodson2009-11-1014-82/+159
| |\
| | * binariesWarwick Allison2009-11-101-0/+6
| | * missed fileWarwick Allison2009-11-101-0/+7
| | * missed filesWarwick Allison2009-11-104-0/+28
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-1099-3102/+9554
| | |\
| | * | Remove WebView::pagewidth and tidy up - it's not needed and interferedWarwick Allison2009-11-105-71/+82
| | * | Distinguish between tranform smoothness (from Item) and smoothnessWarwick Allison2009-11-103-3/+34
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-1039-81/+1319
| | |\ \
| | * | | Prepare for QTBUG-5290 being fixed.Warwick Allison2009-11-091-7/+1
| | * | | unwarnWarwick Allison2009-11-091-1/+1
| * | | | renameYann Bodson2009-11-1015-791/+0
| * | | | improve Flickable visual testYann Bodson2009-11-1018-872/+2366
| | |_|/ | |/| |
* | | | ListView and GridView tests.Martin Jones2009-11-103-3/+70
|/ / /
* | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic int...Yann Bodson2009-11-1022-26/+2452
|\ \ \
| * | | Improve text edit testAlan Alpert2009-11-101-0/+52
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-11-1019-7/+2380
| |\ \ \
| | * \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-11-1073-3076/+6971
| | |\ \ \
| | * | | | More highlight testing.Martin Jones2009-11-106-4/+92
| | * | | | ListView tests.Martin Jones2009-11-103-3/+11
| | * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-11-103-9/+9
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Test horizontal listMartin Jones2009-11-109-0/+2243
| | * | | | More Keys testing.Martin Jones2009-11-102-0/+34
| * | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-11-1019-5/+484
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Fix samegame tutorial 3Alan Alpert2009-11-102-19/+20
* | | | | | more Flipable testsYann Bodson2009-11-104-0/+131
| |/ / / / |/| | | |
* | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-11-1054-3071/+6487
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-11-1033-3063/+3647
| |\ \ \ \
| | * | | | Clarify the role of positioner transitionsAlan Alpert2009-11-102-108/+30
| | * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-11-101-3/+3
| | |\ \ \ \
| | * | | | | Positioners now watch for sibling order changesAlan Alpert2009-11-103-9/+75
| | * | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-11-1039-81/+1319
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | Rerecord text visual testsAlan Alpert2009-11-0929-2946/+3542
| | | |_|_|/ | | |/| | |
| * | | | | Test (and fix) animation actions.Michael Brasser2009-11-1021-5/+2837
| | |_|/ / | |/| | |
| * | | | Fix animation tests.Michael Brasser2009-11-101-3/+3
| | |/ / | |/| |
* | | | More XMLHttpRequest testsAaron Kennedy2009-11-1019-5/+484
|/ / /
* | | Fix after animation API changes.Michael Brasser2009-11-093-9/+9
| |/ |/|
* | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Aaron Kennedy2009-11-09550-6059/+13820
|\ \ | |/
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-092-10/+13
| |\
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-11-092-5/+8
| | |\
| | * | Fix layouts testAlan Alpert2009-11-092-10/+13
| * | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-11-0961-284/+8110
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-11-0959-279/+8102
| | |\ \ | | | |/
| | * | Fix perspective in dynamic exampleAlan Alpert2009-11-092-5/+8
| * | | Remove no-op diff to 4.6.Warwick Allison2009-11-091-1/+0
| * | | Revert unneeded differences to Qt 4.6.Warwick Allison2009-11-092-14/+7
| * | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara...Warwick Allison2009-11-09544-6029/+13792
| |\ \ \ | | |/ / | |/| |
| | * | Mistake in the example for QByteArray::lastIndexOf()Keith Isdale2009-11-091-1/+1