summaryrefslogtreecommitdiffstats
path: root/src/opengl/opengl.pro
Commit message (Collapse)AuthorAgeFilesLines
* Use LIBS_PRIVATE on Mac and X11.Thiago Macieira2009-08-171-2/+12
| | | | | | | | | | | | | | | | On the Mac, it means "-framework ApplicationServices -framework Carbon -framework AppKit" are no longer part of the default LIBS in Qt applications. This required a lot of fixes where we used Mac-specific code in Qt. On X11, it was very straightforward, because we apparently use very little of X11 outside QtGui. I haven't changed the Windows-specific LIBS paths, because I don't know how Windows behaves. Windows has DLLs, but it links to static "import" libraries. So is it static linking or dynamic linking? Reviewed-By: Marius Storm-Olsen
* Add qglpixelbuffer_p.h to opengl.pro so Creator finds itTom Cooksey2009-08-031-0/+1
| | | | Reviewed-By: Trustme
* Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-221-13/+4
| | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
* Make QtOpenGL compile on OpenGL ES 1.1 againTom Cooksey2009-05-141-18/+23
|
* Enabled compilation of both GL and GL2 paint engine.Samuel Rødal2009-05-131-16/+13
| | | | | | | Compile both GL and GL2 paint engine on desktop, and choose between them at run-time based on GL version flags. Reviewed-by: Tom
* Big GL Extension CleanupTom Cooksey2009-05-061-1/+2
| | | | | | | | | Clean up the extension naming and make things build on OpenGL ES 2.0 again. All the extensions which made it into OpenGL 2.0 spec have have the EXT postfix removed. This also eliminates defines on ES 2.0 as the code now refers to the in-spec names. Reviewed-by: sroedal
* Fix OpenGL ES 2.0 breakagesTom Cooksey2009-05-051-2/+2
| | | | | Enable GL graphics system on ES 2.0 builds - it wont work, but now QGLDrawable is being used it's just easier to build the graphics system.
* Merge branch 'master' into gl2engine-new-shadersSamuel Rødal2009-04-221-0/+4
|\ | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * Merge branch 'qt/main'Gunnar Sletta2009-04-171-2/+4
| |\ | | | | | | | | | | | | Conflicts: src/opengl/opengl.pro
| | * BT: OpenGL ES 2.0 now compiles properly for Windows CEThomas Hartmann2009-04-151-4/+6
| | | | | | | | | | | | | | | | | | glpixmapfilter should not be compiled for OpenGL ES 2.0 on nay platform Reviewed-by: Tom Cooksey
* | | Clean up existing & implement missing GLSL for new shader managerTom Cooksey2009-04-161-1/+1
| | |
* | | Re-write the shader manager & completely break everything ;-)Tom Cooksey2009-04-161-5/+4
| | |
* | | Import shader implementation from before the history cut.Rhys Weatherley2009-04-031-2/+4
|/ /
* | Merge branch 'gl2text' of ..\qt-mainKim Motoyoshi Kalland2009-04-011-6/+6
|/
* Long live Qt!Lars Knoll2009-03-231-0/+135