summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-10 01:58:38 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-10 01:58:38 (GMT)
commita153a587b21d4383501455540f6072a9abead099 (patch)
tree6dd9f5e431dd58a9d877cb69f60e5a29204cfc3f
parent9fc91de560b1302ff6cf238b3d179fc778066fcf (diff)
parent412c7f133bb582101d38dbb9ee6844e63fcd83e6 (diff)
downloadQt-a153a587b21d4383501455540f6072a9abead099.zip
Qt-a153a587b21d4383501455540f6072a9abead099.tar.gz
Qt-a153a587b21d4383501455540f6072a9abead099.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Problems with missing symbols on QWS/AIX. Include freetype synthesis file for cross-compilation.
-rw-r--r--src/gui/text/text.pri1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri
index 9ec3142..d5a9c74 100644
--- a/src/gui/text/text.pri
+++ b/src/gui/text/text.pri
@@ -138,6 +138,7 @@ contains(QT_CONFIG, freetype) {
../3rdparty/freetype/src/base/ftinit.c \
../3rdparty/freetype/src/base/ftmm.c \
../3rdparty/freetype/src/base/fttype1.c \
+ ../3rdparty/freetype/src/base/ftsynth.c \
../3rdparty/freetype/src/base/ftbitmap.c\
../3rdparty/freetype/src/bdf/bdf.c \
../3rdparty/freetype/src/cache/ftcache.c \