diff options
| author | axis <qt-info@nokia.com> | 2011-02-24 16:07:22 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-02-24 16:07:22 (GMT) |
| commit | 2b768ad7d4de4862584762a7d106d9cfcc3416df (patch) | |
| tree | 0ddfe84f345d7e61ce71daa51fbbfb373c3e3106 /src/openvg/openvg.pro | |
| parent | bb7d9bcc8e0c617091e91f7a40f3d33f8c1cdec1 (diff) | |
| parent | ca7be48b7a150952a9657d1000941fb986e5bb2b (diff) | |
| download | Qt-2b768ad7d4de4862584762a7d106d9cfcc3416df.zip Qt-2b768ad7d4de4862584762a7d106d9cfcc3416df.tar.gz Qt-2b768ad7d4de4862584762a7d106d9cfcc3416df.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master
Conflicts:
src/network/access/qnetworkreplyimpl.cpp
tests/auto/moc/tst_moc.cpp
Diffstat (limited to 'src/openvg/openvg.pro')
| -rw-r--r-- | src/openvg/openvg.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/openvg/openvg.pro b/src/openvg/openvg.pro index e7ed890..e185949 100644 --- a/src/openvg/openvg.pro +++ b/src/openvg/openvg.pro @@ -38,6 +38,13 @@ symbian { DEFINES += QVG_RECREATE_ON_SIZE_CHANGE QVG_BUFFER_SCROLLING QVG_SCISSOR_CLIP SOURCES += \ qvg_symbian.cpp + + contains(QT_CONFIG, freetype) { + DEFINES += QT_NO_FONTCONFIG + INCLUDEPATH += \ + ../3rdparty/freetype/src \ + ../3rdparty/freetype/include + } } include(../qbase.pri) |