summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-311-0/+3
|\
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-10-301-0/+3
| |\
| | * Fix Windows compilation.Samuel Rødal2010-10-271-0/+1
| | * Fixed race condition in raster paint engine.Samuel Rødal2010-10-271-0/+2
* | | Fix the license in files for LighthouseJørgen Lind2010-10-284-0/+164
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-271-1/+20
|\ \ \
| * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-261-1/+20
| |\ \ \ | | |/ /
| | * | Remove qdrawhelper_arm_simd.cpp dependency to u32std.hJani Hautakangas2010-10-261-1/+20
* | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2615-1057/+376
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-251-0/+2
| |\ \ \
| | * | | Fix for QTBUG-14497 - X11 error (X_CopyRect/BadMatch) when using a translucen...Christian Ehrlicher2010-10-251-0/+2
| * | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-254-4/+4
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fixed many spelling errors.Rohan McGovern2010-10-254-4/+4
| * | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-2510-1053/+370
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-157-1038/+355
| | |\ \
| | | * | Clean up ARM SIMD drawhelper code and make sure it works.Jani Hautakangas2010-10-157-1038/+355
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-123-15/+15
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-123-15/+15
| | | |\ \
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-083-15/+15
| | | | |\ \
| | | | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Morten Engvoldsen2010-10-071-22/+41
| | | | | |\ \
| | | | | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-049-31/+15
| | | | | |\ \ \
| | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-044-15/+49
| | | | | |\ \ \ \
| | | | | * | | | | Doc: Fixed the in-repository licenses for the documentation.David Boddie2010-10-043-15/+15
* | | | | | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-2212-38/+448
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Fix the #ifdef position.Fabien Freling2010-10-202-4/+4
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-193-2/+14
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Enable the unified toolbar with the rasterFabien Freling2010-10-193-2/+14
| * | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-151-4/+2
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| / / / / / / / / | | |/ / / / / / / /
| | * | | | | | | | Remove unnecessary calls to GetHorizBounds() + boundingBox()Alessandro Portale2010-10-121-4/+2
| | |/ / / / / / /
| * | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-10-121-3/+5
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-121-3/+5
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Crash fix when using the runtime graphics system on Symbian.Jason Barron2010-10-121-3/+5
| | | |/ / / / / /
| * | | | | | | | Fix text position with OpenGL engine and FreetypeEskil Abrahamsen Blomfeldt2010-10-121-1/+8
| |/ / / / / / /
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-097-6/+377
| |\ \ \ \ \ \ \
| | * | | | | | | Experimental support of the unified toolbar withFabien Freling2010-10-087-6/+377
| * | | | | | | | QGradientCache: Optimize choosing of which gradient to evict from cacheAndreas Kling2010-10-081-2/+2
| |/ / / / / / /
| * | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-081-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-081-0/+1
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-10-071-0/+1
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | / | | | | | |_|/ | | | | |/| |
| | | | * | | Fix build with cups 1.5 snapshotsBernhard Rosenkraenzer2010-10-071-0/+1
| * | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-071-22/+41
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Make sure the QS60PaintEngine can draw other classes of pixmap dataJason Barron2010-10-071-22/+41
| | |/ / / /
* | | | | | Merge branch 'lighthouse-4.7' into lighthouse-masterPaul Olav Tvete2010-10-061-1/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-10-0522-274/+207
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
* | | | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-0510-127/+157
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-053-22/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Fixed antialiased rendering error in raster engine due to wrong merge.Samuel Rødal2010-10-011-2/+0
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-309-29/+15
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Fixed accessing freed memory in raster engine.Kim Motoyoshi Kalland2010-09-301-2/+2
| | | * | | | Moving QPdf::stripSpecialCharacter to fontengineJørgen Lind2010-09-302-20/+0