diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-02-03 09:33:29 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-02-03 09:33:29 +0100 |
| commit | 5685d3b02fb448e74f319de0053e97fff265483a (patch) | |
| tree | dfd3f315bdbf633f6b3210aa07eea3ff51d56c89 /src/nfc | |
| parent | 0f700c166e7369230763a4c6dbc10e86944669a1 (diff) | |
| parent | 7d4f4c3083d565af00f1564ae80e5cbfbc338bd5 (diff) | |
Merge remote-tracking branch 'gerrit/stable' into dev
Conflicts:
src/bluetooth/qbluetoothservicediscoveryagent.cpp
Change-Id: I52831fc8c69062e90c003836fd9402f19d6a0ba5
Diffstat (limited to 'src/nfc')
| -rw-r--r-- | src/nfc/qqmlndefrecord.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nfc/qqmlndefrecord.cpp b/src/nfc/qqmlndefrecord.cpp index 8a3f24d7..c94578eb 100644 --- a/src/nfc/qqmlndefrecord.cpp +++ b/src/nfc/qqmlndefrecord.cpp @@ -262,6 +262,7 @@ QQmlNdefRecord::QQmlNdefRecord(const QNdefRecord &record, QObject *parent) \value Uri The NDEF record type follows the construct described in RFC 3986. \value ExternalRtd The NDEF record type follows the construct for external type names described the NFC RTD Specification. + \value Unknown The NDEF record type is unknown. */ /*! |