diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-17 13:26:59 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-17 13:26:59 (GMT) |
| commit | baa54f601871b2873b09097596428b4292bd7186 (patch) | |
| tree | 584b1a0d2106fcd4edefe644e7068fffedc9f44a /src/opengl/opengl.pro | |
| parent | e5deaaa6ab843913bdf3ade47611f61f968db130 (diff) | |
| parent | fd009286dfcea0a849d85c824f214e640c4d4ce2 (diff) | |
| download | Qt-baa54f601871b2873b09097596428b4292bd7186.zip Qt-baa54f601871b2873b09097596428b4292bd7186.tar.gz Qt-baa54f601871b2873b09097596428b4292bd7186.tar.bz2 | |
Merge remote branch 'earth-team/master' into master-i18n
Conflicts:
src/corelib/tools/qlocale.cpp
Diffstat (limited to 'src/opengl/opengl.pro')
| -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 } |