summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix (properly) test image saving.Warwick Allison2009-10-081-2/+3
* Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-0816-38/+236
|\
| * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-10-0812-26/+223
| |\
| | * Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-0834-734/+716
| | |\
| | | * doc cleanupYann Bodson2009-10-084-3/+4
| | * | Allow dial to be built as an exe.Martin Jones2009-10-083-0/+37
| | * | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-0777-756/+1341
| | |\ \
| | * \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-06359-2531/+5081
| | |\ \ \
| | * | | | Auto tests for QmlTimerMartin Jones2009-10-065-23/+182
| * | | | | Rename preserveSelection to persistentSelectionAlan Alpert2009-10-084-12/+13
| | |_|_|/ | |/| | |
* | | | | Fix relative-URLs of test scriptsWarwick Allison2009-10-081-2/+3
* | | | | Font-portable.Warwick Allison2009-10-086-301/+220
* | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-0734-733/+714
|\ \ \ \ \ | |/ / / /
| * | | | doc cleanupYann Bodson2009-10-079-322/+322
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-10-072-0/+1
| |\ \ \ \
| | * | | | Fix QFxTextInputAlan Alpert2009-10-071-0/+1
| | * | | | Smaller gif file for the advanced tutorialAlan Alpert2009-10-071-0/+0
| * | | | | move files to avoid duplication.Yann Bodson2009-10-078-40/+20
| |/ / / /
| * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-10-071-36/+44
| |\ \ \ \
| | * \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-075-0/+119
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Martin Jones2009-10-0776-748/+1314
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Compile on Symbian.Martin Jones2009-10-071-36/+44
| * | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Yann Bodson2009-10-0782-756/+1460
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Get two of those new autotests to pass.Alan Alpert2009-10-074-21/+19
| | * | | | | Add three failing tests to the QML ECMAscript autotestAlan Alpert2009-10-075-0/+121
| | | |/ / / | | |/| | |
| * | | | | Update 'hello world' tutorial.Yann Bodson2009-10-0714-319/+192
| | |_|_|/ | |/| | |
* | | | | typosWarwick Allison2009-10-077-12/+12
| |/ / / |/| | |
* | | | Switch Same Game tutorial to using snippets properlyAlan Alpert2009-10-0717-367/+73
* | | | SameGame tutorial imagesAlan Alpert2009-10-074-0/+0
* | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Bea Lam2009-10-0766-62/+1608
|\ \ \ \
| * \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-10-0719-49/+54
| |\ \ \ \
| | * \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-07358-2537/+5050
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Fix portability of visual tests: fix filenames to be relative to base (URL).Warwick Allison2009-10-0716-46/+48
| | * | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-062-2/+58
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Warwick Allison2009-10-06122-1259/+1495
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Test icon() property.Warwick Allison2009-10-063-3/+6
| * | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-10-07432-3130/+5691
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Add SameGame based advanced tutorialAlan Alpert2009-10-0745-0/+1540
| * | | | | | Refactor tileSize to the gameCanvas itemAlan Alpert2009-10-072-13/+13
| * | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Alan Alpert2009-10-0662-723/+1072
| |\ \ \ \ \ \
| * | | | | | | Consistent Commenting in SamegameAlan Alpert2009-10-051-0/+1
* | | | | | | | Remove QFxFlowView and flowview example (will be moved toBea Lam2009-10-076-686/+0
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Bea Lam2009-10-07356-2527/+5018
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-10-061-2/+5
| |\ \ \ \ \ \
| * | | | | | | Simplify Rectangle painting.Michael Brasser2009-10-061-30/+7
| * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-06355-2497/+5011
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | Update EABI DEF files for Symbian OSIain2009-10-065-40/+157
| | * | | | | | Merge branch '4.5' into 4.6Thiago Macieira2009-10-061-6/+80
| | |\ \ \ \ \ \
| | | * | | | | | Autotest: add a few more tests, with IP address and actual hostnameThiago Macieira2009-10-061-4/+74
| | | * | | | | | Autotest: use port 12346 instead of 1, to ensure that it's not aThiago Macieira2009-10-061-2/+7