diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-26 11:37:18 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-08-26 11:37:18 (GMT) |
| commit | 55123a9b94eb38a372a2d285b25c58085921f233 (patch) | |
| tree | a50e58817060bd31116e4cee684300eaf721ce4f /src/opengl/opengl.pro | |
| parent | c0c2e556e98ffe550cbedb4e3a0def5dd272ce25 (diff) | |
| parent | a4515ec14fdc772eb6b5c4801cddaddc26b94d84 (diff) | |
| download | Qt-55123a9b94eb38a372a2d285b25c58085921f233.zip Qt-55123a9b94eb38a372a2d285b25c58085921f233.tar.gz Qt-55123a9b94eb38a372a2d285b25c58085921f233.tar.bz2 | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
src/opengl/opengl.pro
src/opengl/qgl.cpp
src/opengl/qgl_p.h
Diffstat (limited to 'src/opengl/opengl.pro')
| -rw-r--r-- | src/opengl/opengl.pro | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 9642ef4..682e620 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -11,30 +11,30 @@ unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui include(../qbase.pri) -!win32:!embedded:!mac:!qpa:CONFIG += x11 +!win32:!embedded:!mac:!symbian:!qpa:CONFIG += x11 contains(QT_CONFIG, opengl):CONFIG += opengl contains(QT_CONFIG, opengles1):CONFIG += opengles1 contains(QT_CONFIG, opengles2):CONFIG += opengles2 contains(QT_CONFIG, egl):CONFIG += egl HEADERS += qgl.h \ - qgl_p.h \ - qglcolormap.h \ + qgl_p.h \ + qglcolormap.h \ qglfunctions.h \ - qglpixelbuffer.h \ + qglpixelbuffer.h \ qglpixelbuffer_p.h \ - qglframebufferobject.h \ + qglframebufferobject.h \ qglframebufferobject_p.h \ qglextensions_p.h \ qglpaintdevice_p.h \ qglbuffer.h \ -SOURCES += qgl.cpp \ - qglcolormap.cpp \ +SOURCES += qgl.cpp \ + qglcolormap.cpp \ qglfunctions.cpp \ - qglpixelbuffer.cpp \ - qglframebufferobject.cpp \ + qglpixelbuffer.cpp \ + qglframebufferobject.cpp \ qglextensions.cpp \ qglpaintdevice.cpp \ qglbuffer.cpp \ @@ -126,7 +126,7 @@ mac { win32:!wince*: { DEFINES += QT_NO_EGL SOURCES += qgl_win.cpp \ - qglpixelbuffer_win.cpp + qglpixelbuffer_win.cpp } wince*: { SOURCES += qgl_wince.cpp \ @@ -154,4 +154,14 @@ embedded { } } +symbian { + SOURCES += qgl_symbian.cpp \ + qglpixelbuffer_egl.cpp \ + qgl_egl.cpp + + HEADERS += qgl_egl_p.h + + symbian:TARGET.UID3 = 0x2002131A +} + INCLUDEPATH += ../3rdparty/harfbuzz/src |