summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Craig <phil@blackmoth.com.au>2013-06-26 02:13:02 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-06-26 09:04:28 +0200
commit1b14686657cddcc5bb37a5c7db8a35f1c4903ee3 (patch)
tree6f278cde8cee6e6ccab005de6e616d87c2bc3972
parent11ebf35b16cf4be024d63526862663599738541d (diff)
downloadmeta-qt5-1b14686657cddcc5bb37a5c7db8a35f1c4903ee3.tar.gz
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>
-rw-r--r--recipes-qt/qt5/qtbase.inc8
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 += " \
21 file://0020-Use-BGRA-extension-in-bindTexture.patch \ 21 file://0020-Use-BGRA-extension-in-bindTexture.patch \
22" 22"
23 23
24DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS} ${TSLIB_DEPENDS}" 24DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS} ${TSLIB_DEPENDS} ${FONTCONFIG_DEPENDS}"
25 25
26# to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h 26# to provide xcb/xcb_icccm.h, xcb/xcb_image.h, xcb/xcb_keysyms.h and dbus/dbus.h
27# XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus" 27# XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus"
@@ -52,6 +52,11 @@ QT_GLFLAGS ?= "-opengl"
52TSLIB_DEPENDS ?= "" 52TSLIB_DEPENDS ?= ""
53QT_TSLIB ?= "-no-tslib" 53QT_TSLIB ?= "-no-tslib"
54 54
55# FONTCONFIG_DEPENDS = "fontconfig"
56# QT_FONTCONFIG = "-fontconfig"
57FONTCONFIG_DEPENDS ?= ""
58QT_FONTCONFIG ?= "-no-fontconfig"
59
55QT_WIDGETS ?= "-widgets" 60QT_WIDGETS ?= "-widgets"
56QT_XML ?= "-xmlpatterns" 61QT_XML ?= "-xmlpatterns"
57QT_WEBKIT ?= "-webkit" 62QT_WEBKIT ?= "-webkit"
@@ -87,6 +92,7 @@ QT_CONFIG_FLAGS += " \
87 ${QT_TESTS} \ 92 ${QT_TESTS} \
88 ${QT_EXAMPLES} \ 93 ${QT_EXAMPLES} \
89 ${QT_TSLIB} \ 94 ${QT_TSLIB} \
95 ${QT_FONTCONFIG} \
90" 96"
91 97
92INC_PR = "r2" 98INC_PR = "r2"