Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 4.7 into qt-4.8-from-4.7 | Qt Continuous Integration System | 2011-05-02 | 1 | -0/+11 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-05-02 | 1 | -0/+11 |
| |\ | |||||
| | * | Fix trailing whitespaces | Jani Hautakangas | 2011-05-02 | 1 | -1/+1 |
| | * | Fix for native child widget performance issue. | Jani Hautakangas | 2011-05-02 | 1 | -0/+11 |
| * | | Fix missing glyphs for large fonts with QStaticText/GL/Freetype | Eskil Abrahamsen Blomfeldt | 2011-04-29 | 1 | -1/+1 |
| |/ | |||||
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-04-28 | 5 | -55/+35 |
|\ \ | |||||
| * \ | Merge remote branch 'qt-mainline/master' | aavit | 2011-04-26 | 7 | -37/+33 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of scm.dev.troll.no:qt/qt-fire-review | Eskil Abrahamsen Blomfeldt | 2011-04-23 | 5 | -55/+35 |
| |\ \ \ | |||||
| | * | | | Added support for six-parameter radial gradients. | Samuel Rødal | 2011-04-13 | 5 | -55/+35 |
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-04-27 | 1 | -32/+16 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-04-26 | 1 | -32/+16 |
| |\ \ \ | |||||
| | * | | | Fix for GL graphcics system orientation which | Jani Hautakangas | 2011-04-26 | 1 | -32/+16 |
| | * | | | Merge commit 'refs/merge-requests/2584' of gitorious.org:qt/qt into merge-req... | Sami Merila | 2011-03-29 | 1 | -2/+25 |
| | |\ \ \ | |||||
* | | | | | | Remove hasOpenGL. This changes breaks binary compatibillity | Jørgen Lind | 2011-04-14 | 2 | -5/+2 |
* | | | | | | Merge remote-tracking branch 'origin/master' into lighthouse-master | Jørgen Lind | 2011-04-14 | 19 | -263/+479 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging | aavit | 2011-04-12 | 1 | -1/+9 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Update XCreateWindow in qgl_X11egl.cpp | JuanZhao | 2011-04-12 | 1 | -1/+9 |
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-04-07 | 1 | -13/+0 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-04-06 | 1 | -13/+0 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-04-05 | 3 | -3/+72 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-03-29 | 5 | -23/+51 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | * | | | | Doc: Removed duplicate documentation. | David Boddie | 2011-03-25 | 1 | -13/+0 |
| * | | | | | | Put all the declarations of qt_defaultDpi{,X,Y}() in one place | Jiang Jiang | 2011-04-05 | 4 | -12/+4 |
| * | | | | | | Made extension resolving work with Core profile. | Samuel Rødal | 2011-04-05 | 4 | -50/+100 |
| * | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-04-03 | 5 | -5/+74 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 5 | -5/+74 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-31 | 2 | -2/+2 |
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | | | * | | | | Don't include qwindowsurface_gl_p.h on QT_OPENGL_ES_1. | Samuel Rødal | 2011-03-29 | 2 | -2/+2 |
| | | | | |/ / | | | | |/| | | |||||
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-28 | 3 | -3/+72 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | / | | | | | |/ | | | | |/| | |||||
| | | | * | | Native image handle provider support in QGLPixmapData | Laszlo Agocs | 2011-03-24 | 3 | -3/+72 |
| * | | | | | QGLContext on EGL gets an additional QEglProperties static field applied to e... | Michael Dominic K | 2011-04-01 | 3 | -1/+12 |
| * | | | | | opengl2: Make maximum cached glyph size configurable | Sami Kyöstilä | 2011-03-31 | 1 | -1/+6 |
| * | | | | | Fixed bad merges in GL windowsurface and get rid of redundant variable. | Samuel Rødal | 2011-03-29 | 1 | -2/+9 |
| * | | | | | Added WindowSurfaceFeature enum to QWindowSurface. | Samuel Rødal | 2011-03-29 | 2 | -9/+8 |
| * | | | | | Added preserved contents property to QWindowSurface. | Samuel Rødal | 2011-03-29 | 2 | -26/+18 |
| |/ / / / | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-03-28 | 5 | -2/+40 |
| |\ \ \ \ | |||||
| | * | | | | Reset GL glyph cache when texture limit is reached | Eskil Abrahamsen Blomfeldt | 2011-03-23 | 5 | -2/+40 |
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-24 | 5 | -21/+44 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-22 | 5 | -23/+51 |
| | |\ \ \ \ | | | | |/ / | | | |/| / | | | |_|/ | | |/| | | |||||
| | | * | | Change Symbian to use destroyed swap behaviour in GL | Jani Hautakangas | 2011-03-22 | 5 | -23/+51 |
| * | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-23 | 3 | -141/+126 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-22 | 3 | -141/+126 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-21 | 3 | -141/+126 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Change the pooled QGLPixmapData to be backed by QVolatileImage. | Laszlo Agocs | 2011-03-21 | 3 | -141/+126 |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas... | Qt Continuous Integration System | 2011-03-23 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | Handle removal of setter for partialUpdateSupport | Eckhart Koppen | 2011-03-22 | 1 | -1/+1 |
| | |/ / / | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team | aavit | 2011-03-21 | 3 | -2/+19 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Optimized glyph uploads in GL texture cache. | Samuel Rødal | 2011-03-21 | 3 | -2/+19 |
| * | | | | Merge remote branch 'qt/master' into staging-master | Samuel Rødal | 2011-03-21 | 16 | -38/+1514 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-19 | 1 | -2/+25 |
| | |\ \ \ |