diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-11-11 07:34:02 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-11-11 07:34:08 +0100 |
| commit | 1ebd4d02a67a162411af88b26c899bfb8cf871ca (patch) | |
| tree | eaf773acf877561751578c4f99db073b01d71f28 /src/nfc | |
| parent | 90c2fe20adfc65004b230a549af68c579f7152fb (diff) | |
| parent | 34904f021fbee34ec51c732fa28a5bd7ffabdde8 (diff) | |
Merge remote-tracking branch 'gerrit/5.6' into dev
Change-Id: I9303c9e168afa9bea87a63abe8774c8f2fee5f3e
Diffstat (limited to 'src/nfc')
| -rw-r--r-- | src/nfc/doc/qtnfc.qdocconf | 2 | ||||
| -rw-r--r-- | src/nfc/doc/src/nfc-android.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nfc/doc/qtnfc.qdocconf b/src/nfc/doc/qtnfc.qdocconf index 61ed15b6..8b0ba092 100644 --- a/src/nfc/doc/qtnfc.qdocconf +++ b/src/nfc/doc/qtnfc.qdocconf @@ -4,7 +4,7 @@ project = QtNfc description = Qt NFC Reference Documentation version = $QT_VERSION -examplesinstallpath = nfc +examplesinstallpath = qtconnectivity/nfc qhp.projects = QtNfc diff --git a/src/nfc/doc/src/nfc-android.qdoc b/src/nfc/doc/src/nfc-android.qdoc index e7c43423..7288b78a 100644 --- a/src/nfc/doc/src/nfc-android.qdoc +++ b/src/nfc/doc/src/nfc-android.qdoc @@ -48,7 +48,7 @@ This means the application has to provide an AndroidManifest.xml file with prope \endcode When the application is started it has to register an message handler with -\l registerNdefMessageHandler(). +\l {QNearFieldManager::}{registerNdefMessageHandler()} The first NDEF message arriving in the handler is the message that started the application. See the \l {corkboard}{CorkBoard} application for an example. |