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>
This commit is contained in:
parent
11ebf35b16
commit
1b14686657
|
@ -21,7 +21,7 @@ SRC_URI += " \
|
||||||
file://0020-Use-BGRA-extension-in-bindTexture.patch \
|
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
|
# 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"
|
# XCB_DEPENDS += "xcb-util-wm xcb-util-image xcb-util-keysyms dbus"
|
||||||
|
@ -52,6 +52,11 @@ QT_GLFLAGS ?= "-opengl"
|
||||||
TSLIB_DEPENDS ?= ""
|
TSLIB_DEPENDS ?= ""
|
||||||
QT_TSLIB ?= "-no-tslib"
|
QT_TSLIB ?= "-no-tslib"
|
||||||
|
|
||||||
|
# FONTCONFIG_DEPENDS = "fontconfig"
|
||||||
|
# QT_FONTCONFIG = "-fontconfig"
|
||||||
|
FONTCONFIG_DEPENDS ?= ""
|
||||||
|
QT_FONTCONFIG ?= "-no-fontconfig"
|
||||||
|
|
||||||
QT_WIDGETS ?= "-widgets"
|
QT_WIDGETS ?= "-widgets"
|
||||||
QT_XML ?= "-xmlpatterns"
|
QT_XML ?= "-xmlpatterns"
|
||||||
QT_WEBKIT ?= "-webkit"
|
QT_WEBKIT ?= "-webkit"
|
||||||
|
@ -87,6 +92,7 @@ QT_CONFIG_FLAGS += " \
|
||||||
${QT_TESTS} \
|
${QT_TESTS} \
|
||||||
${QT_EXAMPLES} \
|
${QT_EXAMPLES} \
|
||||||
${QT_TSLIB} \
|
${QT_TSLIB} \
|
||||||
|
${QT_FONTCONFIG} \
|
||||||
"
|
"
|
||||||
|
|
||||||
INC_PR = "r2"
|
INC_PR = "r2"
|
||||||
|
|
Loading…
Reference in New Issue