summaryrefslogtreecommitdiffstats
path: root/src/nfc/doc
diff options
context:
space:
mode:
authorFabian Bumberger <fbumberger@rim.com>2013-09-12 11:09:27 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-19 18:50:01 +0200
commit4a8fe389db0212eb6f85a49612ceddd56dd1aaf4 (patch)
tree8c8b453d4e28b41e15c6b480ba057934fd8dc529 /src/nfc/doc
parent25222f75d0ff5da0b39c77250510bc0aab0daf73 (diff)
Changing the way nfc target detection works
On Android and BB10 the target detection does not distinguish between NFC tag types when it comes to target detection but rather between the protocols the tags use. This patch removes the parameters used for target detection. Change-Id: I4609cde61d34159bc66b29a27f8d76df816e2c23 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/nfc/doc')
-rw-r--r--src/nfc/doc/src/nfc-cpp.qdoc5
-rw-r--r--src/nfc/doc/src/nfc-index.qdoc3
-rw-r--r--src/nfc/doc/src/nfc-overview.qdoc8
-rw-r--r--src/nfc/doc/src/nfc-qml.qdoc2
4 files changed, 6 insertions, 12 deletions
diff --git a/src/nfc/doc/src/nfc-cpp.qdoc b/src/nfc/doc/src/nfc-cpp.qdoc
index 3e2942d0..b52db05b 100644
--- a/src/nfc/doc/src/nfc-cpp.qdoc
+++ b/src/nfc/doc/src/nfc-cpp.qdoc
@@ -31,10 +31,9 @@
\qtvariable nfc
\title Qt NFC C++ Classes
-\brief An API for accessing NFC Forum Tags and communication with NFC Forum Devices.
+\brief An API for accessing NFC Forum Tags.
-The \l{Qt NFC} C++ API enables an application to access NFC Forum Tags and communication with NFC
-Forum Devices.
+The \l{Qt NFC} C++ API enables an application to access NFC Forum Tagss.
To use the C++ library in your application, add the following configuration
option to your \c .pro file:
diff --git a/src/nfc/doc/src/nfc-index.qdoc b/src/nfc/doc/src/nfc-index.qdoc
index a3ff0392..a353a759 100644
--- a/src/nfc/doc/src/nfc-index.qdoc
+++ b/src/nfc/doc/src/nfc-index.qdoc
@@ -36,8 +36,7 @@ devices are touched together.
The NFC API provides APIs for interacting with NFC Forum Tags and NFC Forum Devices, including
target detection and loss, registering NDEF message handlers, reading and writing NDEF messages
-on NFC Forum Tags, sending tag specific commands, client and server LLCP sockets for bidirectional
-communication between two NFC Forum Devices.
+on NFC Forum Tags and sending tag specific commands.
\section1 Getting started
diff --git a/src/nfc/doc/src/nfc-overview.qdoc b/src/nfc/doc/src/nfc-overview.qdoc
index a70972d9..6c479c62 100644
--- a/src/nfc/doc/src/nfc-overview.qdoc
+++ b/src/nfc/doc/src/nfc-overview.qdoc
@@ -36,18 +36,14 @@
With the Qt NFC API typical use cases are:
\list
- \li Detect NFC devices entering and leaving communication range.
+ \li Detect NFC tags entering and leaving communication range.
\li Read and write NDEF message on NFC Forum Tags.
- \li Create an LLCP server listening for incoming LLCP socket connections.
- \li Create an LLCP socket connection to a NFC Forum Device.
\li Register an NDEF message handler for a particular content type.
\endlist
The following sections describe how to use QtNfc C++ classes for the above use cases.
-\section1 Detect NFC devices entering and leaving communication range.
+\section1 Detect NFC tags entering and leaving communication range.
\section1 Read and write NDEF message on NFC Forum Tags.
-\section1 Create an LLCP server listening for incoming LLCP socket connections.
-\section1 Create an LLCP socket connection to a NFC Forum Device.
\section1 Register an NDEF message handler for a particular content type.
*/
diff --git a/src/nfc/doc/src/nfc-qml.qdoc b/src/nfc/doc/src/nfc-qml.qdoc
index 3ed4cc9c..54902112 100644
--- a/src/nfc/doc/src/nfc-qml.qdoc
+++ b/src/nfc/doc/src/nfc-qml.qdoc
@@ -31,7 +31,7 @@
\qmlmodule QtNfc 5.0
\title Qt NFC QML Types
\ingroup qmlmodules
-\brief Provides QML types for accessing NFC Forum Tags and Devices
+\brief Provides QML types for accessing NFC Forum Tags
To use the classes of the module in your application you need the following
import statement in your \c .qml file: