diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2016-11-04 09:31:38 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2016-11-08 10:36:20 +0000 |
| commit | d146e48b72cd8d27dd32eda09650c2c645967e4e (patch) | |
| tree | 026c91d49102a955ba4de89e3c3448ce969446a4 | |
| parent | f0e3f3dceaedf92f0ec17a10b4002e3c948ea10f (diff) | |
Fix ODR violation in QLlcpServer on Android
This caused a compile time error when using clang.
Task-number: QTBUG-55297
Change-Id: Ic899a225852e05b4302812f007ff08964b03e90d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| -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 da92b634..15116155 100644 --- a/src/nfc/nfc.pro +++ b/src/nfc/nfc.pro @@ -101,6 +101,7 @@ linux:!android:qtHaveModule(dbus) { qnearfieldsharetargetimpl_p.cpp } else:android:!android-no-sdk { 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 17fb3369..6f529e1c 100644 --- a/src/nfc/qllcpserver.cpp +++ b/src/nfc/qllcpserver.cpp @@ -35,6 +35,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 |