diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:16:36 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-21 20:30:52 +0100 |
| commit | 49b6eaede5ce149a7517718c5c59b92d25adb7d5 (patch) | |
| tree | 4c0be18a2f191bf587e365eb04818f90dddc1645 /src/nfc/qnearfieldtarget_android.cpp | |
| parent | 32623c4686d069305c8f7e046038cfcc5817052a (diff) | |
| parent | 5a38231103159346c976a620c01fba37eea85d92 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/bluetooth/bluetooth.pro
Change-Id: Ibccccc974b545696ae053f1fbffcc973d8be43cc
Diffstat (limited to 'src/nfc/qnearfieldtarget_android.cpp')
| -rw-r--r-- | src/nfc/qnearfieldtarget_android.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/nfc/qnearfieldtarget_android.cpp b/src/nfc/qnearfieldtarget_android.cpp index 42c17bce..690fc272 100644 --- a/src/nfc/qnearfieldtarget_android.cpp +++ b/src/nfc/qnearfieldtarget_android.cpp @@ -297,7 +297,6 @@ QNearFieldTarget::RequestId NearFieldTarget::writeNdefMessages(const QList<QNdef QAndroidJniEnvironment env; const char *writeMethod; - QAndroidJniObject tagTechnology; if (!setTagTechnology({NDEFFORMATABLETECHNOLOGY, NDEFTECHNOLOGY})) return QNearFieldTarget::RequestId(); @@ -331,7 +330,7 @@ QNearFieldTarget::RequestId NearFieldTarget::writeNdefMessages(const QList<QNdef } // Writing - tagTechnology.callMethod<void>(writeMethod, "(Landroid/nfc/NdefMessage;)V", jmessage.object<jobject>()); + m_tagTech.callMethod<void>(writeMethod, "(Landroid/nfc/NdefMessage;)V", jmessage.object<jobject>()); if (catchJavaExceptions()) { QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection, Q_ARG(QNearFieldTarget::Error, QNearFieldTarget::NdefWriteError), |