diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-06-20 13:29:26 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-06-21 09:04:01 +0200 |
| commit | 6ce6b8a378b0d97ba950240ffb048a4b7e485235 (patch) | |
| tree | d94ca9d082e61ffe93c2756f69a4d99e5df42d94 /src/opengl/opengl.pro | |
| parent | 891a86f0f3b0664162642ee1d6aa3078f16695d1 (diff) | |
Rename QWindowSurface -> QBackingStore and split into platform / public.
Also get rid of GL window surface and related classes.
Diffstat (limited to 'src/opengl/opengl.pro')
| -rw-r--r-- | src/opengl/opengl.pro | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 578ce0f660..efc00a9b66 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -57,8 +57,6 @@ SOURCES += qgl.cpp \ HEADERS += qglshaderprogram.h \ qglpixmapfilter_p.h \ qgraphicsshadereffect_p.h \ - qwindowsurface_gl_p.h \ - qpixmapdata_gl_p.h \ gl2paintengineex/qglgradientcache_p.h \ gl2paintengineex/qglengineshadermanager_p.h \ gl2paintengineex/qgl2pexvertexarray_p.h \ @@ -74,8 +72,6 @@ SOURCES += qgl.cpp \ SOURCES += qglshaderprogram.cpp \ qglpixmapfilter.cpp \ qgraphicsshadereffect.cpp \ - qwindowsurface_gl.cpp \ - qpixmapdata_gl.cpp \ gl2paintengineex/qglgradientcache.cpp \ gl2paintengineex/qglengineshadermanager.cpp \ gl2paintengineex/qgl2pexvertexarray.cpp \ @@ -96,13 +92,9 @@ x11 { contains(QT_CONFIG, egl) { SOURCES += qgl_x11egl.cpp \ qglpixelbuffer_egl.cpp \ - qgl_egl.cpp \ - qpixmapdata_x11gl_egl.cpp \ - qwindowsurface_x11gl.cpp + qgl_egl.cpp - HEADERS += qgl_egl_p.h \ - qpixmapdata_x11gl_p.h \ - qwindowsurface_x11gl_p.h + HEADERS += qgl_egl_p.h } else { SOURCES += qgl_x11.cpp \ @@ -144,16 +136,12 @@ wince*: { } symbian { - DEFINES += QGL_USE_TEXTURE_POOL QGL_NO_PRESERVED_SWAP - SOURCES -= qpixmapdata_gl.cpp + DEFINES += QGL_NO_PRESERVED_SWAP SOURCES += qgl_symbian.cpp \ - qpixmapdata_poolgl.cpp \ qglpixelbuffer_egl.cpp \ - qgl_egl.cpp \ - qgltexturepool.cpp + qgl_egl.cpp - HEADERS += qgl_egl_p.h \ - qgltexturepool_p.h + HEADERS += qgl_egl_p.h contains(QT_CONFIG, freetype) { DEFINES += QT_NO_FONTCONFIG |