Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 1 | -1/+1 |
|\ | |||||
| * | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 1 | -1/+1 |
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-23 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Made documentation of QPixmap::createMaskFromColor match behaviour. | Samuel Rødal | 2010-12-22 | 1 | -2/+2 |
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-12 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Fixed tst_qwidget::testContentsPropagation auto-test failure. | Samuel Rødal | 2010-11-09 | 1 | -3/+5 |
| * | Fixed grabWidget sometimes returning uninitialized memory. | Samuel Rødal | 2010-11-03 | 1 | -2/+3 |
* | | Add member-swap to shared datatypes that don't have it. | Marc Mutz | 2010-11-03 | 1 | -0/+8 |
* | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-10-05 | 1 | -12/+31 |
|\ \ | |||||
| * \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-28 | 1 | -12/+31 |
| |\ \ | | |/ | |||||
| | * | Compile on Symbian - rework the X11 mask patch a bit. | Trond Kjernåsen | 2010-09-23 | 1 | -3/+17 |
| | * | Fixed QPixmap::resize() for X11 pixmap with masks. | Trond Kjernåsen | 2010-09-23 | 1 | -9/+14 |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Gunnar Sletta | 2010-09-27 | 1 | -3/+12 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-09-22 | 1 | -1/+1 |
| |\ \ | |||||
| | * \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-09-21 | 1 | -3/+7 |
| | |\ \ | | | |/ | |||||
| | | * | Give a warning in QPixmap::handle() if pixmap is not X11 class. | Samuel Rødal | 2010-09-20 | 1 | -2/+6 |
| | | * | Fixed regression in QPixmap::size() for null pixmaps. | Samuel Rødal | 2010-09-16 | 1 | -1/+1 |
| * | | | Give a warning in QPixmap::handle() if pixmap is not X11 class. | Samuel Rødal | 2010-09-18 | 1 | -2/+6 |
| * | | | Make raster the default graphics system on X11. | Samuel Rødal | 2010-09-17 | 1 | -0/+5 |
| |/ / | |||||
* | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-26 | 1 | -3/+5 |
|\ \ \ | |/ / | |||||
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-25 | 1 | -3/+5 |
| |\ \ | | |/ | |||||
| | * | Revised fix for pixmap loading | Jens Bache-Wiig | 2010-08-20 | 1 | -0/+5 |
| | * | Fixes a regression preventing loading images without extensions | Thierry Bastian | 2010-08-19 | 1 | -3/+0 |
* | | | Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-07-19 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-07-14 | 1 | -1/+22 |
| |\ \ | | |/ | |||||
| * | | Say hello to Q_WS_QPA! | Jørgen Lind | 2010-06-24 | 1 | -1/+1 |
| * | | Merge remote branch 'qt/4.7' into lighthouse | Paul Olav Tvete | 2010-06-18 | 1 | -17/+41 |
| |\ \ | |||||
| * \ \ | Merge remote branch 'origin/4.7' into 4.7-lighthouse | Jørgen Lind | 2010-03-11 | 1 | -14/+11 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-03-01 | 1 | -8/+29 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote branch 'remotes/qt/4.6' into lighthouse | Paul Olav Tvete | 2010-02-10 | 1 | -16/+17 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote branch 'origin/4.6' into lighthouse | Paul Olav Tvete | 2010-01-14 | 1 | -9/+10 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote branch 'origin/4.6' into lighthouse | Paul Olav Tvete | 2009-11-19 | 1 | -45/+84 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix some autotest failures and get rid of some compiler warnings | Paul Olav Tvete | 2009-10-14 | 1 | -2/+4 |
* | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-07-15 | 1 | -1/+22 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Add QPixmap::fromImageReader() to decode arbitrary images in place. | Benjamin Poulain | 2010-06-30 | 1 | -1/+22 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-07-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Add an application attribute to control XInitThreads(). | Trond Kjernåsen | 2010-07-02 | 1 | -2/+1 |
| * | | | | | | | More work on GL threading. | Trond Kjernåsen | 2010-07-02 | 1 | -0/+1 |
* | | | | | | | | add docu about pixmaps being invalidated on qapp destruction | Oswald Buddenhagen | 2010-06-07 | 1 | -0/+3 |
|/ / / / / / / | |||||
* | | | | | | | Some optimizations for QImage::load() | Jens Bache-Wiig | 2010-06-01 | 1 | -2/+9 |
* | | | | | | | Merge commit 'origin/4.7' into symbian47 | Thomas Zander | 2010-05-27 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | doc: Fixed many broken links. | Martin Smith | 2010-05-20 | 1 | -2/+2 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | QRuntimeGraphicsSystem | Jani Hautakangas | 2010-05-20 | 1 | -13/+27 |
|/ / / / / / | |||||
* | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Rohan McGovern | 2010-03-06 | 1 | -14/+11 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Fixed QPixmap::load() to not modify referenced copies (again!) | Trond Kjernåsen | 2010-03-01 | 1 | -13/+6 |
| * | | | | | Fixed autotest tst_QWidget::translucentWidget() on Windows Vista & above | Prasanth Ullattil | 2010-02-26 | 1 | -1/+5 |
* | | | | | | Merge branch '4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-17 | 1 | -4/+5 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | document the slowness of QPixmap::hasAlpha() | Gunnar Sletta | 2010-02-11 | 1 | -4/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-09 | 1 | -9/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix GL texture leaks when pixmaps are deleted | Tom Cooksey | 2010-01-29 | 1 | -9/+3 |