Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.5' into 4.6 | Thiago Macieira | 2009-08-31 | 1 | -0/+29 |
|\ | |||||
| * | Don't crash when convert Indexed8 without colortable to QPixmap | Gunnar Sletta | 2009-08-31 | 1 | -0/+29 |
* | | Merge branch '4.5' into 4.6 | Thiago Macieira | 2009-08-31 | 1 | -13/+13 |
|\ \ | |/ | |||||
| * | Update tech preview license header. | Jason McDonald | 2009-08-31 | 1 | -13/+13 |
| * | Update license headers. | Jason McDonald | 2009-08-11 | 1 | -1/+1 |
* | | Fix incorrect logic in QPixmap::fromSymbianCFbsBitmap. | Jason Barron | 2009-08-14 | 1 | -0/+8 |
* | | Merge commit 'qt/master' | Jason Barron | 2009-08-13 | 1 | -1/+1 |
|\ \ | |||||
| * | | Update contact URL in license headers. | Jason McDonald | 2009-08-12 | 1 | -1/+1 |
* | | | Merge commit 'qt/master-stable' | Jason Barron | 2009-07-27 | 1 | -6/+1 |
|\ \ \ | |/ / | |||||
| * | | tests: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT support | miniak | 2009-07-01 | 1 | -6/+1 |
* | | | Merge commit 'origin/master' into 4.6-merged | Jason Barron | 2009-07-09 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fixed the compilation problem of tests/auto/qpixmap. | Liang Qi | 2009-07-01 | 1 | -1/+1 |
| * | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-06-29 | 1 | -2/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
* | | | | Merge commit 'qt/master-stable' into 4.6-merged | Jason Barron | 2009-06-30 | 1 | -2/+2 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge license header changes from 4.5 | Volker Hilsheimer | 2009-06-16 | 1 | -2/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 1 | -2/+2 |
* | | | | Merge commit 'qt/master-stable' into 4.6-stable | Jason Barron | 2009-06-25 | 28 | -30/+197 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | Made QPixmap autotest pass with -graphicssystem opengl | Samuel Rødal | 2009-06-12 | 1 | -32/+73 |
| * | | tst_qpixmap compile fix | Joerg Bornemann | 2009-06-10 | 1 | -1/+1 |
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | Simon Hausmann | 2009-03-24 | 1 | -0/+16 |
| |\ \ | | |/ | |||||
| * | | Long live Qt! | Lars Knoll | 2009-03-23 | 33 | -0/+1161 |
| / | |||||
* | | Introduce Symbian CFbsBitmap <-> QPixmap conversion functions. | Jason Barron | 2009-06-05 | 2 | -12/+108 |
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt | axis | 2009-04-27 | 1 | -0/+16 |
|\ \ | |/ | |||||
| * | Fixes: Crash in QPixmap under X11. | Trond Kjernaasen | 2009-03-23 | 1 | -0/+16 |
| * | Long live Qt 4.5! | Lars Knoll | 2009-03-23 | 7 | -0/+1037 |
* | Long live Qt for S60! | axis | 2009-04-24 | 7 | -0/+1059 |