diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-06 09:16:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-06 09:16:02 +0200 |
| commit | caded2edf69e8a60897653ace1e10b72199c7427 (patch) | |
| tree | 1b28cd7578195ca3d7e14c83ccf181adbe2476ec /src/nfc/qnearfieldmanager.h | |
| parent | 9677182c07b22f5f1f4fdff3f1fce6a28f76b662 (diff) | |
| parent | 54c9cd9e28bc6f0a2fa5118cfdbe922d71db6623 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
examples/nfc/corkboard/corkboard.pro
Change-Id: I5d1ea0a8e21a1b55dbf744c2f4b469bc51f05c7a
Diffstat (limited to 'src/nfc/qnearfieldmanager.h')
| -rw-r--r-- | src/nfc/qnearfieldmanager.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nfc/qnearfieldmanager.h b/src/nfc/qnearfieldmanager.h index 0d5176d9..2cf69823 100644 --- a/src/nfc/qnearfieldmanager.h +++ b/src/nfc/qnearfieldmanager.h @@ -77,6 +77,10 @@ public: bool startTargetDetection(); void stopTargetDetection(); + //TODO Qt 6 Consider removal of this registration mechanism + //None of the currently supported platforms supports the feature + //or in fact the implementation (on Android) is not what the + //function is supposed to do. int registerNdefMessageHandler(QObject *object, const char *method); int registerNdefMessageHandler(QNdefRecord::TypeNameFormat typeNameFormat, const QByteArray &type, |