diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-02 16:01:57 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-02 16:02:38 +0200 |
| commit | eba9bad43145a00529bdf7e5becfbb063e50c673 (patch) | |
| tree | 56f7d8a83ab87096d4b5536fb2333bbd631df662 /src/opengl/opengl.pro | |
| parent | 481cd6a6b5f6ddb0edf5e67b2569ca170002f6df (diff) | |
QWS removal, part 2
Diffstat (limited to 'src/opengl/opengl.pro')
| -rw-r--r-- | src/opengl/opengl.pro | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index e7c1c446de..c490781251 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -11,7 +11,7 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui include(../qbase.pri) -!win32:!embedded:!mac:!symbian:!qpa:CONFIG += x11 +!win32:!mac:!symbian:!qpa:CONFIG += x11 contains(QT_CONFIG, opengl):CONFIG += opengl contains(QT_CONFIG, opengles1):CONFIG += opengles1 contains(QT_CONFIG, opengles2):CONFIG += opengles2 @@ -105,7 +105,6 @@ x11 { contains(QT_CONFIG, fontconfig) { contains(QT_CONFIG, system-freetype) { - embedded:CONFIG += opentype # pull in the proper freetype2 include directory include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) LIBS_PRIVATE += -lfreetype @@ -138,24 +137,6 @@ wince*: { HEADERS += qgl_egl_p.h } -embedded { - SOURCES += qgl_qws.cpp \ - qglpixelbuffer_egl.cpp \ - qglscreen_qws.cpp \ - qglwindowsurface_qws.cpp \ - qgl_egl.cpp - - HEADERS += qglscreen_qws.h \ - qglwindowsurface_qws_p.h \ - qgl_egl_p.h - - contains(QT_CONFIG, fontconfig) { - include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) - } else { - DEFINES *= QT_NO_FREETYPE - } -} - symbian { DEFINES += QGL_USE_TEXTURE_POOL QGL_NO_PRESERVED_SWAP SOURCES -= qpixmapdata_gl.cpp |