summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-10-12 12:48:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-18 12:13:47 +0100
commite7f2b639e0c63b1e5d7c073786c1d2d81371faa6 (patch)
treebb7df66bbe55106dc0a3d26da81c8021ced7f520 /meta/recipes-qt/qt4
parent2be7032d63c1c8e7e6891611dba4209d6cac6240 (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc10
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc6
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"
10# Set necessary variables in the profile 10# Set necessary variables in the profile
11SRC_URI += "file://qte.sh" 11SRC_URI += "file://qte.sh"
12 12
13QT_CONFIG_FLAGS += " \ 13QT_EMBEDDED_FLAGS ?= " \
14 -embedded $QT_ARCH \ 14 -embedded $QT_ARCH \
15 -qtlibinfix ${QT_LIBINFIX} \ 15 -qtlibinfix ${QT_LIBINFIX} \
16"
17QT_EMBEDDED_EXTRA_FLAGS ?= " \
16 -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \ 18 -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \
17 -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \ 19 -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
18 -qt-kbd-tty \ 20 -qt-kbd-tty \
21"
22QT_EMBEDDED_KEYPAD_FLAGS ?= " \
19 -DQT_KEYPAD_NAVIGATION \ 23 -DQT_KEYPAD_NAVIGATION \
20 " 24"
25
26QT_CONFIG_FLAGS += "${QT_EMBEDDED_FLAGS} ${QT_EMBEDDED_EXTRA_FLAGS} ${QT_EMBEDDED_KEYPAD_FLAGS}"
21 27
22require qt4.inc 28require qt4.inc
23 29
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"
12QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 12QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
13QT_GLFLAGS_qemux86 = "-opengl" 13QT_GLFLAGS_qemux86 = "-opengl"
14QT_GLFLAGS_qemuppc = "-opengl" 14QT_GLFLAGS_qemuppc = "-opengl"
15QT_CONFIG_FLAGS += "-no-xinerama -no-xkb" 15QT_X11_FLAGS ?= "-no-xinerama -no-xkb"
16QT_CONFIG_FLAGS += "${QT_X11_FLAGS}"
16QT_BASE_LIB ?= "libqt" 17QT_BASE_LIB ?= "libqt"
17 18
18# required by kdelibs4 19# required by kdelibs4
19QT_DISTRO_FLAGS = "-accessibility -sm" 20QT_KDE_FLAGS ?= "-accessibility -sm"
21QT_DISTRO_FLAGS ?= "${QT_KDE_FLAGS}"
20 22
21inherit qt4x11 23inherit qt4x11
22 24