5 files changed, 14 insertions, 2 deletions
diff --git a/src/imports/nfc/qdeclarativendeffilter.cpp b/src/imports/nfc/qdeclarativendeffilter.cpp
index fe526e07..d028dcb3 100644
--- a/src/imports/nfc/qdeclarativendeffilter.cpp
+++ b/src/imports/nfc/qdeclarativendeffilter.cpp
@@ -75,7 +75,7 @@
 
     This property holds the NDEF record type that the filter matches.  This property must be set to
     the fully qualified record type, i.e. including the NIS and NSS prefixes.  For example set to
-    \li {urn:nfc:wkt:U} to match NFC RTD-URI records.
+    \c {urn:nfc:wkt:U} to match NFC RTD-URI records.
 */
 
 /*!
diff --git a/src/imports/nfc/qdeclarativendefmimerecord_p.h b/src/imports/nfc/qdeclarativendefmimerecord_p.h
index 6f58f0a5..be656749 100644
--- a/src/imports/nfc/qdeclarativendefmimerecord_p.h
+++ b/src/imports/nfc/qdeclarativendefmimerecord_p.h
@@ -46,6 +46,10 @@
 
 QT_USE_NAMESPACE_NFC
 
+#ifdef Q_QDOC
+// workaround for qdoc parsing error in namespaced classes (see QTBUG-31851)
+class ForcePrivateForQDoc;
+#endif
 class QDeclarativeNdefMimeRecord : public QDeclarativeNdefRecord
 {
     Q_OBJECT
diff --git a/src/imports/nfc/qdeclarativendeftextrecord_p.h b/src/imports/nfc/qdeclarativendeftextrecord_p.h
index 2b1b1cde..c1f77096 100644
--- a/src/imports/nfc/qdeclarativendeftextrecord_p.h
+++ b/src/imports/nfc/qdeclarativendeftextrecord_p.h
@@ -48,6 +48,10 @@
 
 QT_USE_NAMESPACE_NFC
 
+#ifdef Q_QDOC
+// workaround for qdoc parsing error in namespaced classes (see QTBUG-31851)
+class ForcePrivateForQDoc;
+#endif
 class QDeclarativeNdefTextRecord : public QDeclarativeNdefRecord
 {
     Q_OBJECT
diff --git a/src/imports/nfc/qdeclarativendefurirecord_p.h b/src/imports/nfc/qdeclarativendefurirecord_p.h
index 436ce266..7db6296a 100644
--- a/src/imports/nfc/qdeclarativendefurirecord_p.h
+++ b/src/imports/nfc/qdeclarativendefurirecord_p.h
@@ -50,6 +50,10 @@
 
 QT_USE_NAMESPACE_NFC
 
+#ifdef Q_QDOC
+// workaround for qdoc parsing error in namespaced classes (see QTBUG-31851)
+class ForcePrivateForQDoc;
+#endif
 class QDeclarativeNdefUriRecord : public QDeclarativeNdefRecord
 {
     Q_OBJECT
diff --git a/src/imports/nfc/qdeclarativenearfield_p.h b/src/imports/nfc/qdeclarativenearfield_p.h
index 3d19decc..c1f168f8 100644
--- a/src/imports/nfc/qdeclarativenearfield_p.h
+++ b/src/imports/nfc/qdeclarativenearfield_p.h
@@ -49,10 +49,10 @@
 
 #include "qdeclarativendefrecord.h"
 
-class QDeclarativeNdefFilter;
 
 QT_USE_NAMESPACE_NFC
 
+class QDeclarativeNdefFilter;
 class QDeclarativeNearField : public QObject, public QQmlParserStatus
 {
     Q_OBJECT