summaryrefslogtreecommitdiffstats
path: root/src/nfc/nfc.pro
diff options
context:
space:
mode:
authorPeter Rustler <peter.rustler@basyskom.com>2015-01-09 15:05:30 +0100
committerAlex Blasche <alexander.blasche@theqtcompany.com>2015-02-02 08:01:40 +0000
commit454fb59a5146b4b27756c7787e80681167819a63 (patch)
tree46da70e8fe05c040f8501293a95e0cdb8aca9c41 /src/nfc/nfc.pro
parentdd0f27136aa1d788c40631d9766fa9d1f11da4e6 (diff)
Adapt to the new "onNewIntent" API
In Anroid the foreground activity get an intent by implemmenting onNewIntent callback. This callback will be called from android when a nfc tag is in range. To support this callback an API was added in qtbase. This patch implement an listener of this API to get nfc events. Change-Id: I9ecadf6db53fe1269cb9e66f0062e9ce1ec5a95e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/nfc/nfc.pro')
-rw-r--r--src/nfc/nfc.pro7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro
index 20caba7b..5c513a7f 100644
--- a/src/nfc/nfc.pro
+++ b/src/nfc/nfc.pro
@@ -159,6 +159,7 @@ android {
ANDROID_JAR_DEPENDENCIES = \
jar/QtNfc.jar:org.qtproject.qt5.android.nfc.QtNfc
DEFINES += ANDROID_NFC
+ QT += core-private
PRIVATE_HEADERS += \
qllcpserver_android_p.h \
@@ -167,7 +168,8 @@ android {
qnearfieldmanager_android_p.h \
qnearfieldtarget_android_p.h \
qnearfieldsharemanagerimpl_p.h \
- qnearfieldsharetargetimpl_p.h
+ qnearfieldsharetargetimpl_p.h \
+ android/androidmainnewintentlistener_p.h
SOURCES += \
@@ -177,7 +179,8 @@ android {
qnearfieldmanager_android.cpp \
qnearfieldtarget_android.cpp \
qnearfieldsharemanagerimpl_p.cpp \
- qnearfieldsharetargetimpl_p.cpp
+ qnearfieldsharetargetimpl_p.cpp \
+ android/androidmainnewintentlistener.cpp
}
}