diff options
| author | Julien CORJON <corjon.j@ecagroup.com> | 2016-04-19 13:43:54 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-06-03 19:43:27 +0200 |
| commit | 7dfb844357db0373edea38e4dfe25e622d91d967 (patch) | |
| tree | 31e8a509d8757191a10cf135012f043012739ff7 /package/qt5 | |
| parent | f19ff45d262e4ca0af615b521a2eebe895f69a83 (diff) | |
qt5connectivity: add bluez5_utils option for QtBluetooth submodule
Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
[Thomas: simplify ifneq conditions in the .mk file.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt5')
| -rw-r--r-- | package/qt5/qt5connectivity/Config.in | 7 | ||||
| -rw-r--r-- | package/qt5/qt5connectivity/qt5connectivity.mk | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/package/qt5/qt5connectivity/Config.in b/package/qt5/qt5connectivity/Config.in index e3128ec55..fa9b9112c 100644 --- a/package/qt5/qt5connectivity/Config.in +++ b/package/qt5/qt5connectivity/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_QT5CONNECTIVITY select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_CONCURRENT select BR2_PACKAGE_QT5BASE_DBUS - depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ_UTILS + depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS help Qt is a cross-platform application and UI framework for developers using C++. @@ -12,5 +12,6 @@ config BR2_PACKAGE_QT5CONNECTIVITY http://qt.io -comment "qt5connectivity needs neard and/or bluez_utils" - depends on !BR2_PACKAGE_NEARD && !BR2_PACKAGE_BLUEZ_UTILS +comment "qt5connectivity needs neard and/or bluez(5)_utils" + depends on !BR2_PACKAGE_NEARD && !BR2_PACKAGE_BLUEZ_UTILS && \ + !BR2_PACKAGE_BLUEZ5_UTILS diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index ac0f2dd76..0f7257d39 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -20,6 +20,7 @@ endif QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5DECLARATIVE),qt5declarative) QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) +QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ5_UTILS),bluez5_utils) QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_NEARD),neard) define QT5CONNECTIVITY_CONFIGURE_CMDS @@ -36,7 +37,7 @@ define QT5CONNECTIVITY_INSTALL_STAGING_CMDS endef ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) +ifneq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_BLUEZ5_UTILS),) define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS cp -dpfr $(STAGING_DIR)/usr/qml/QtBluetooth $(TARGET_DIR)/usr/qml/ endef @@ -48,7 +49,7 @@ endef endif endif -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) +ifneq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_BLUEZ5_UTILS),) define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH cp -dpf $(STAGING_DIR)/usr/lib/libQt5Bluetooth.so.* $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/bin/sdpscanner $(TARGET_DIR)/usr/bin |