summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-09-26 16:45:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-02 17:19:26 +0100
commitd4ad1b760d0112d0b0823c59da21cc50f6efdda6 (patch)
tree52d2ccee38c096f8c4d5cb4704fc6bccb17188a7
parenta0a29221c8df7c277139b0c875330f08cb2bdea3 (diff)
downloadpoky-d4ad1b760d0112d0b0823c59da21cc50f6efdda6.tar.gz
qt4.inc: move more options to separate variables
* make it easier to override them in bbappend * convert pulseaudio to more common -pulseaudio/-no-pulseaudio form (From OE-Core rev: 34e3687394c6fa18ef0443d63b8d7d0a68c441e0) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-qt/qt4/qt4.inc19
1 files changed, 16 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index ba231baa5d..35748f86a4 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -12,12 +12,25 @@ QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -p
12 12
13QT_GLFLAGS ?= "" 13QT_GLFLAGS ?= ""
14 14
15
16QT_QT3SUPPORT ?= "-qt3support"
17QT_XML ?= "-xmlpatterns"
18QT_WEBKIT ?= "-webkit"
19QT_PHONON ?= "-phonon"
20QT_DBUS ?= "-qdbus"
21QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}"
22
15QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ 23QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
16 -shared -no-nas-sound -no-nis \ 24 -shared -no-nas-sound -no-nis \
17 -system-libjpeg -system-libpng -system-libtiff -system-zlib \ 25 -system-libjpeg -system-libpng -system-libtiff -system-zlib \
18 -no-pch -qdbus -stl -glib -phonon -webkit \ 26 -no-pch -stl -glib \
19 -xmlpatterns -no-rpath -qt3support -silent \ 27 -no-rpath -silent \
20 ${@base_contains('DISTRO_FEATURES', 'pulseaudio', '--enable-pulseaudio', '--disable-pulseaudio', d)} \ 28 ${QT_DBUS} \
29 ${QT_QT3SUPPORT} \
30 ${QT_WEBKIT} \
31 ${QT_PHONON} \
32 ${QT_XML} \
33 ${QT_MULTIMEDIA} \
21 ${QT_SQL_DRIVER_FLAGS} \ 34 ${QT_SQL_DRIVER_FLAGS} \
22 ${QT_DISTRO_FLAGS} \ 35 ${QT_DISTRO_FLAGS} \
23 ${QT_GLFLAGS}" 36 ${QT_GLFLAGS}"