From ea413e54839872770d1f10e65cab4670b470063c Mon Sep 17 00:00:00 2001 From: Fabian Bumberger Date: Mon, 30 Sep 2013 12:24:34 +0200 Subject: QML Near Field: Allow detecting NDEF messages without setting a filter Change-Id: Ifb85ddb23df8e5302aac1b70b893f71e0fe8462d Reviewed-by: Alex Blasche --- src/imports/nfc/qdeclarativenearfield.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/imports/nfc/qdeclarativenearfield.cpp b/src/imports/nfc/qdeclarativenearfield.cpp index 81a27730..ed907292 100644 --- a/src/imports/nfc/qdeclarativenearfield.cpp +++ b/src/imports/nfc/qdeclarativenearfield.cpp @@ -90,7 +90,10 @@ \qmlproperty list NearField::filter This property holds the NDEF filter constraints. The \l messageRecords property will only be - set to NDEF messages which match the filter. + set to NDEF messages which match the filter. If no filter is set, a message handler for + all NDEF messages will be registered. + + \l QNearFieldManager::registerNdefMessageHandler() */ /*! @@ -143,8 +146,7 @@ void QDeclarativeNearField::componentComplete() { m_componentCompleted = true; - if (!m_filterList.isEmpty()) - registerMessageHandler(); + registerMessageHandler(); } void QDeclarativeNearField::registerMessageHandler() @@ -155,10 +157,6 @@ void QDeclarativeNearField::registerMessageHandler() if (m_messageHandlerId != -1) m_manager->unregisterNdefMessageHandler(m_messageHandlerId); - // no filter abort - if (m_filterList.isEmpty()) - return; - QNdefFilter ndefFilter; ndefFilter.setOrderMatch(m_orderMatch); foreach (const QDeclarativeNdefFilter *filter, m_filterList) { -- cgit v1.2.3