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-x11-free.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/recipes-qt/qt4/qt4-x11-free.inc') diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 404d8b8563..20ad30c579 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc @@ -12,11 +12,13 @@ INC_PR = "r47" QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl" QT_GLFLAGS_qemuppc = "-opengl" -QT_CONFIG_FLAGS += "-no-xinerama -no-xkb" +QT_X11_FLAGS ?= "-no-xinerama -no-xkb" +QT_CONFIG_FLAGS += "${QT_X11_FLAGS}" QT_BASE_LIB ?= "libqt" # required by kdelibs4 -QT_DISTRO_FLAGS = "-accessibility -sm" +QT_KDE_FLAGS ?= "-accessibility -sm" +QT_DISTRO_FLAGS ?= "${QT_KDE_FLAGS}" inherit qt4x11 -- cgit v1.2.3-54-g00ecf