[oe] [meta-qt5][PATCH] qtbase: disable fontconfig support by default
Philip Craig
phil at blackmoth.com.au
Wed Jun 26 02:13:02 UTC 2013
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 at blackmoth.com.au>
---
recipes-qt/qt5/qtbase.inc | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index ee4094b..f521a30 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"
--
1.8.2
More information about the Openembedded-devel
mailing list