diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-06-26 16:50:42 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-27 08:51:49 +0200 |
| commit | 06533c66b54f2ac9a9911e093723b71e27bd677d (patch) | |
| tree | 172dba1b4aad59981f5ee6b843481f3dd828978b /src/nfc | |
| parent | 8989524761ee6deb85fc3dc15cceb10cae0c82d8 (diff) | |
Fix QNearFieldTarget::AccessMethods flags to permit OR concatenation
Adds an UnknownAccess enum value for tag types not yet known by
the library/backend.
Task-number: QTBUG-26027
Change-Id: Ic7654c0906b22bbd5c71bafd3e90a924bf913e23
Reviewed-by: Stuart Burge <sburge@blackberry.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Diffstat (limited to 'src/nfc')
| -rw-r--r-- | src/nfc/qnearfieldtarget.cpp | 1 | ||||
| -rw-r--r-- | src/nfc/qnearfieldtarget.h | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/nfc/qnearfieldtarget.cpp b/src/nfc/qnearfieldtarget.cpp index 9b0976e1..89f76f99 100644 --- a/src/nfc/qnearfieldtarget.cpp +++ b/src/nfc/qnearfieldtarget.cpp @@ -101,6 +101,7 @@ QT_BEGIN_NAMESPACE_NFC This enum describes the access methods a near field target supports. + \value UnknownAccess The target supports an unknown access type. \value NdefAccess The target supports reading and writing NDEF messages using readNdefMessages() and writeNdefMessages(). \value TagTypeSpecificAccess The target supports sending tag type specific commands using diff --git a/src/nfc/qnearfieldtarget.h b/src/nfc/qnearfieldtarget.h index 140547e3..8c2dd0c1 100644 --- a/src/nfc/qnearfieldtarget.h +++ b/src/nfc/qnearfieldtarget.h @@ -77,9 +77,10 @@ public: }; enum AccessMethod { - NdefAccess, - TagTypeSpecificAccess, - LlcpAccess + UnknownAccess = 0x00, + NdefAccess = 0x01, + TagTypeSpecificAccess = 0x02, + LlcpAccess = 0x04 }; Q_DECLARE_FLAGS(AccessMethods, AccessMethod) |