diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-21 03:00:14 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-07-21 03:00:14 +0200 |
commit | 93d4c6bd0127b7993da76a8ce21792c8b7dd33e4 (patch) | |
tree | eede8fe50c631f28dfc40e27c966f0b0e9972e32 | |
parent | c24cf9e04a6e28baaabc4e4561db85eb311b25bf (diff) | |
parent | 21981b8ff96d5a5b5685ab33bb22959c3b584aaf (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I84bb3d8456f1f61b149ab4ff03d2776b165f54e9
-rw-r--r-- | src/nfc/qnearfieldtarget_android.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/nfc/qnearfieldtarget_android.cpp b/src/nfc/qnearfieldtarget_android.cpp index 5ba48fa6..78da6ac2 100644 --- a/src/nfc/qnearfieldtarget_android.cpp +++ b/src/nfc/qnearfieldtarget_android.cpp @@ -183,14 +183,17 @@ QNearFieldTarget::RequestId NearFieldTarget::readNdefMessages() // Sending QNdefMessage, requestCompleted and exit. QNdefMessage qNdefMessage = QNdefMessage::fromByteArray(ndefMessageQBA); - QMetaObject::invokeMethod(this, "ndefMessageRead", Qt::QueuedConnection, - Q_ARG(QNdefMessage, qNdefMessage)); + QMetaObject::invokeMethod(this, [this, qNdefMessage]() { + Q_EMIT this->QNearFieldTarget::ndefMessageRead(qNdefMessage); + }, Qt::QueuedConnection); QMetaObject::invokeMethod(this, [this, requestId]() { Q_EMIT this->requestCompleted(requestId); }, Qt::QueuedConnection); - QMetaObject::invokeMethod(this, "ndefMessageRead", Qt::QueuedConnection, - Q_ARG(QNdefMessage, qNdefMessage), - Q_ARG(QNearFieldTarget::RequestId, requestId)); + QMetaObject::invokeMethod(this, [this, qNdefMessage, requestId]() { + //TODO This is an Android specific signal in NearFieldTarget. + // We need to check if it is still necessary. + Q_EMIT this->ndefMessageRead(qNdefMessage, requestId); + }, Qt::QueuedConnection); return requestId; } |