Merge QtNfc on Android into dev/Qt 5.6

Change-Id: I18f2d2d75064dffc4f21c2a7034bb63fcc5008e6

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.
 */
 
 /*!