diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-28 22:19:59 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-04-29 00:07:13 +0200 |
| commit | 5a67ecd3d782c3622f2405e4562261070f50f5e2 (patch) | |
| tree | 102ee685575d0dc59c72014cec45bc52f4efcfae | |
| parent | 9ec7538c0a56620394529ca981132e54c2f414a3 (diff) | |
| download | meta-qt5-5a67ecd3d782c3622f2405e4562261070f50f5e2.tar.gz | |
qtconnectivity: improve PACKAGECONFIG handling
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtconnectivity.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qtconnectivity.inc b/recipes-qt/qt5/qtconnectivity.inc index 10dcc220..ab8d31e5 100644 --- a/recipes-qt/qt5/qtconnectivity.inc +++ b/recipes-qt/qt5/qtconnectivity.inc | |||
| @@ -3,14 +3,13 @@ require qt5.inc | |||
| 3 | DEPENDS += "qtbase qtdeclarative" | 3 | DEPENDS += "qtbase qtdeclarative" |
| 4 | 4 | ||
| 5 | PACKAGECONFIG ??= "" | 5 | PACKAGECONFIG ??= "" |
| 6 | PACKAGECONFIG[bluez4] = ",,bluez4" | 6 | PACKAGECONFIG[bluez4] = "OE_BLUEZ_ENABLED,,bluez4" |
| 7 | 7 | ||
| 8 | do_configure_prepend() { | 8 | do_configure_prepend() { |
| 9 | export QMAKE_CACHE_EVAL="CONFIG+=${EXTRA_OECONF}" | ||
| 9 | # disable bluez test if it isn't enabled by PACKAGECONFIG | 10 | # disable bluez test if it isn't enabled by PACKAGECONFIG |
| 10 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro | 11 | sed -i 's/^qtCompileTest(bluez)/OE_BLUEZ_ENABLED:qtCompileTest(bluez)/g' ${S}/qtconnectivity.pro |
| 11 | } | 12 | } |
| 12 | 13 | ||
| 13 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'bluez4', 'CONFIG+=OE_BLUEZ_ENABLED', '', d)}" | ||
| 14 | |||
| 15 | LICENSE += "| GPL-2.0" | 14 | LICENSE += "| GPL-2.0" |
| 16 | LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" | 15 | LIC_FILES_CHKSUM += "file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed" |