diff options
| author | Peter Rustler <peter.rustler@basyskom.com> | 2015-03-06 12:16:28 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-03-19 08:10:04 +0000 |
| commit | 24a9b68c8eba782fee2e040113fe8afe783ba8ec (patch) | |
| tree | eb14aeafe3358765b32cf12fe8dd97f245cd92de /src/nfc/qnearfieldtarget_android_p.h | |
| parent | 55aab6b68bf4991fb133b5f7066a07554e3c5b3e (diff) | |
Using QtAndroidExtras instead of Andoid JNI for NFC
Some functions in QNearfieldtarget_android are missing.
They will be ported to QtAndroidExtras in a later
commit.
Change-Id: Ib68f91f394f28c8b19ccea4335c8f0292929f003
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src/nfc/qnearfieldtarget_android_p.h')
| -rw-r--r-- | src/nfc/qnearfieldtarget_android_p.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nfc/qnearfieldtarget_android_p.h b/src/nfc/qnearfieldtarget_android_p.h index 57d54890..a73203a3 100644 --- a/src/nfc/qnearfieldtarget_android_p.h +++ b/src/nfc/qnearfieldtarget_android_p.h @@ -42,6 +42,8 @@ #include "qstringlist.h" #include <QTimer> +#include <QtAndroidExtras/QAndroidJniObject> +#include <QtAndroidExtras/QAndroidJniEnvironment> QT_BEGIN_NAMESPACE @@ -49,7 +51,7 @@ class NearFieldTarget : public QNearFieldTarget { Q_OBJECT public: - NearFieldTarget(jobject intent, + NearFieldTarget(QAndroidJniObject intent, const QByteArray uid, QObject *parent = 0); virtual ~NearFieldTarget(); @@ -61,7 +63,7 @@ public: virtual RequestId sendCommand(const QByteArray &command); virtual RequestId sendCommands(const QList<QByteArray> &commands); virtual RequestId writeNdefMessages(const QList<QNdefMessage> &messages); - void setIntent(jobject intent); + void setIntent(QAndroidJniObject intent); signals: void targetDestroyed(const QByteArray &tagId); @@ -83,7 +85,7 @@ protected: bool catchJavaExceptions(JNIEnv *env) const; protected: - jobject m_intent; + QAndroidJniObject m_intent; QByteArray m_uid; QStringList m_techList; Type m_type; |