diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-05-13 08:01:40 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-05-13 08:24:39 (GMT) |
| commit | 98bb706b76936dfc88e8d38db39518a3cdf74b30 (patch) | |
| tree | 12b404957a6a2b6a4d87cbfa7f7ddcd14e34e223 /src/opengl/opengl.pro | |
| parent | 3822cd597fc481acb2a4de324c005c23ce8e78cd (diff) | |
| download | Qt-98bb706b76936dfc88e8d38db39518a3cdf74b30.zip Qt-98bb706b76936dfc88e8d38db39518a3cdf74b30.tar.gz Qt-98bb706b76936dfc88e8d38db39518a3cdf74b30.tar.bz2 | |
Enabled compilation of both GL and GL2 paint engine.
Compile both GL and GL2 paint engine on desktop, and choose between them
at run-time based on GL version flags.
Reviewed-by: Tom
Diffstat (limited to 'src/opengl/opengl.pro')
| -rw-r--r-- | src/opengl/opengl.pro | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index cfa9e4f..7eb2503 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -37,24 +37,21 @@ SOURCES += qgl.cpp \ qglpixmapfilter.cpp \ qglshaderprogram.cpp -#!contains(QT_CONFIG, opengles2) { -# HEADERS += qpaintengine_opengl_p.h -# SOURCES += qpaintengine_opengl.cpp -#} +!contains(QT_CONFIG, opengles2) { + HEADERS += qpaintengine_opengl_p.h + SOURCES += qpaintengine_opengl.cpp +} -#contains(QT_CONFIG, opengles2) { - SOURCES += gl2paintengineex/qglgradientcache.cpp \ - gl2paintengineex/qglengineshadermanager.cpp \ - gl2paintengineex/qgl2pexvertexarray.cpp \ - gl2paintengineex/qpaintengineex_opengl2.cpp - - HEADERS += gl2paintengineex/qglgradientcache_p.h \ - gl2paintengineex/qglengineshadermanager_p.h \ - gl2paintengineex/qgl2pexvertexarray_p.h \ - gl2paintengineex/qpaintengineex_opengl2_p.h \ - gl2paintengineex/qglengineshadersource_p.h -#} +SOURCES += gl2paintengineex/qglgradientcache.cpp \ + gl2paintengineex/qglengineshadermanager.cpp \ + gl2paintengineex/qgl2pexvertexarray.cpp \ + gl2paintengineex/qpaintengineex_opengl2.cpp +HEADERS += gl2paintengineex/qglgradientcache_p.h \ + gl2paintengineex/qglengineshadermanager_p.h \ + gl2paintengineex/qgl2pexvertexarray_p.h \ + gl2paintengineex/qpaintengineex_opengl2_p.h \ + gl2paintengineex/qglengineshadersource_p.h x11 { contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles1cl)|contains(QT_CONFIG, opengles2) { |