summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-1125-434/+4549
|\
| * Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-094-35/+33
| |\
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-051-14/+16
| |\ \
| | * | doc: Fixed some qdoc warnings.Martin Smith2010-02-051-14/+16
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-052-0/+39
| |\ \ \ | | |/ / | |/| |
| | * | Add QMacCompatGLenum overrides for new QGLShaderProgram functionsRhys Weatherley2010-02-052-0/+39
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-041-6/+8
| |\ \ \ | | |/ / | |/| |
| | * | doc: Fixed some qdoc warnings.Martin Smith2010-02-041-6/+8
| * | | Fixed wrong variable nameGabriel de Dietrich2010-02-041-1/+1
| * | | Improvements to the QGLShaderProgram APIRhys Weatherley2010-02-042-0/+196
| * | | Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-0415-343/+156
| |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-015-15/+621
| |\ \
| | * | Placate pedantic compiler warning modes on QGLBufferRhys Weatherley2010-02-012-15/+15
| | * | Add the QGLBuffer class to Qt 4.7 for VBO'sRhys Weatherley2010-02-015-15/+621
| * | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-018-358/+443
| |\ \ \ | | |/ / | |/| |
| * | | Fixed compile of QTriangulator on Solaris.Kim Motoyoshi Kalland2010-01-261-5/+7
| * | | Merge branch '4.6'Thiago Macieira2010-01-215-13/+60
| |\ \ \
| * | | | Updated painter path caching in the GL2 engine after merge.Kim Motoyoshi Kalland2010-01-191-3/+2
| * | | | Merge branch '4.6'Thiago Macieira2010-01-1815-434/+475
| |\ \ \ \
| * \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1367-110/+162
| |\ \ \ \ \
| * | | | | | Add QT_{BEGIN,END}_NAMESPACE to qtextureglyphcache_gl.cpp.ck2010-01-111-0/+4
| * | | | | | Merge branch '4.6'Thiago Macieira2010-01-0818-507/+719
| |\ \ \ \ \ \
| * | | | | | | Fix compilation breakage caused by merge.Thiago Macieira2010-01-061-1/+1
| * | | | | | | Change from std::pair to QPair.Thiago Macieira2010-01-061-8/+8
| * | | | | | | GCC doesn't like comment lines ending in \Thiago Macieira2010-01-061-28/+28
| * | | | | | | Merge branch '4.6'Thiago Macieira2010-01-055-172/+195
| |\ \ \ \ \ \ \
| * | | | | | | | Fixed QGLFormat::operator== to handle new fields.Kim Motoyoshi Kalland2010-01-041-3/+13
| * | | | | | | | Added support for OpenGL up to version 3.2 on Windows.Kim Motoyoshi Kalland2009-12-304-25/+275
| * | | | | | | | Format qOpenGLVersionFlagsFromString() according to Qt coding style.Kim Motoyoshi Kalland2009-12-301-22/+16
| * | | | | | | | Merge branch '4.6'Thiago Macieira2009-12-2616-822/+573
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fixed memory leak in caching of concave paths in GL2 engine.Kim Motoyoshi Kalland2009-12-171-18/+21
| * | | | | | | | | Implemented caching of concave vector paths in the GL2 engine.Kim Motoyoshi Kalland2009-12-152-26/+130
| * | | | | | | | | Added missing OpenGL defines.Kim Motoyoshi Kalland2009-12-151-0/+14
| * | | | | | | | | Fixed integer overflow in QTriangulator.Kim Motoyoshi Kalland2009-12-151-6/+6
| * | | | | | | | | Fixed QGL2PEXVertexArray to interpolate within the range [0, 1].Kim Motoyoshi Kalland2009-12-151-1/+1
| * | | | | | | | | Merge commit 'origin/4.6'Olivier Goffart2009-12-159-277/+697
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-082-6/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-12-054-2/+14
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-027-228/+381
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added QTriangulator.Kim Motoyoshi Kalland2009-12-023-2/+3083
* | | | | | | | | | | | | | Fixed usage of QGLPixelBuffer with share widgets on other X11 screens.Trond Kjernåsen2010-02-101-1/+5
* | | | | | | | | | | | | | Fixed drawing QPixmaps on QGLWidgets on different X11 screens.Trond Kjernåsen2010-02-101-1/+8
* | | | | | | | | | | | | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6Kim Motoyoshi Kalland2010-02-092-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed bug where GL widget was not fully updated on Vista.Kim Motoyoshi Kalland2010-02-042-3/+3
* | | | | | | | | | | | | | | Add a pixmap modification hook to blur pixmap filter cacheTom Cooksey2010-02-081-0/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-034-35/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed a failure in tst_qgl.Trond Kjernåsen2010-02-021-1/+0
| * | | | | | | | | | | | | | Fixed compilation of the GL2 engine for OpenGL ES 2.Kim Motoyoshi Kalland2010-02-021-0/+2
| * | | | | | | | | | | | | | Fixed missing textures in the boxes demo.Kim Motoyoshi Kalland2010-02-021-0/+1
| * | | | | | | | | | | | | | Fixed garbled 3D Qt logo in the overpainting example.Kim Motoyoshi Kalland2010-02-011-0/+3