summaryrefslogtreecommitdiffstats
path: root/src/gui/painting
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master-upstream'Gabriel de Dietrich2011-02-155-25/+34
|\
| * Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-105-25/+34
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-02-091-4/+13
| | |\
| | | * Recreate Symbian raster backing store when WA_TranslucentBackground setGareth Stockwell2011-02-091-4/+13
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-261-0/+2
| | |\ \ | | | |/
| | * | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-13170-209/+321
| | |\ \
| | * \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-162-10/+25
| | |\ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-161-11/+0
| | |\ \ \ \
| | * \ \ \ \ Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-154-27/+29
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-142-0/+12
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'qdoc-simplified' into mimir-simplifiedDavid Boddie2010-12-0716-1059/+410
| | |\ \ \ \ \ \ \
| | * | | | | | | | doc: Moved some table headers ahead of the rows.Martin Smith2010-10-222-6/+6
| | * | | | | | | | doc: Moved some table headers before the rows.Martin Smith2010-10-201-9/+9
| | * | | | | | | | doc: Moved some table headers to be before the rows.Martin Smith2010-10-201-6/+6
| | * | | | | | | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-131-4/+2
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-121-3/+5
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-081-0/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-071-22/+41
| | |\ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master-upstream'Gabriel de Dietrich2011-02-085-23/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Improve performance of partial updates in raster window surface on X11.Samuel Rødal2011-02-032-2/+30
| * | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-01-281-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'qt-fire-review/master'aavit2011-01-281-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fixed hslHue / hslHueF returning the wrong value for achromatic QColors.Samuel Rødal2011-01-261-1/+1
| * | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-01-271-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-01-261-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge remote branch 'qt-water-staging/master' into alien-merged-mainlineRichard Moe Gustavsen2011-01-251-19/+47
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into alie...Richard Moe Gustavsen2011-01-17173-988/+835
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Alien implementation for the Cocoa portRichard Moe Gustavsen2011-01-171-0/+1
| * | | | | | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2011-01-271-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-251-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Fix compilation error.Jason McDonald2011-01-191-0/+2
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge remote branch 'qt-fire-review/master'aavit2011-01-261-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fixed QPainterPath::pointAtPercent(t) for one-element paths.Samuel Rødal2011-01-251-1/+4
| * | | | | | | | | | | | | | | QPainterPath: Ignore calls with NaN/Infinite parametersAdemar de Souza Reis Jr2011-01-211-19/+47
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2011-01-20170-210/+206
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-17170-179/+180
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-01-10170-170/+170
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Update copyright year to 2011.Jason McDonald2011-01-10170-170/+170
| | * | | | | | | | | | | | | | Setting WA_TranslucentBackground after winid() is ineffective on Symbian.Jani Hautakangas2011-01-101-1/+2
| | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Doc: Fixing typoSergio Ahumada2011-01-076-8/+8
| * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2011-01-113-4/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2Eskil Abrahamsen Blomfeldt2011-01-102-1/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'qt-graphics-team-text-master'Eskil Abrahamsen Blomfeldt2011-01-103-4/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Optimize texture glyph cacheEskil Abrahamsen Blomfeldt2010-12-213-4/+16
| * | | | | | | | | | | | | | | | | use qBinaryFind instead of bsearchKonstantin Ritt2011-01-111-28/+8
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-051-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fixed first element being a LineToElement in QPainterPath::connectPath()Samuel Rødal2011-01-041-1/+2
| * | | | | | | | | | | | | | | | Set no brush when the brush is a solid patern transparent color.Pierre Rossi2011-01-041-0/+2
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'master-upstream' into master-waterThierry Bastian2010-12-251-22/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-12-241-22/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \