diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-11 22:12:19 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-10-20 14:55:13 +0200 |
| commit | 7b5ad04be2afad51b78093fc5b89bbfc5141def6 (patch) | |
| tree | 32abf8875c8b2c3c2ea8699848cab45790b1025a | |
| parent | d8d2421d33f862cc2a5fe9e526c03efc265d7e0b (diff) | |
qtbase: Use bundled freetype by default
* system freetype works only together with fontconfig
* building qbasicfontdatabase fails with system freetype and without
fontconfig or with freetype completely disabled
| /home/jenkins/webos-ports/workspace/webos-ports/tmp-eglibc/sysroots/a500/usr/include/ft2build.h:56:38:
fatal error: freetype/config/ftheader.h: No such file or directory
| #include <freetype/config/ftheader.h>
| ^
| compilation terminated.
| make[2]: *** [.obj/release-shared/qbasicfontdatabase.o] Error 1
| make[2]: *** Waiting for unfinished jobs....
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtbase.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index f2a4e87c..7018c69f 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -66,7 +66,10 @@ PACKAGECONFIG[tests] = ",-nomake tests" PACKAGECONFIG[examples] = ",-nomake examples" PACKAGECONFIG[accessibility] = "-accessibility,-no-accessibility" PACKAGECONFIG[glib] = "-glib,-no-glib,glib-2.0" -PACKAGECONFIG[freetype] = "-system-freetype,-no-freetype,freetype" +# use either system freetype or bundled freetype, if you disable freetype completely +# fontdatabases/basic/qbasicfontdatabase.cpp will fail to build and system freetype +# works only together with fontconfig +PACKAGECONFIG[freetype] = "-system-freetype,-freetype,freetype" PACKAGECONFIG[jpeg] = "-system-libjpeg,-no-libjpeg,jpeg" PACKAGECONFIG[libpng] = "-system-libpng,-no-libpng,libpng" PACKAGECONFIG[zlib] = "-system-zlib,-qt-zlib,zlib" |