diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-28 22:20:37 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-29 00:07:13 +0200 |
| commit | 7d53151d261c3f4979246860719ae75d160e1e1d (patch) | |
| tree | 51a630a4900ddbe8448afff02c02073f71d2f5f4 | |
| parent | 5a67ecd3d782c3622f2405e4562261070f50f5e2 (diff) | |
| download | meta-qt5-7d53151d261c3f4979246860719ae75d160e1e1d.tar.gz | |
qtsystems: add packageconfig for bluez4 and disable it by default
* bluez5 is now enabled by default and conflicts with bluez4
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtsystems.inc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtsystems.inc b/recipes-qt/qt5/qtsystems.inc index cd2438f3..e9b14aeb 100644 --- a/recipes-qt/qt5/qtsystems.inc +++ b/recipes-qt/qt5/qtsystems.inc | |||
| @@ -1,6 +1,15 @@ | |||
| 1 | require qt5.inc | 1 | require qt5.inc |
| 2 | 2 | ||
| 3 | DEPENDS += "qtbase qtdeclarative udev bluez4 gconf" | 3 | DEPENDS += "qtbase qtdeclarative udev gconf" |
| 4 | |||
| 5 | PACKAGECONFIG ??= "" | ||
| 6 | PACKAGECONFIG[bluez4] = "OE_BLUEZ_ENABLED,,bluez4" | ||
| 7 | |||
| 8 | do_configure_prepend() { | ||
| 9 | export QMAKE_CACHE_EVAL="CONFIG+=${EXTRA_OECONF}" | ||
| 10 | # disable bluez test if it isn't enabled by PACKAGECONFIG | ||
| 11 | sed -i 's/^ qtCompileTest(bluez)/ OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtsystems.pro | ||
| 12 | } | ||
| 4 | 13 | ||
| 5 | do_install_append() { | 14 | do_install_append() { |
| 6 | # Remove example.pro file as it is useless | 15 | # Remove example.pro file as it is useless |
