summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2021-04-27 09:56:32 +0200
committerTopi Reinio <topi.reinio@qt.io>2021-04-30 17:16:46 +0200
commitc6f5c869a080b6dda7a2c928820dea856502f05e (patch)
treeddc977fb81f076b5edfc60fa63129c03d8c76867
parenta93c7a8afee755dad9bee634f968658ab686bf1f (diff)
Doc: Fix documentation warnings
* Restore (parts of) snippets.pro files for quoting in the documentation * Remove references to removed method, QNearFieldManager::registerNdefMessageHandler() Task-number: QTBUG-91875 Change-Id: Ib88c71da3426826b379832003a29fffc255aaaf5 Reviewed-by: Andreas Buhr <andreas.buhr@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--examples/nfc/annotatedurl/doc/src/annotatedurl.qdoc3
-rw-r--r--src/bluetooth/doc/snippets/snippets.pro3
-rw-r--r--src/nfc/doc/snippets/snippets.pro3
-rw-r--r--src/nfc/qndeffilter.cpp5
4 files changed, 9 insertions, 5 deletions
diff --git a/examples/nfc/annotatedurl/doc/src/annotatedurl.qdoc b/examples/nfc/annotatedurl/doc/src/annotatedurl.qdoc
index 7fda040f..db165852 100644
--- a/examples/nfc/annotatedurl/doc/src/annotatedurl.qdoc
+++ b/examples/nfc/annotatedurl/doc/src/annotatedurl.qdoc
@@ -58,8 +58,7 @@ the contents of the NDEF message.
\section1 AnnotatedUrl Handler Implementation
NFC messages read by the \c QNearFieldManager are forwarded to
-AnnotatedUrl::handleMessage. The callback signature details can be
-read in \l{QNearFieldManager::registerNdefMessageHandler}.
+AnnotatedUrl::handleMessage.
\snippet annotatedurl/annotatedurl.cpp handleMessage 1
diff --git a/src/bluetooth/doc/snippets/snippets.pro b/src/bluetooth/doc/snippets/snippets.pro
new file mode 100644
index 00000000..7ad0c443
--- /dev/null
+++ b/src/bluetooth/doc/snippets/snippets.pro
@@ -0,0 +1,3 @@
+#! [contacts project modification]
+QT += bluetooth
+#! [contacts project modification]
diff --git a/src/nfc/doc/snippets/snippets.pro b/src/nfc/doc/snippets/snippets.pro
new file mode 100644
index 00000000..56a37a93
--- /dev/null
+++ b/src/nfc/doc/snippets/snippets.pro
@@ -0,0 +1,3 @@
+#! [project modification]
+QT += nfc
+#! [project modification]
diff --git a/src/nfc/qndeffilter.cpp b/src/nfc/qndeffilter.cpp
index 486ac633..eea94e8c 100644
--- a/src/nfc/qndeffilter.cpp
+++ b/src/nfc/qndeffilter.cpp
@@ -51,9 +51,8 @@ QT_BEGIN_NAMESPACE
\inmodule QtNfc
\since 5.2
- The QNdefFilter encapsulates the structure of an NDEF message and is used by
- QNearFieldManager::registerNdefMessageHandler() to match NDEF message that have a particular
- structure.
+ The QNdefFilter encapsulates the structure of an NDEF message and is used for
+ matching messages that have a particular structure.
The following filter matches NDEF messages that contain a single smart poster record: