Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-upstream' | Gabriel de Dietrich | 2011-02-15 | 5 | -25/+34 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 5 | -25/+34 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-02-09 | 1 | -4/+13 |
| | |\ | |||||
| | | * | Recreate Symbian raster backing store when WA_TranslucentBackground set | Gareth Stockwell | 2011-02-09 | 1 | -4/+13 |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-01-26 | 1 | -0/+2 |
| | |\ \ | | | |/ | |||||
| | * | | Merge branch '4.7' of ../qt into 4.7 | David Boddie | 2011-01-13 | 170 | -209/+321 |
| | |\ \ | |||||
| | * \ \ | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-12-16 | 2 | -10/+25 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-12-16 | 1 | -11/+0 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch '4.7' into qdoc-simplified | David Boddie | 2010-12-15 | 4 | -27/+29 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-14 | 2 | -0/+12 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-07 | 16 | -1059/+410 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | doc: Moved some table headers ahead of the rows. | Martin Smith | 2010-10-22 | 2 | -6/+6 |
| | * | | | | | | | | doc: Moved some table headers before the rows. | Martin Smith | 2010-10-20 | 1 | -9/+9 |
| | * | | | | | | | | doc: Moved some table headers to be before the rows. | Martin Smith | 2010-10-20 | 1 | -6/+6 |
| | * | | | | | | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-13 | 1 | -4/+2 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-12 | 1 | -3/+5 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-08 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-07 | 1 | -22/+41 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
* | | \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master-upstream' | Gabriel de Dietrich | 2011-02-08 | 5 | -23/+85 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Improve performance of partial updates in raster window surface on X11. | Samuel Rødal | 2011-02-03 | 2 | -2/+30 |
| * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-01-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'qt-fire-review/master' | aavit | 2011-01-28 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Fixed hslHue / hslHueF returning the wrong value for achromatic QColors. | Samuel Rødal | 2011-01-26 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast... | Qt Continuous Integration System | 2011-01-27 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast... | Qt Continuous Integration System | 2011-01-26 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | Merge remote branch 'qt-water-staging/master' into alien-merged-mainline | Richard Moe Gustavsen | 2011-01-25 | 1 | -19/+47 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into alie... | Richard Moe Gustavsen | 2011-01-17 | 173 | -988/+835 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | Alien implementation for the Cocoa port | Richard Moe Gustavsen | 2011-01-17 | 1 | -0/+1 |
| * | | | | | | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-01-27 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-25 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | Fix compilation error. | Jason McDonald | 2011-01-19 | 1 | -0/+2 |
| | | | |_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge remote branch 'qt-fire-review/master' | aavit | 2011-01-26 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Fixed QPainterPath::pointAtPercent(t) for one-element paths. | Samuel Rødal | 2011-01-25 | 1 | -1/+4 |
| * | | | | | | | | | | | | | | | QPainterPath: Ignore calls with NaN/Infinite parameters | Ademar de Souza Reis Jr | 2011-01-21 | 1 | -19/+47 |
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2011-01-20 | 170 | -210/+206 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 170 | -179/+180 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-01-10 | 170 | -170/+170 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 170 | -170/+170 |
| | * | | | | | | | | | | | | | | Setting WA_TranslucentBackground after winid() is ineffective on Symbian. | Jani Hautakangas | 2011-01-10 | 1 | -1/+2 |
| | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | Doc: Fixing typo | Sergio Ahumada | 2011-01-07 | 6 | -8/+8 |
| * | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2011-01-11 | 3 | -4/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 | Eskil Abrahamsen Blomfeldt | 2011-01-10 | 2 | -1/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'qt-graphics-team-text-master' | Eskil Abrahamsen Blomfeldt | 2011-01-10 | 3 | -4/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | Optimize texture glyph cache | Eskil Abrahamsen Blomfeldt | 2010-12-21 | 3 | -4/+16 |
| * | | | | | | | | | | | | | | | | | use qBinaryFind instead of bsearch | Konstantin Ritt | 2011-01-11 | 1 | -28/+8 |
| | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-01-05 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Fixed first element being a LineToElement in QPainterPath::connectPath() | Samuel Rødal | 2011-01-04 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | | Set no brush when the brush is a solid patern transparent color. | Pierre Rossi | 2011-01-04 | 1 | -0/+2 |
| | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-25 | 1 | -22/+15 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-12-24 | 1 | -22/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |