summaryrefslogtreecommitdiffstats
path: root/src/opengl/qwindowsurface_gl.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-05-051-3/+9
|\
| * Only cleanup share widget if it has been created.Armin Berres2011-05-021-3/+9
* | Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-05-021-0/+11
|\ \ | |/ |/|
| * Fix trailing whitespacesJani Hautakangas2011-05-021-1/+1
| * Fix for native child widget performance issue.Jani Hautakangas2011-05-021-0/+11
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-04-271-32/+16
|\ \ | |/
| * Fix for GL graphcics system orientation whichJani Hautakangas2011-04-261-32/+16
* | Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-04-141-23/+46
|\ \
| * | Fixed bad merges in GL windowsurface and get rid of redundant variable.Samuel Rødal2011-03-291-2/+9
| * | Added WindowSurfaceFeature enum to QWindowSurface.Samuel Rødal2011-03-291-7/+7
| * | Added preserved contents property to QWindowSurface.Samuel Rødal2011-03-291-26/+17
| * | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2011-03-241-7/+24
| |\ \ | | |/
| | * Change Symbian to use destroyed swap behaviour in GLJani Hautakangas2011-03-221-9/+31
| * | Handle removal of setter for partialUpdateSupportEckhart Koppen2011-03-221-1/+1
| * | Merge remote branch 'qt/master' into staging-masterSamuel Rødal2011-03-211-9/+74
| |\ \
| * | | Make getters for staticContentsSupport and partialUpdateSupport virtualArmin Berres2011-03-161-3/+11
* | | | Remove DefaultSharedContext from Lighthouse API.Samuel Rødal2011-04-131-14/+0
* | | | Lighthouse: fixup from cherry-pickJørgen Lind2011-03-211-1/+0
* | | | Compile fix for QPAPaul Olav Tvete2011-03-211-1/+2
* | | | Fixed compilation of QtOpenGL with Q_WS_QPA.Samuel Rødal2011-03-171-0/+4
| |/ / |/| |
* | | Merge remote-tracking branch 'origin/4.7' into HEADThiago Macieira2011-03-161-8/+73
|\ \ \ | |/ / |/| / | |/
| * Hot fix for compilation without QGL_USE_TEXTURE_POOLJani Hautakangas2011-03-151-0/+2
| * Initial implementation of GLES2.0 resource poolingJani Hautakangas2011-03-151-8/+71
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-011-4/+0
|\ \ | |/
| * Recreate GL surface when native window is resized on SymbianJani Hautakangas2011-02-251-13/+41
* | Recreate GL surface when native window is resized on SymbianJani Hautakangas2011-02-081-9/+35
* | Merge branch 'master' into lighthouse-masterJørgen Lind2011-01-261-5/+17
|\ \
| * \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
| |\ \ | | |/
| | * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-071-3/+4
| |\ \ | | |/
| | * Restored old flushing behavior in -graphicssystem opengl on desktop.Samuel Rødal2011-01-071-3/+4
| * | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-051-1/+12
| |\ \ | | |/
| | * Support for swap modes in QGLWindowSurface.Michael Dominic K2011-01-041-1/+12
* | | Make sure we blit the fbo on flush in QGLWindowSurfaceJørgen Lind2011-01-261-2/+2
* | | Remove Lighthouse specific code from QGLWindowSurfaceJørgen Lind2011-01-251-7/+1
|/ /
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-201-0/+13
|\ \ | |/
| * Trivial: Fix coding styleHarald Fernengel2010-12-141-1/+1
| * Prevent ::flush from being called on QGLWindowSurface if no painting happened.Michael Dominic K2010-12-141-0/+13
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-131-1/+12
|\ \ | |/
| * Check Qt::WA_TranslucentBackground instead of custom widget property.Michael Dominic K2010-12-081-12/+5
| * Support for 'qglTranslucent' in QGLWindowSurface.Michael Dominic K2010-12-081-1/+19
* | Make QtOpenGL use shared contextexts on LighthouseJørgen Lind2010-11-261-2/+30
* | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-261-56/+84
|\ \
| * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-261-56/+83
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-251-56/+83
| | |\
| | | * Added support for blitting to native child widgets in GL window surface.Samuel Rødal2010-10-221-56/+83
| * | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-251-1/+1
| |\ \ \ | | |/ /
| | * | Fixed many spelling errors.Rohan McGovern2010-10-251-1/+1
| | |/
* | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-10-221-10/+11
|\ \ \ | |/ /
| * | Don't redeclare voidPtr, it's already declared in CarbonCore's Thread.hTor Arne Vestbø2010-10-151-8/+8
| |/