diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2014-06-25 22:56:56 +0200 |
|---|---|---|
| committer | Fabian Bumberger <fbumberger@rim.com> | 2014-07-02 12:42:02 +0200 |
| commit | 0ea4cc4d1e84b01e589e5e19f0323a2c80503219 (patch) | |
| tree | 18f007937f93c1eb05495e24562cefa790ba5e15 /src/nfc/nfc.pro | |
| parent | de847406f71a1f5a8bf24b2b3fc99471e62c2901 (diff) | |
Clean up neard implementation
Besides some code cleanups this patch makes sure to only build the neard
implementation if dbus is available. This patch also deals with the
possibility that the neard daemon is not running on the system.
Change-Id: I8546d34b808d8236e0434e00cf5950b31e20cb72
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/nfc/nfc.pro')
| -rw-r--r-- | src/nfc/nfc.pro | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro index 3d445415..8342cf2a 100644 --- a/src/nfc/nfc.pro +++ b/src/nfc/nfc.pro @@ -53,8 +53,7 @@ SOURCES += \ qqmlndefrecord.cpp \ qndefnfcsmartposterrecord.cpp \ qnearfieldsharemanager.cpp \ - qnearfieldsharetarget.cpp \ - qnearfieldmanager_neard.cpp + qnearfieldsharetarget.cpp CONFIG(blackberry) { NFC_BACKEND_AVAILABLE = yes @@ -100,23 +99,27 @@ CONFIG(blackberry) { } } -linux { +linux:qtHaveModule(dbus) { NFC_BACKEND_AVAILABLE = yes QT += dbus + DEFINES += NEARD_NFC + PRIVATE_HEADERS += \ qllcpsocket_p_p.h \ qllcpserver_p_p.h \ - qnearfieldmanager_neard.h \ + qnearfieldmanager_neard_p.h \ qnearfieldsharemanagerimpl_p.h \ - qnearfieldsharetargetimpl_p.h + qnearfieldsharetargetimpl_p.h \ + qnearfieldtarget_neard_p.h SOURCES += \ qllcpsocket_p.cpp \ qllcpserver_p.cpp \ qnearfieldsharemanagerimpl_p.cpp \ - qnearfieldsharetargetimpl_p.cpp + qnearfieldsharetargetimpl_p.cpp \ + qnearfieldmanager_neard.cpp include(neard/neard.pri) } @@ -162,6 +165,4 @@ isEmpty(NFC_BACKEND_AVAILABLE) { qnearfieldsharetargetimpl_p.cpp } -HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS \ - qnearfieldmanager_neard.h \ - qnearfieldtarget_neard_p.h +HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS |