summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2014-11-13 12:53:41 +0100
committerAlex Blasche <alexander.blasche@theqtcompany.com>2014-11-13 14:24:00 +0100
commit6705e28bc765e48ef5f6128560a2333d8cf94054 (patch)
tree0d88c22bfac64a589bbd722a2e0a16fd80c3c94c /src
parent8a39bc14ae2be320621132682d1bc575162ff69e (diff)
Update documentation to reflect new Linux platform support
Fixes a few qdoc errors along the way. Change-Id: Ia0caf483f5c86dbd5c47f3d96a6d5bcf622db312 Reviewed-by: Martin Leutelt <martin.leutelt@basyskom.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/imports/nfc/qdeclarativenearfield.cpp6
-rw-r--r--src/nfc/doc/src/nfc-index.qdoc2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/nfc/qdeclarativenearfield.cpp b/src/imports/nfc/qdeclarativenearfield.cpp
index ffba30d0..9f704e4b 100644
--- a/src/imports/nfc/qdeclarativenearfield.cpp
+++ b/src/imports/nfc/qdeclarativenearfield.cpp
@@ -71,8 +71,8 @@
and \l orderMatch properties to match the required NDEF messages. Once an NDEF message is
successfully read from a tag the \l messageRecords property is updated.
- \note For platforms using neard filtering is currently not implemented. For more information
- on neard see \relates QNearFieldManager.
+ \note For platforms using neard, filtering is currently not implemented. For more information
+ on neard see \l QNearFieldManager.
\snippet doc_src_qtnfc.qml QML register for messages
*/
@@ -109,7 +109,7 @@
the adapter will start polling and stop polling if set to \c false.
\note On platforms using neard, the adapter will stop polling as soon as a tag has been detected.
- For more information see \relates QNearFieldManager.
+ For more information see \l QNearFieldManager.
*/
/*!
diff --git a/src/nfc/doc/src/nfc-index.qdoc b/src/nfc/doc/src/nfc-index.qdoc
index bd375ea8..ba4fa919 100644
--- a/src/nfc/doc/src/nfc-index.qdoc
+++ b/src/nfc/doc/src/nfc-index.qdoc
@@ -34,7 +34,7 @@
The NFC API provides connectivity between NFC enabled devices.
-Currently the API is supported on \l{Qt for BlackBerry}{BlackBerry 10}.
+Currently the API is supported on \l{Qt for BlackBerry}{BlackBerry 10} and Linux using \l {https://01.org/linux-nfc}{Neard} v0.14 or later.
\section1 Overview