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 /src/imports | |
| 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 'src/imports')
| -rw-r--r-- | src/imports/nfc/qdeclarativendeffilter.cpp | 12 | ||||
| -rw-r--r-- | src/imports/nfc/qdeclarativenearfield.cpp | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/imports/nfc/qdeclarativendeffilter.cpp b/src/imports/nfc/qdeclarativendeffilter.cpp index a3fb1581..508b9d2d 100644 --- a/src/imports/nfc/qdeclarativendeffilter.cpp +++ b/src/imports/nfc/qdeclarativendeffilter.cpp @@ -70,12 +70,18 @@ */ /*! + \qmlproperty QQmlNdefRecord::TypeNameFormat NdefFilter::typeNameFormat + + This property holds the NDEF record name format type \enum QQmlNdefRecord::TypeNameFormat. +*/ + +/*! \qmlproperty int NdefFilter::minimum This property holds the minimum number of records of the given type that must be in the NDEF message for it match. - To match any number of records set both the minimum and maximum properties to -1. + The default minimum is 1. \sa maximum */ @@ -86,13 +92,13 @@ This property holds the maximum number of records of the given type that must be in the NDEF message for it match. - To match any number of records set both the minimum and maximum properties to -1. + The default maximum is UINT_MAX. \sa minimum */ QDeclarativeNdefFilter::QDeclarativeNdefFilter(QObject *parent) -: QObject(parent), m_minimum(-1), m_maximum(-1) +: QObject(parent), m_minimum(1), m_maximum(UINT_MAX) { } diff --git a/src/imports/nfc/qdeclarativenearfield.cpp b/src/imports/nfc/qdeclarativenearfield.cpp index 3e45047b..17e6b177 100644 --- a/src/imports/nfc/qdeclarativenearfield.cpp +++ b/src/imports/nfc/qdeclarativenearfield.cpp @@ -92,6 +92,8 @@ This property indicates whether the order of records should be taken into account when matching messages. This is not supported when using neard. + + The default of orderMatch is false. */ /*! |