aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-10-11 22:12:19 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-10-12 19:03:49 +0200
commite1d2257f60272df30bf182396d5b1e81b1196581 (patch)
treecf5cefed25ac7bf576ce6ed4d4315d4e382cbc24
parent4c177a661fd1ef599835de56776b0ebda6d78e3c (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.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index b752a065..889ab998 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -68,7 +68,10 @@ PACKAGECONFIG[examples] = ",-nomake examples"
# accessibility is required to compile qtquickcontrols
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"