diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-01-28 13:57:07 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-02 08:02:03 +0000 |
| commit | dda65cb2319c1c10bbeabe4687502e0ba8b83495 (patch) | |
| tree | db12308986b7b8f20beb61d78c29abe17f31139c /src | |
| parent | 6026877814cf86554d71d556a6d7f3a984798903 (diff) | |
Enable the Android code path for QtNfc
In addition avoid that the linux/neard code path is build into the
library. The qmake "linux" check is true for Android too.
Change-Id: Ia38af9ed0409ab032f5673419bd73e53ebfb3161
Reviewed-by: Peter Rustler <peter.rustler@basyskom.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/nfc/nfc.pro | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro index 5c513a7f..9ef57dad 100644 --- a/src/nfc/nfc.pro +++ b/src/nfc/nfc.pro @@ -98,9 +98,8 @@ CONFIG(blackberry) { qnearfieldsharemanagerimpl_p.h \ qnearfieldsharetargetimpl_p.h } -} -linux:qtHaveModule(dbus) { +} else:linux:!android:qtHaveModule(dbus) { NFC_BACKEND_AVAILABLE = yes QT += dbus @@ -123,9 +122,8 @@ linux:qtHaveModule(dbus) { qnearfieldmanager_neard.cpp include(neard/neard.pri) -} -simulator { +} else:simulator { NFC_BACKEND_AVAILABLE = yes QT *= gui @@ -146,11 +144,7 @@ simulator { qllcpserver_simulator_p.cpp \ qnearfieldsharemanagerimpl_p.cpp \ qnearfieldsharetargetimpl_p.cpp -} - -# not supported for now -0 { -android { +} else:android:!android-no-sdk { NFC_BACKEND_AVAILABLE = yes ANDROID_PERMISSIONS = \ android.permission.NFC @@ -182,7 +176,6 @@ android { qnearfieldsharetargetimpl_p.cpp \ android/androidmainnewintentlistener.cpp } -} isEmpty(NFC_BACKEND_AVAILABLE) { message("Unsupported NFC platform, will not build a working QtNfc library.") |