summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnders Bakken <agbakken@gmail.com>2010-06-08 08:19:54 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-06-08 08:22:02 (GMT)
commit77046223395c290d18b69850ee4f05d1660b15df (patch)
treed1e9a66de9834602b4df7bc0bdfbd879378a27b7
parentc252a57f59fb6291d0e9a6b772b208bd1763779f (diff)
downloadQt-77046223395c290d18b69850ee4f05d1660b15df.zip
Qt-77046223395c290d18b69850ee4f05d1660b15df.tar.gz
Qt-77046223395c290d18b69850ee4f05d1660b15df.tar.bz2
Fix a freetype link failure.
qfontengine_ft.cpp uses the function FT_GlyphSlot_Embolden but ftsynth.c (where the function is implmented) isn't compiled in when QT_CONFIG contains freetype. Merge-request: 672 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r--src/gui/text/text.pri3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri
index 9ec3142..34311a9 100644
--- a/src/gui/text/text.pri
+++ b/src/gui/text/text.pri
@@ -138,7 +138,8 @@ 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/ftbitmap.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 \
../3rdparty/freetype/src/cff/cff.c \