diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2012-10-12 12:48:10 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-18 12:03:28 +0100 |
| commit | 0479242a18661cb7fc3d76d208c82fe6ae4378ce (patch) | |
| tree | 7964eb1325a05cf083cb8040046e5a4c93243976 /meta | |
| parent | 491823fdc65d124093f1fed5a56173917443e1d6 (diff) | |
| download | openembedded-core-0479242a18661cb7fc3d76d208c82fe6ae4378ce.tar.gz openembedded-core-0479242a18661cb7fc3d76d208c82fe6ae4378ce.tar.bz2 openembedded-core-0479242a18661cb7fc3d76d208c82fe6ae4378ce.zip | |
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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded.inc | 10 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index 905e2779bb..3b3768904c 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 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 |