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>
This commit is contained in:
parent
2be7032d63
commit
e7f2b639e0
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue