Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-07-22 | 1 | -0/+4 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-07-21 | 1 | -0/+4 |
| |\ | |||||
| | * | Fix compilation on Symbian platforms without SgImage support | Jani Hautakangas | 2011-07-21 | 1 | -0/+4 |
* | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-07-20 | 1 | -12/+8 |
|\ \ \ | |/ / | |||||
| * | | Don't use GL_REPEAT for NPOT textures in GLES2. | Samuel Rødal | 2011-07-18 | 1 | -1/+12 |
| |/ | |||||
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master... | Qt Continuous Integration System | 2011-07-08 | 1 | -0/+6 |
|\ \ | |||||
| * \ | Merge remote branch 'upstream/4.8' | Jerome Pasion | 2011-07-08 | 5 | -476/+345 |
| |\ \ | |||||
| * | | | Doc: Updated documentation with \since 4.8 declarations. | David Boddie | 2011-06-30 | 1 | -0/+6 |
* | | | | Merge remote branch 'mainline/4.8' into staging | Jiang Jiang | 2011-07-08 | 5 | -476/+345 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7 | Jani Hautakangas | 2011-07-04 | 5 | -476/+345 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Introduce QPixmap::fromSymbianRSgImage(RSgImage*) to GL engine | Jani Hautakangas | 2011-06-30 | 5 | -471/+336 |
* | | | Don't issue GL calls when the geometry is empty | Eskil Abrahamsen Blomfeldt | 2011-07-05 | 1 | -0/+2 |
|/ / | |||||
* | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-06-24 | 1 | -3/+1 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-06-24 | 1 | -3/+1 |
| |\ \ | | |/ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Laszlo Agocs | 2011-06-20 | 1 | -2/+5 |
| | |\ | |||||
| | * | | Proper naming for raster pixmap and paintengine on Symbian. | Laszlo Agocs | 2011-06-16 | 1 | -2/+1 |
| | * | | Handle QVolatileImage-backed pixmaps optimally in drawPixmap(). | Laszlo Agocs | 2011-06-16 | 1 | -1/+0 |
* | | | | Merge remote-tracking branch 'origin/4.8' | Olivier Goffart | 2011-06-24 | 19 | -327/+327 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7 | Jani Hautakangas | 2011-06-22 | 12 | -291/+226 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-06-10 | 1 | -2/+5 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Fixing OpenGL module build error on Solaris | Martin Pejcoch | 2011-06-10 | 1 | -2/+5 |
| | * | | Add missing freeTexture() from fix for QTBUG-19180 | Jani Hautakangas | 2011-06-09 | 2 | -0/+28 |
| | * | | Simplify texture pooling logic in GL graphics system. | Jani Hautakangas | 2011-06-09 | 11 | -291/+191 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-06-21 | 1 | -0/+33 |
| |\ \ \ | |||||
| | * | | | Adding debug output for not supported gl features | Ian | 2011-06-20 | 1 | -0/+33 |
| * | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-06-17 | 7 | -19/+47 |
| |\ \ \ \ | |||||
| | * | | | | Silence the "array out of bounds" warning in GCC 4.6. | Thiago Macieira | 2011-06-14 | 1 | -0/+7 |
| | |/ / / | |||||
| | * | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-06-08 | 1 | -3/+1 |
| | |\ \ \ | |||||
| | | * \ \ | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-31 | 1 | -3/+1 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Fix for BCM2727 chip detection on Symbian | Jani Hautakangas | 2011-05-30 | 1 | -3/+1 |
| | | | |/ | |||||
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-17 | 75 | -1292/+1292 |
| | | | |\ | |||||
| | | | | * | Update licenseheader text in source files | Jyri Tahtela | 2011-05-13 | 75 | -1292/+1292 |
| | * | | | | Merge remote branch 'qt/4.8' into fire-master | Paul Olav Tvete | 2011-06-06 | 82 | -1425/+1466 |
| | |\ \ \ \ | | | |/ / / | |||||
| | * | | | | Refactor glyph pretransform check | Jiang Jiang | 2011-06-03 | 2 | -0/+2 |
| | * | | | | Symbian build failure for Armv5 | Sami Merila | 2011-05-31 | 1 | -2/+2 |
| | * | | | | Full translucent background support in xcb and xlib backend. | Samuel Rødal | 2011-05-19 | 2 | -5/+15 |
| | * | | | | Fall back to using paths for large fonts in drawStaticText() | Eskil Abrahamsen Blomfeldt | 2011-05-18 | 1 | -11/+22 |
| * | | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-05-24 | 82 | -1446/+1543 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | Doc: Fixed qdoc warnings. | David Boddie | 2011-05-12 | 1 | -0/+6 |
| * | | | | | Doc: Fixed qdoc warnings. | David Boddie | 2011-05-11 | 4 | -8/+11 |
| * | | | | | Doc: Clarified and tidied up OpenGL overlay color documentation. | David Boddie | 2011-05-04 | 1 | -9/+4 |
* | | | | | | move some internal helper functions from qglobal.cpp to qcore_mac* | Ritt Konstantin | 2011-06-09 | 1 | -1/+0 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-18 | 4 | -26/+60 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-05-17 | 3 | -13/+40 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-16 | 3 | -3/+17 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-05-12 | 1 | -9/+21 |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | | * | | | | | Enable multisampling on Symbian if hw supports it | Jani Hautakangas | 2011-05-11 | 1 | -9/+21 |
| | * | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-11 | 2 | -4/+19 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Introduce platform extension to QGraphicsSystem | Jani Hautakangas | 2011-05-10 | 2 | -4/+19 |
| | | | |_|_|/ | | | |/| | | | |||||
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-05-17 | 1 | -13/+20 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | | | |_|_|/ | | |/| | | |