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:13:47 +0100 |
commit | e7f2b639e0c63b1e5d7c073786c1d2d81371faa6 (patch) | |
tree | bb7df66bbe55106dc0a3d26da81c8021ced7f520 /meta/recipes-qt/qt4/qt4-x11-free.inc | |
parent | 2be7032d63c1c8e7e6891611dba4209d6cac6240 (diff) | |
download | poky-e7f2b639e0c63b1e5d7c073786c1d2d81371faa6.tar.gz |
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 <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4/qt4-x11-free.inc')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 6 |
1 files changed, 4 insertions, 2 deletions
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" | |||
12 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " | 12 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " |
13 | QT_GLFLAGS_qemux86 = "-opengl" | 13 | QT_GLFLAGS_qemux86 = "-opengl" |
14 | QT_GLFLAGS_qemuppc = "-opengl" | 14 | QT_GLFLAGS_qemuppc = "-opengl" |
15 | QT_CONFIG_FLAGS += "-no-xinerama -no-xkb" | 15 | QT_X11_FLAGS ?= "-no-xinerama -no-xkb" |
16 | QT_CONFIG_FLAGS += "${QT_X11_FLAGS}" | ||
16 | QT_BASE_LIB ?= "libqt" | 17 | QT_BASE_LIB ?= "libqt" |
17 | 18 | ||
18 | # required by kdelibs4 | 19 | # required by kdelibs4 |
19 | QT_DISTRO_FLAGS = "-accessibility -sm" | 20 | QT_KDE_FLAGS ?= "-accessibility -sm" |
21 | QT_DISTRO_FLAGS ?= "${QT_KDE_FLAGS}" | ||
20 | 22 | ||
21 | inherit qt4x11 | 23 | inherit qt4x11 |
22 | 24 | ||