From e7f2b639e0c63b1e5d7c073786c1d2d81371faa6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 12 Oct 2012 12:48:10 +0200 Subject: qt4: use extra variable for more QT_CONFIG_FLAGS fragments * qt4-embedded was forcing -DQT_KEYPAD_NAVIGATION which depends on feature-completer * separate variable makes it easier to not enable QT_KEYPAD_NAVIGATION in some upper layer where we have disabled feature-completer (From OE-Core rev: 0479242a18661cb7fc3d76d208c82fe6ae4378ce) Signed-off-by: Martin Jansa Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/qt4-embedded.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'meta/recipes-qt/qt4/qt4-embedded.inc') diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index 905e277..3b37689 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc @@ -10,14 +10,20 @@ QT_BASE_LIB ?= "libqt-embedded" # Set necessary variables in the profile SRC_URI += "file://qte.sh" -QT_CONFIG_FLAGS += " \ +QT_EMBEDDED_FLAGS ?= " \ -embedded $QT_ARCH \ -qtlibinfix ${QT_LIBINFIX} \ +" +QT_EMBEDDED_EXTRA_FLAGS ?= " \ -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \ -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \ -qt-kbd-tty \ +" +QT_EMBEDDED_KEYPAD_FLAGS ?= " \ -DQT_KEYPAD_NAVIGATION \ - " +" + +QT_CONFIG_FLAGS += "${QT_EMBEDDED_FLAGS} ${QT_EMBEDDED_EXTRA_FLAGS} ${QT_EMBEDDED_KEYPAD_FLAGS}" require qt4.inc -- cgit v1.1