diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2013-09-30 12:24:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-30 15:01:07 +0200 |
| commit | ea413e54839872770d1f10e65cab4670b470063c (patch) | |
| tree | 454b453f208a9faa298de22301b54c45d2a5e4d8 /src/imports/nfc | |
| parent | 171a0e2568c639ac40329a9d2ace01344eb395b0 (diff) | |
QML Near Field: Allow detecting NDEF messages without setting a filter
Change-Id: Ifb85ddb23df8e5302aac1b70b893f71e0fe8462d
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/imports/nfc')
| -rw-r--r-- | src/imports/nfc/qdeclarativenearfield.cpp | 12 |
1 files 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<NdefFilter> 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) { |