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>
This commit is contained in:
parent
a0a29221c8
commit
d4ad1b760d
|
@ -12,12 +12,25 @@ QT_SQL_DRIVER_FLAGS ?= "-no-sql-ibase -no-sql-mysql -no-sql-psql -no-sql-odbc -p
|
||||||
|
|
||||||
QT_GLFLAGS ?= ""
|
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 \
|
QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
|
||||||
-shared -no-nas-sound -no-nis \
|
-shared -no-nas-sound -no-nis \
|
||||||
-system-libjpeg -system-libpng -system-libtiff -system-zlib \
|
-system-libjpeg -system-libpng -system-libtiff -system-zlib \
|
||||||
-no-pch -qdbus -stl -glib -phonon -webkit \
|
-no-pch -stl -glib \
|
||||||
-xmlpatterns -no-rpath -qt3support -silent \
|
-no-rpath -silent \
|
||||||
${@base_contains('DISTRO_FEATURES', 'pulseaudio', '--enable-pulseaudio', '--disable-pulseaudio', d)} \
|
${QT_DBUS} \
|
||||||
|
${QT_QT3SUPPORT} \
|
||||||
|
${QT_WEBKIT} \
|
||||||
|
${QT_PHONON} \
|
||||||
|
${QT_XML} \
|
||||||
|
${QT_MULTIMEDIA} \
|
||||||
${QT_SQL_DRIVER_FLAGS} \
|
${QT_SQL_DRIVER_FLAGS} \
|
||||||
${QT_DISTRO_FLAGS} \
|
${QT_DISTRO_FLAGS} \
|
||||||
${QT_GLFLAGS}"
|
${QT_GLFLAGS}"
|
||||||
|
|
Loading…
Reference in New Issue