diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-26 16:45:15 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-02 17:19:16 +0100 |
| commit | 34e3687394c6fa18ef0443d63b8d7d0a68c441e0 (patch) | |
| tree | bfb319ac2d46fce7fbab3d449c985fb080704f0c | |
| parent | dcda03d3f6ec442740e3683a1971103dc639689d (diff) | |
| download | openembedded-core-contrib-34e3687394c6fa18ef0443d63b8d7d0a68c441e0.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
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 19 |
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 QT_GLFLAGS ?= "" + +QT_QT3SUPPORT ?= "-qt3support" +QT_XML ?= "-xmlpatterns" +QT_WEBKIT ?= "-webkit" +QT_PHONON ?= "-phonon" +QT_DBUS ?= "-qdbus" +QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}" + QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ -shared -no-nas-sound -no-nis \ -system-libjpeg -system-libpng -system-libtiff -system-zlib \ - -no-pch -qdbus -stl -glib -phonon -webkit \ - -xmlpatterns -no-rpath -qt3support -silent \ - ${@base_contains('DISTRO_FEATURES', 'pulseaudio', '--enable-pulseaudio', '--disable-pulseaudio', d)} \ + -no-pch -stl -glib \ + -no-rpath -silent \ + ${QT_DBUS} \ + ${QT_QT3SUPPORT} \ + ${QT_WEBKIT} \ + ${QT_PHONON} \ + ${QT_XML} \ + ${QT_MULTIMEDIA} \ ${QT_SQL_DRIVER_FLAGS} \ ${QT_DISTRO_FLAGS} \ ${QT_GLFLAGS}" |