summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Clean upBea Lam2009-10-088-98/+277
* Remove redundant QFxItem::activeFocusChanged(); is not used anywhere,Bea Lam2009-10-076-24/+5
* 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
| | * | | | | | | 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
| | | | * | | | | | | Moved maxDepth out of state object and got rid of unused state members.Samuel Rødal2009-10-062-14/+9
| | | | * | | | | | | Fixed missing stencil buffer clear when scissor testing is disabled.Samuel Rødal2009-10-061-1/+3
| | | * | | | | | | | QScriptContext::parentContext: don't skip unessecary framesOlivier Goffart2009-10-062-2/+1
| | | * | | | | | | | Merge commit 'qt/4.6' into mmfphononFrans Englich2009-10-06361-2254/+4707
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Removed ICON for apps and demos except fluidlauncher and desktopservicesEspen Riskedal2009-10-063-31/+2
| | | | * | | | | | | | Better compile fix.Alexis Menard2009-10-061-1/+1
| | | | * | | | | | | | tst_qnetworkreply: httpConnectionCount test improvementsMarkus Goetz2009-10-061-3/+7
| | | | * | | | | | | | Build fix.Alexis Menard2009-10-061-1/+1
| | | | * | | | | | | | add test for QT-2270Kent Hansen2009-10-061-0/+17
| | | | * | | | | | | | Needed to set ENABLE_YARR_JIT to not compile MacroAssembler.cppJørgen Lind2009-10-062-4/+16
| | | | * | | | | | | | tst_qhttpnetworkconnection: Some more checksMarkus Goetz2009-10-061-2/+14
| | | | * | | | | | | | Fixing the compile bug for Symbian when using ARMV5Aleksandar Sasha Babic2009-10-062-0/+5
| | | | |/ / / / / / /
| | | | * | | | | | | add missing includeKent Hansen2009-10-061-0/+1