diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-03 10:41:51 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-03 10:41:51 (GMT) |
| commit | 6e18291266ed33c27c35f069f6915c353d96ee8c (patch) | |
| tree | 6fa1aa32b9a842870dbf7ebcfeeebf247dd83179 /src/opengl | |
| parent | 5f073cb596b938c1b39621cefd38a3decc6f6fa2 (diff) | |
| parent | 8a73e64bfe86e572260c888d5523c8e973c2f7fe (diff) | |
| download | Qt-6e18291266ed33c27c35f069f6915c353d96ee8c.zip Qt-6e18291266ed33c27c35f069f6915c353d96ee8c.tar.gz Qt-6e18291266ed33c27c35f069f6915c353d96ee8c.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into qt-master-from-4.7
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/opengl.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 8b587cf..08ae774 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -163,6 +163,13 @@ symbian { HEADERS += qgl_egl_p.h + contains(QT_CONFIG, freetype) { + DEFINES += QT_NO_FONTCONFIG + INCLUDEPATH += \ + ../3rdparty/freetype/src \ + ../3rdparty/freetype/include + } + symbian:TARGET.UID3 = 0x2002131A } |