Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-09-10 | 1 | -5/+4 | |
| |\ \ | | |/ | ||||||
| | * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-09-07 | 1 | -0/+2 | |
| | |\ | ||||||
| | | * | Recognize GL_ARB_shader_objects as indicating shaders | Rhys Weatherley | 2010-08-27 | 1 | -0/+2 | |
| | * | | Made QT_GL_SWAPBUFFER_PRESERVE=1 with the GL graphics system work. | Samuel Rødal | 2010-08-31 | 1 | -5/+2 | |
| * | | | Doc update regarding threaded painting with QPainter in the QGL module. | Trond Kjernåsen | 2010-09-09 | 1 | -9/+83 | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-08-31 | 1 | -6/+10 | |
| |\ \ \ | ||||||
| | * | | | Doc update: Mention the Qt::AA_X11InitThreads application attribute. | Trond Kjernåsen | 2010-08-30 | 1 | -6/+10 | |
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-30 | 1 | -0/+3 | |
| |\ \ \ \ | | |/ / / | |/| / / | | |/ / | ||||||
| | * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-08-26 | 1 | -0/+3 | |
| | |\ \ | | | |/ | ||||||
| | | * | Fix OpenGLVersionFlags on OpenGL 4.0 systems | Rhys Weatherley | 2010-08-16 | 1 | -2/+10 | |
| | | * | Don't define highp/mediump/lowp if desktop GL has them | Rhys Weatherley | 2010-08-13 | 1 | -0/+3 | |
* | | | | Compile fix | Paul Olav Tvete | 2010-09-03 | 1 | -0/+3 | |
* | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-26 | 1 | -7/+58 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-08-25 | 1 | -12/+78 | |
| |\ \ \ | ||||||
| | * \ \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-25 | 1 | -12/+78 | |
| | |\ \ \ | | | |/ / | ||||||
| | | * | | On Symbian QGLWidget::glDraw() must do nothing if widget isn't visible. | Jani Hautakangas | 2010-08-23 | 1 | -0/+5 | |
| | | * | | bindTexture: Replace texture if painting is active on pixmap/image | Andreas Kling | 2010-08-21 | 1 | -5/+18 | |
| | | * | | Introduce QtOpenGL module for Symbian. | Jani Hautakangas | 2010-08-20 | 1 | -2/+30 | |
| * | | | | Call eglReleaseThread() when a thread exits, and fix warnings. | Trond Kjernåsen | 2010-08-24 | 1 | -0/+5 | |
| |/ / / | ||||||
* | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-08-19 | 1 | -5/+25 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-08-19 | 1 | -6/+26 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | Prevented Xorg crash in qtdemo when running corkboards example. | Samuel Rødal | 2010-08-17 | 1 | -5/+25 | |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse | Jørgen Lind | 2010-08-03 | 1 | -5/+11 | |
| |\ \ \ \ | ||||||
* | \ \ \ \ | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
| * | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-08-13 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | ||||||
| | * | | | | Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938. | Jerome Pasion | 2010-08-09 | 1 | -1/+1 | |
| | | |/ / | | |/| | | ||||||
* | | | | | Merge remote branch 'qt/master' into lighthouse-master | Paul Olav Tvete | 2010-08-04 | 1 | -5/+11 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-07-28 | 1 | -5/+11 | |
| |\ \ \ \ | | |/ / / | ||||||
| | * | | | Merge remote branch 'origin/4.7' into 4.7-from-4.6 | Rohan McGovern | 2010-07-17 | 1 | -4/+10 | |
| | |\ \ \ | ||||||
| | | * | | | doc: Fixed several qdoc warnings. | Martin Smith | 2010-07-13 | 1 | -4/+10 | |
| | * | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-07-15 | 1 | -1/+1 | |
| | |\ \ \ \ | | | |/ / / | | |/| | / | | | | |/ | | | |/| | ||||||
| | | * | | The Q_WGL define was removed years ago. | Trond Kjernåsen | 2010-07-08 | 1 | -1/+1 | |
* | | | | | Merge remote branch 'remotes/lighthouse/4.7' into lighthouse-master | Paul Olav Tvete | 2010-07-19 | 1 | -5/+12 | |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | ||||||
| * | | | Temporary hack so QtOpenGL compiles for Lighthouse | Paul Olav Tvete | 2010-07-14 | 1 | -2/+2 | |
| * | | | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-07-14 | 1 | -14/+59 | |
| |\ \ \ | | |/ / | ||||||
| * | | | Say hello to Q_WS_QPA! | Jørgen Lind | 2010-06-24 | 1 | -4/+4 | |
| * | | | Merge remote branch 'qt/4.7' into lighthouse | Paul Olav Tvete | 2010-06-18 | 1 | -38/+116 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge remote branch 'qt/4.7' into lighthouse-4.7 | Paul Olav Tvete | 2010-05-10 | 1 | -12/+39 | |
| |\ \ \ \ | ||||||
| * | | | | | ifdef fix for egl on ws_lite | tsenyk | 2010-05-05 | 1 | -1/+2 | |
| * | | | | | Merge remote branch 'origin/4.7' into lighthouse | Jørgen Lind | 2010-04-21 | 1 | -13/+46 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | Make a top-level QGLWidget work once, 50% of the time | Tom Cooksey | 2010-04-08 | 1 | -1/+5 | |
| * | | | | | | Introduce QPlatformGLContext to enable QtOpenGL in Lighthouse | Tom Cooksey | 2010-04-06 | 1 | -1/+3 | |
| * | | | | | | Stub out QtOpenGL on Lighthouse & get it compiling | Tom Cooksey | 2010-03-31 | 1 | -1/+1 | |
* | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2010-07-15 | 1 | -14/+33 | |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | ||||||
| * | | | | | | Got rid of unused variable compiler warning. | Samuel Rødal | 2010-07-01 | 1 | -1/+1 | |
| * | | | | | | QGLWindowSurface support for partial updates via EGL_NOK_swap_region2 | Michael Dominic K | 2010-07-01 | 1 | -0/+10 | |
| * | | | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | Gunnar Sletta | 2010-06-30 | 1 | -0/+33 | |
| |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-06-27 | 1 | -0/+7 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Need to access extensionFuncs in subclasses too. | Michael Dominic K | 2010-06-25 | 1 | -0/+7 | |
| | | | |_|_|/ / | | | |/| | | | | ||||||
| * | | | | | | | support BGRA textures on SGX | Gunnar Sletta | 2010-06-30 | 1 | -14/+16 | |
| | |/ / / / / | |/| | | | | |