diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-16 12:53:04 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-08-16 15:44:26 +0200 |
commit | 0d5170256c1658b0f6e0d3f6c736de01655b29d8 (patch) | |
tree | 79f6252ffbda9eeb1ce54fc9987618fdc7e58be2 /src/opengl/opengl.pro | |
parent | 06f6b71ba43e8302d61d2c3cb7118d9dbf7a3c98 (diff) |
Get rid of OpenGL 1.x engine and platform code from QtOpenGL.
Change-Id: I646b8e26d5e7214432a044866764d57cc11b2390
Reviewed-on: http://codereview.qt.nokia.com/3006
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
Diffstat (limited to 'src/opengl/opengl.pro')
-rw-r--r-- | src/opengl/opengl.pro | 120 |
1 files changed, 30 insertions, 90 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 7c1c0ce5fd..52429c80b0 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -47,95 +47,35 @@ SOURCES += qgl.cpp \ qglpaintdevice.cpp \ qglbuffer.cpp \ - -!contains(QT_CONFIG, opengles2) { - HEADERS += qpaintengine_opengl_p.h - SOURCES += qpaintengine_opengl.cpp -} - -!contains(QT_CONFIG, opengles1) { - HEADERS += qglshaderprogram.h \ - qglpixmapfilter_p.h \ - qgraphicsshadereffect_p.h \ - gl2paintengineex/qglgradientcache_p.h \ - gl2paintengineex/qglengineshadermanager_p.h \ - gl2paintengineex/qgl2pexvertexarray_p.h \ - gl2paintengineex/qpaintengineex_opengl2_p.h \ - gl2paintengineex/qglengineshadersource_p.h \ - gl2paintengineex/qglcustomshaderstage_p.h \ - gl2paintengineex/qtriangulatingstroker_p.h \ - gl2paintengineex/qtriangulator_p.h \ - gl2paintengineex/qrbtree_p.h \ - gl2paintengineex/qtextureglyphcache_gl_p.h \ - gl2paintengineex/qglshadercache_p.h \ - gl2paintengineex/qglshadercache_meego_p.h - - SOURCES += qglshaderprogram.cpp \ - qglpixmapfilter.cpp \ - qgraphicsshadereffect.cpp \ - gl2paintengineex/qglgradientcache.cpp \ - gl2paintengineex/qglengineshadermanager.cpp \ - gl2paintengineex/qgl2pexvertexarray.cpp \ - gl2paintengineex/qpaintengineex_opengl2.cpp \ - gl2paintengineex/qglcustomshaderstage.cpp \ - gl2paintengineex/qtriangulatingstroker.cpp \ - gl2paintengineex/qtriangulator.cpp \ - gl2paintengineex/qtextureglyphcache_gl.cpp - -} - -qpa { - SOURCES += qgl_qpa.cpp \ - qglpixelbuffer_stub.cpp -} - -x11 { - contains(QT_CONFIG, egl) { - SOURCES += qgl_x11egl.cpp \ - qglpixelbuffer_egl.cpp \ - qgl_egl.cpp - - HEADERS += qgl_egl_p.h - - } else { - SOURCES += qgl_x11.cpp \ - qglpixelbuffer_x11.cpp - } - - contains(QT_CONFIG, fontconfig) { - contains(QT_CONFIG, system-freetype) { - # pull in the proper freetype2 include directory - include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) - LIBS_PRIVATE += -lfreetype - } else { - ### Note: how does this compile with a non-system freetype? - # This probably does not compile - } - } else { - DEFINES *= QT_NO_FREETYPE - } - - LIBS_PRIVATE += $$QMAKE_LIBS_DYNLOAD -} - -mac:!qpa { - OBJECTIVE_SOURCES += qgl_mac.mm \ - qglpixelbuffer_mac.mm - LIBS_PRIVATE += -framework AppKit -framework Carbon -} -win32:!wince*: { - DEFINES += QT_NO_EGL - !qpa { - SOURCES += qgl_win.cpp \ - qglpixelbuffer_win.cpp - } -} -wince*: { - SOURCES += qgl_wince.cpp \ - qglpixelbuffer_egl.cpp \ - qgl_egl.cpp - - HEADERS += qgl_egl_p.h -} +HEADERS += qglshaderprogram.h \ + qgraphicsshadereffect_p.h \ + gl2paintengineex/qglgradientcache_p.h \ + gl2paintengineex/qglengineshadermanager_p.h \ + gl2paintengineex/qgl2pexvertexarray_p.h \ + gl2paintengineex/qpaintengineex_opengl2_p.h \ + gl2paintengineex/qglengineshadersource_p.h \ + gl2paintengineex/qglcustomshaderstage_p.h \ + gl2paintengineex/qtriangulatingstroker_p.h \ + gl2paintengineex/qtriangulator_p.h \ + gl2paintengineex/qrbtree_p.h \ + gl2paintengineex/qtextureglyphcache_gl_p.h \ + gl2paintengineex/qglshadercache_p.h \ + gl2paintengineex/qglshadercache_meego_p.h + +SOURCES += qglshaderprogram.cpp \ + qgraphicsshadereffect.cpp \ + gl2paintengineex/qglgradientcache.cpp \ + gl2paintengineex/qglengineshadermanager.cpp \ + gl2paintengineex/qgl2pexvertexarray.cpp \ + gl2paintengineex/qpaintengineex_opengl2.cpp \ + gl2paintengineex/qglcustomshaderstage.cpp \ + gl2paintengineex/qtriangulatingstroker.cpp \ + gl2paintengineex/qtriangulator.cpp \ + gl2paintengineex/qtextureglyphcache_gl.cpp + +SOURCES += qgl_qpa.cpp \ + qglpixelbuffer_stub.cpp + +DEFINES += QT_NO_EGL INCLUDEPATH += ../3rdparty/harfbuzz/src |