diff options
author | Fabian Bumberger <fbumberger@rim.com> | 2014-02-13 21:09:07 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-14 14:43:10 +0100 |
commit | 27636f0063c1acb36659dd3ecced62bf2bdb131b (patch) | |
tree | 8c350349a14e4b05898ade5fdaf0357cfbe17103 /src/nfc | |
parent | a165ff0b29940a469ad8b4a46bd5dad2e2ee6d88 (diff) |
QNX: Config test for libbb2
libbb2 is not available in a public NDK yet. In order to be able to compile NFC for
BlackBerry 10 with a public NDK the BB10 implementation for the QNearfieldShareManager is only
built if libbb2 is detected.
Change-Id: Idd11d4584215fade91db9f79895f901547bce3ef
Reviewed-by: Stuart Burge <sburge@blackberry.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Diffstat (limited to 'src/nfc')
-rw-r--r-- | src/nfc/nfc.pro | 43 |
1 files changed, 32 insertions, 11 deletions
diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro index 249c65e4..7b88d4f0 100644 --- a/src/nfc/nfc.pro +++ b/src/nfc/nfc.pro @@ -59,7 +59,7 @@ CONFIG(blackberry) { NFC_BACKEND_AVAILABLE = yes DEFINES += QNX_NFC #QQNXNFC_DEBUG - LIBS += -lnfc -l:libbbsystem.so.2 + LIBS += -lnfc PRIVATE_HEADERS += \ qllcpserver_qnx_p.h \ @@ -67,20 +67,36 @@ CONFIG(blackberry) { qnearfieldmanager_qnx_p.h \ qnx/qnxnfcmanager_p.h \ qnearfieldtarget_qnx_p.h \ - qnx/qnxnfceventfilter_p.h \ - qnearfieldsharemanager_qnx_p.h \ - qnearfieldsharetarget_qnx_p.h \ - qnx/qnxnfcsharemanager_p.h + qnx/qnxnfceventfilter_p.h SOURCES += \ qllcpserver_qnx_p.cpp \ qllcpsocket_qnx_p.cpp \ qnearfieldmanager_qnx.cpp \ qnx/qnxnfcmanager.cpp \ - qnx/qnxnfceventfilter.cpp \ - qnearfieldsharemanager_qnx_p.cpp \ - qnearfieldsharetarget_qnx_p.cpp \ - qnx/qnxnfcsharemanager_p.cpp + qnx/qnxnfceventfilter.cpp + + config_libbb2 { + SOURCES += \ + qnearfieldsharemanager_qnx_p.cpp \ + qnearfieldsharetarget_qnx_p.cpp \ + qnx/qnxnfcsharemanager_p.cpp + + PRIVATE_HEADERS += \ + qnearfieldsharemanager_qnx_p.h \ + qnearfieldsharetarget_qnx_p.h \ + qnx/qnxnfcsharemanager_p.h + + LIBS += -l:libbbsystem.so.2 + } else { + SOURCES += \ + qnearfieldsharemanagerimpl_p.cpp \ + qnearfieldsharetargetimpl_p.cpp + + PRIVATE_HEADERS += \ + qnearfieldsharemanagerimpl_p.h \ + qnearfieldsharetargetimpl_p.h + } } simulator { @@ -92,13 +108,18 @@ simulator { qnearfieldmanagervirtualbase_p.h \ qnearfieldmanager_simulator_p.h \ qllcpsocket_simulator_p.h \ - qllcpserver_simulator_p.h + qllcpserver_simulator_p.h \ + qnearfieldsharemanagerimpl_p.h \ + qnearfieldsharetargetimpl_p.h + SOURCES += \ qnearfieldmanagervirtualbase.cpp \ qnearfieldmanager_simulator.cpp \ qllcpsocket_simulator_p.cpp \ - qllcpserver_simulator_p.cpp + qllcpserver_simulator_p.cpp \ + qnearfieldsharemanagerimpl_p.cpp \ + qnearfieldsharetargetimpl_p.cpp } isEmpty(NFC_BACKEND_AVAILABLE) { |