diff options
| author | Julien CORJON <corjon.j@ecagroup.com> | 2016-04-19 13:43:53 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-06-03 19:39:30 +0200 |
| commit | f19ff45d262e4ca0af615b521a2eebe895f69a83 (patch) | |
| tree | 8212a0523e77abd4a462bb22bf15f8a2382468ce /package/qt5/qt5connectivity/qt5connectivity.mk | |
| parent | 6be3a59628f21190145181d24d6d017d33579355 (diff) | |
| download | buildroot-f19ff45d262e4ca0af615b521a2eebe895f69a83.tar.gz buildroot-f19ff45d262e4ca0af615b521a2eebe895f69a83.zip | |
qt5connectivity: add QtNfc submodule
Signed-off-by: Julien Corjon <corjon.j@ecagroup.com>
[Thomas:
- remove useless 'depends on' on toolchain features, since we now
depend on bluez_utils/neard
- remove the QT5CONNECTIVITY_INSTALL_TARGET_QMLS variable, and directly
use QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS and
QT5CONNECTIVITY_INSTALL_TARGET_NFC_QMLS in
QT5CONNECTIVITY_INSTALL_TARGET_CMDS.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/qt5/qt5connectivity/qt5connectivity.mk')
| -rw-r--r-- | package/qt5/qt5connectivity/qt5connectivity.mk | 35 |
1 files changed, 28 insertions, 7 deletions
diff --git a/package/qt5/qt5connectivity/qt5connectivity.mk b/package/qt5/qt5connectivity/qt5connectivity.mk index 936bc6f63c..ac0f2dd765 100644 --- a/package/qt5/qt5connectivity/qt5connectivity.mk +++ b/package/qt5/qt5connectivity/qt5connectivity.mk @@ -7,7 +7,7 @@ QT5CONNECTIVITY_VERSION = $(QT5_VERSION) QT5CONNECTIVITY_SITE = $(QT5_SITE) QT5CONNECTIVITY_SOURCE = qtconnectivity-opensource-src-$(QT5CONNECTIVITY_VERSION).tar.xz -QT5CONNECTIVITY_DEPENDENCIES = bluez_utils qt5base +QT5CONNECTIVITY_DEPENDENCIES = qt5base QT5CONNECTIVITY_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) @@ -18,9 +18,9 @@ QT5CONNECTIVITY_LICENSE = Commercial license QT5CONNECTIVITY_REDISTRIBUTE = NO endif -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) -QT5CONNECTIVITY_DEPENDENCIES += qt5declarative -endif +QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5DECLARATIVE),qt5declarative) +QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) +QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_NEARD),neard) define QT5CONNECTIVITY_CONFIGURE_CMDS (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) @@ -36,15 +36,36 @@ define QT5CONNECTIVITY_INSTALL_STAGING_CMDS endef ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5CONNECTIVITY_INSTALL_TARGET_QMLS +ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) +define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS cp -dpfr $(STAGING_DIR)/usr/qml/QtBluetooth $(TARGET_DIR)/usr/qml/ endef endif +ifeq ($(BR2_PACKAGE_NEARD),y) +define QT5CONNECTIVITY_INSTALL_TARGET_NFC_QMLS + cp -dpfr $(STAGING_DIR)/usr/qml/QtNfc $(TARGET_DIR)/usr/qml/ +endef +endif +endif -define QT5CONNECTIVITY_INSTALL_TARGET_CMDS +ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) +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 - $(QT5CONNECTIVITY_INSTALL_TARGET_QMLS) +endef +endif + +ifeq ($(BR2_PACKAGE_NEARD),y) +define QT5CONNECTIVITY_INSTALL_TARGET_NFC + cp -dpf $(STAGING_DIR)/usr/lib/libQt5Nfc.so.* $(TARGET_DIR)/usr/lib +endef +endif + +define QT5CONNECTIVITY_INSTALL_TARGET_CMDS + $(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH) + $(QT5CONNECTIVITY_INSTALL_TARGET_NFC) + $(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS) + $(QT5CONNECTIVITY_INSTALL_TARGET_NFC_QMLS) endef $(eval $(generic-package)) |
