diff options
| author | Stephan Binner <stephan.binner@basyskom.com> | 2015-03-24 15:46:55 +0100 |
|---|---|---|
| committer | Stephan Binner <stephan.binner@basyskom.com> | 2015-04-02 11:58:09 +0000 |
| commit | a6eada4aec4f029bce178845755fc64f74370c0c (patch) | |
| tree | 192dd8ccbce07317e5b1b5ad19efb8f682ced79b /examples | |
| parent | 920542ffbb1b97c8ac22abb372d0ae042066ebd2 (diff) | |
Fix implementation of and improve NdefFilter usage
Updated QML docu: describe typeNameFormat, defaults of min/max/orderMatch
Removed mention of "both minimum and maximum -1 means matches any numbers":
it is unimplemented and QNdefFilter::Record uses unsigned int for min/max
Adapt filter logic from QNearFieldManagerPrivateVirtualBase for Android and
QNX backends to add support for orderMatch, minimum and maximum properties
Adapt filters and examples to use empty type as wildcard (eg Mime records)
Change-Id: Id9d51514bb593bd38c3fed89b612af54dffceff0
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/nfc/annotatedurl/annotatedurl.cpp | 3 | ||||
| -rw-r--r-- | examples/nfc/poster/poster.qml | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/examples/nfc/annotatedurl/annotatedurl.cpp b/examples/nfc/annotatedurl/annotatedurl.cpp index cd35c4ef..cf7dd17a 100644 --- a/examples/nfc/annotatedurl/annotatedurl.cpp +++ b/examples/nfc/annotatedurl/annotatedurl.cpp @@ -70,6 +70,9 @@ AnnotatedUrl::AnnotatedUrl(QObject *parent) filter.setOrderMatch(false); filter.appendRecord<QNdefNfcTextRecord>(1, UINT_MAX); filter.appendRecord<QNdefNfcUriRecord>(); + // type parameter cannot specify substring so filter for "image/" below + filter.appendRecord(QNdefRecord::Mime, QByteArray(), 0, 1); + int result = manager->registerNdefMessageHandler(filter, this, SLOT(handleMessage(QNdefMessage,QNearFieldTarget*))); //! [QNearFieldManager register handler] diff --git a/examples/nfc/poster/poster.qml b/examples/nfc/poster/poster.qml index 89e6af19..a70a998b 100644 --- a/examples/nfc/poster/poster.qml +++ b/examples/nfc/poster/poster.qml @@ -63,8 +63,9 @@ Rectangle { } filter: [ - NdefFilter { type: "U"; typeNameFormat: NdefRecord.NfcRtd; minimum: 1; maximum: 1 }, - NdefFilter { type: "T"; typeNameFormat: NdefRecord.NfcRtd; minimum: 1 } + NdefFilter { type: "U"; typeNameFormat: NdefRecord.NfcRtd; maximum: 1 }, + NdefFilter { type: "T"; typeNameFormat: NdefRecord.NfcRtd }, + NdefFilter { typeNameFormat: NdefRecord.Mime; minimum: 0; maximum: 1 } ] onMessageRecordsChanged: { |