summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglpixelbuffer.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-2/+2
|\
| * Merge license header changes from 4.5Volker Hilsheimer2009-06-161-2/+2
| |\
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| | * Long live Qt 4.5!Lars Knoll2009-03-231-0/+582
* | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-13/+28
|\ \ | |/
| * Another breakage in 1bbe23c5 - move qpaintengineex_opengl2_p.h include upRhys Weatherley2009-06-091-3/+6
| * Make OpenGL/ES 1.1 work again for Qt/EmbeddedRhys Weatherley2009-06-091-2/+3
| * Moved QGL2PaintEngineExPrivate into GL2 paint engine header file.Samuel Rødal2009-05-281-2/+1
| * Made PixelBuffer/FramebufferObject report correct DPI based metrics.Samuel Rødal2009-05-251-7/+8
| * Make QtOpenGL compile on OpenGL ES 1.1 againTom Cooksey2009-05-141-3/+7
| * Reverted use of GL 2 engine as default on desktop.Samuel Rødal2009-05-131-1/+1
| * Enabled compilation of both GL and GL2 paint engine.Samuel Rødal2009-05-131-8/+11
| * Merge branch 'gl2text' of ..\qt-mainKim Motoyoshi Kalland2009-04-011-3/+7
| * Long live Qt!Lars Knoll2009-03-231-0/+582
* Make Qt exception safer.Robert Griebl2009-06-101-1/+0
* Long live Qt for S60!axis2009-04-241-0/+582