summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix QFxTextInputAlan Alpert2009-10-071-0/+1
* Smaller gif file for the advanced tutorialAlan Alpert2009-10-071-0/+0
* 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
| | |/ | |/|
| * | 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
| |\ \ \ \ \ \
| * | | | | | | Fix so items are stretched to width of viewer if viewer is resized;Bea Lam2009-10-071-8/+27
* | | | | | | | Update 'hello world' tutorial.Yann Bodson2009-10-0714-319/+192
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Michael Brasser2009-10-061-2/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic...Bea Lam2009-10-06129-1306/+1700
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Fix to not crash if item has no parent for some reason.Bea Lam2009-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
| * | | | | | | API review: change function name to setUseSystemConfiguration.Thiago Macieira2009-10-062-3/+3
| * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Shane Kearns2009-10-06198-720/+2342
| |\ \ \ \ \ \ \
| | * | | | | | | Optimized restore() in GL 2 paint engine.Samuel Rødal2009-10-062-19/+46
| | * | | | | | | Merge branch 'stencil-clipping' into 4.6Samuel Rødal2009-10-062-201/+261
| | |\ \ \ \ \ \ \
| | | * | | | | | | Changed GL 2 engine render text implementation to use glDepthRange().Samuel Rødal2009-10-062-16/+30
| | | * | | | | | | Made depth tested renderText() work after stencil clipping change.Samuel Rødal2009-10-061-7/+10
| | | * | | | | | | Added convex polygon optimization to QGL2PaintEngineExPrivate::fill().Samuel Rødal2009-10-061-5/+4
| | | * | | | | | | Switched to using stencil instead of depth buffer for clipping.Samuel Rødal2009-10-062-121/+173
| | | * | | | | | | Moved GL 2 clip clearing code into a common function.Samuel Rødal2009-10-062-14/+15
| | | * | | | | | | Got rid of some redundant state changes regarding GL depth state.Samuel Rødal2009-10-061-14/+9
| | | * | | | | | | Renamed GL 2 engine variables to be clip buffer agnostic.Samuel Rødal2009-10-062-52/+52
| | | * | | | | | | Switched to using GL_LEQUAL instead of GL_LESS in GL 2 engine.Samuel Rødal2009-10-061-10/+11
| | | * | | | | | | Made GL 2 paint engine waste less bits in clipping algorithm.Samuel Rødal2009-10-061-5/+4
| | | * | | | | | | Refactored GL 2 engine UniteClip to always increase max depth.Samuel Rødal2009-10-061-3/+2