diff options
| author | Philip Craig <phil@blackmoth.com.au> | 2013-06-26 02:13:02 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-06-26 09:04:28 +0200 |
| commit | 1b14686657cddcc5bb37a5c7db8a35f1c4903ee3 (patch) | |
| tree | 6f278cde8cee6e6ccab005de6e616d87c2bc3972 /recipes-qt/qt5 | |
| parent | 11ebf35b16cf4be024d63526862663599738541d (diff) | |
qtbase: disable fontconfig support by default
Currently fontconfig support is autodetected. It is better to be
deterministic. Since qtbase-fonts is not installed where fontconfig
will find it, it seems that current users are not using fontconfig.
Signed-off-by: Philip Craig <phil@blackmoth.com.au>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5')
| -rw-r--r-- | recipes-qt/qt5/qtbase.inc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index ee4094b2..f521a302 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -21,7 +21,7 @@ SRC_URI += " \ file://0020-Use-BGRA-extension-in-bindTexture.patch \ " -DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS} ${TSLIB_DEPENDS}" +DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS} ${TSLIB_DEPENDS} ${FONTCONFIG_DEPENDS}" # to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h # XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" @@ -52,6 +52,11 @@ QT_GLFLAGS ?= "-opengl" TSLIB_DEPENDS ?= "" QT_TSLIB ?= "-no-tslib" +# FONTCONFIG_DEPENDS = "fontconfig" +# QT_FONTCONFIG = "-fontconfig" +FONTCONFIG_DEPENDS ?= "" +QT_FONTCONFIG ?= "-no-fontconfig" + QT_WIDGETS ?= "-widgets" QT_XML ?= "-xmlpatterns" QT_WEBKIT ?= "-webkit" @@ -87,6 +92,7 @@ QT_CONFIG_FLAGS += " \ ${QT_TESTS} \ ${QT_EXAMPLES} \ ${QT_TSLIB} \ + ${QT_FONTCONFIG} \ " INC_PR = "r2" |