diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:35:28 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-24 19:35:28 +0100 |
| commit | 042e26bccd2e53447229035c2b31cc1ab853335e (patch) | |
| tree | 03a3a3a79d8214c0be2c8c8fce3cb300f42aba9a /src/nfc | |
| parent | fc09cbb4e5b3221429e9da8feaf2bb67b73d1557 (diff) | |
| parent | d146e48b72cd8d27dd32eda09650c2c645967e4e (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Iab12802d94e2ced8b358cbeb3e70ce37d0eeec2b
Diffstat (limited to 'src/nfc')
| -rw-r--r-- | src/nfc/nfc.pro | 1 | ||||
| -rw-r--r-- | src/nfc/qllcpserver.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro index 8e737dd5..0819cc4f 100644 --- a/src/nfc/nfc.pro +++ b/src/nfc/nfc.pro @@ -80,6 +80,7 @@ linux:!android:qtHaveModule(dbus) { } else:android { NFC_BACKEND_AVAILABLE = yes + DEFINES += QT_ANDROID_NFC ANDROID_PERMISSIONS = \ android.permission.NFC ANDROID_BUNDLED_JAR_DEPENDENCIES = \ diff --git a/src/nfc/qllcpserver.cpp b/src/nfc/qllcpserver.cpp index 2bf2a097..66831b9f 100644 --- a/src/nfc/qllcpserver.cpp +++ b/src/nfc/qllcpserver.cpp @@ -41,6 +41,8 @@ #if defined(QT_SIMULATOR) #include "qllcpserver_simulator_p.h" +#elif defined(QT_ANDROID_NFC) +#include "qllcpserver_android_p.h" #else #include "qllcpserver_p_p.h" #endif |