NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt5connectivity: add bluez5_utils option for QtBluetooth submodule

Browse Source 
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>
This commit is contained in:
Julien CORJON 2016-04-19 13:43:54 +02:00 committed by Thomas Petazzoni
parent f19ff45d26
commit 7dfb844357
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/qt5/qt5connectivity/Config.in
View File

@ -3,7 +3,7 @@ config BR2_PACKAGE_QT5CONNECTIVITY
select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE
select BR2_PACKAGE_QT5BASE_CONCURRENT select BR2_PACKAGE_QT5BASE_CONCURRENT
select BR2_PACKAGE_QT5BASE_DBUS 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 help
Qt is a cross-platform application and UI framework for Qt is a cross-platform application and UI framework for
developers using C++. developers using C++.
@ -12,5 +12,6 @@ config BR2_PACKAGE_QT5CONNECTIVITY
http://qt.io http://qt.io
comment "qt5connectivity needs neard and/or bluez_utils" comment "qt5connectivity needs neard and/or bluez(5)_utils"
depends on !BR2_PACKAGE_NEARD && !BR2_PACKAGE_BLUEZ_UTILS depends on !BR2_PACKAGE_NEARD && !BR2_PACKAGE_BLUEZ_UTILS && \
!BR2_PACKAGE_BLUEZ5_UTILS

5
package/qt5/qt5connectivity/qt5connectivity.mk
View File

@ -20,6 +20,7 @@ endif
QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5DECLARATIVE),qt5declarative) QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5DECLARATIVE),qt5declarative)
QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) 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) QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_NEARD),neard)
define QT5CONNECTIVITY_CONFIGURE_CMDS define QT5CONNECTIVITY_CONFIGURE_CMDS
@ -36,7 +37,7 @@ define QT5CONNECTIVITY_INSTALL_STAGING_CMDS
endef endef
ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) 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 define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS
cp -dpfr $(STAGING_DIR)/usr/qml/QtBluetooth $(TARGET_DIR)/usr/qml/ cp -dpfr $(STAGING_DIR)/usr/qml/QtBluetooth $(TARGET_DIR)/usr/qml/
endef endef
@ -48,7 +49,7 @@ endef
endif endif
endif endif
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) ifneq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_BLUEZ5_UTILS),)
define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH
cp -dpf $(STAGING_DIR)/usr/lib/libQt5Bluetooth.so.* $(TARGET_DIR)/usr/lib cp -dpf $(STAGING_DIR)/usr/lib/libQt5Bluetooth.so.* $(TARGET_DIR)/usr/lib
cp -dpf $(STAGING_DIR)/usr/bin/sdpscanner $(TARGET_DIR)/usr/bin cp -dpf $(STAGING_DIR)/usr/bin/sdpscanner $(TARGET_DIR)/usr/bin