6 files changed, 17 insertions, 10 deletions
diff --git a/src/corelib/thread/qexception.cpp b/src/corelib/thread/qexception.cpp
index e00181e64b..aed8d91a0a 100644
--- a/src/corelib/thread/qexception.cpp
+++ b/src/corelib/thread/qexception.cpp
@@ -40,8 +40,8 @@
 #include "qexception.h"
 #include "QtCore/qshareddata.h"
 
-#ifndef QT_NO_QFUTURE
-#ifndef QT_NO_EXCEPTIONS
+#if !defined(QT_NO_QFUTURE) || defined(Q_CLANG_QDOC)
+#if !defined(QT_NO_EXCEPTIONS) || defined(Q_CLANG_QDOC)
 
 QT_BEGIN_NAMESPACE
 
@@ -155,7 +155,7 @@ QUnhandledException *QUnhandledException::clone() const
     return new QUnhandledException(*this);
 }
 
-#ifndef Q_QDOC
+#if !defined(Q_CLANG_QDOC)
 
 namespace QtPrivate {
 
@@ -220,7 +220,7 @@ bool ExceptionStore::hasThrown() const { return exceptionHolder.base->hasThrown;
 
 } // namespace QtPrivate
 
-#endif //Q_QDOC
+#endif //Q_CLANG_QDOC
 
 QT_END_NAMESPACE
 
diff --git a/src/corelib/thread/qexception.h b/src/corelib/thread/qexception.h
index 5c43cedffd..a613064306 100644
--- a/src/corelib/thread/qexception.h
+++ b/src/corelib/thread/qexception.h
@@ -54,7 +54,7 @@
 QT_BEGIN_NAMESPACE
 
 
-#ifndef QT_NO_EXCEPTIONS
+#if !defined(QT_NO_EXCEPTIONS) || defined(Q_CLANG_QDOC)
 
 class Q_CORE_EXPORT QException : public std::exception
 {
diff --git a/src/corelib/thread/qfuture.h b/src/corelib/thread/qfuture.h
index 20efc3ce9f..d86b09f7ea 100644
--- a/src/corelib/thread/qfuture.h
+++ b/src/corelib/thread/qfuture.h
@@ -42,7 +42,7 @@
 
 #include <QtCore/qglobal.h>
 
-#ifndef QT_NO_QFUTURE
+#if !defined(QT_NO_QFUTURE) || defined(Q_CLANG_QDOC)
 
 #include <QtCore/qfutureinterface.h>
 #include <QtCore/qstring.h>
diff --git a/src/corelib/tools/qbytearraymatcher.cpp b/src/corelib/tools/qbytearraymatcher.cpp
index 76af726ef9..252545c782 100644
--- a/src/corelib/tools/qbytearraymatcher.cpp
+++ b/src/corelib/tools/qbytearraymatcher.cpp
@@ -415,7 +415,7 @@ int QStaticByteArrayMatcherBase::indexOfIn(const char *needle, uint nlen, const
 */
 
 /*!
-    \fn qMakeStaticByteArrayMatcher(const char (&pattern)[N])
+    \fn QStaticByteArrayMatcher qMakeStaticByteArrayMatcher(const char (&pattern)[N])
     \since 5.9
     \relates QStaticByteArrayMatcher
 
diff --git a/src/network/kernel/qnetworkdatagram.cpp b/src/network/kernel/qnetworkdatagram.cpp
index d167190684..50421fa7f5 100644
--- a/src/network/kernel/qnetworkdatagram.cpp
+++ b/src/network/kernel/qnetworkdatagram.cpp
@@ -442,10 +442,11 @@ void QNetworkDatagram::setData(const QByteArray &data)
 }
 
 /*!
-    \fn QNetworkDatagram QNetworkDatagram::makeReply(const QByteArray &data) const
+    \fn QNetworkDatagram QNetworkDatagram::makeReply(const QByteArray &payload) const &
+    \fn QNetworkDatagram QNetworkDatagram::makeReply(const QByteArray &payload) &&
 
     Creates a new QNetworkDatagram representing a reply to this incoming datagram
-    and sets the payload data to \a data. This function is a very convenient
+    and sets the payload data to \a payload. This function is a very convenient
     way of responding to a datagram back to the original sender.
 
     Example:
@@ -495,6 +496,7 @@ void QNetworkDatagram::setData(const QByteArray &data)
     \endcode
  */
 
+
 static bool isNonMulticast(const QHostAddress &addr)
 {
     // is it a multicast address?
@@ -528,6 +530,11 @@ void QNetworkDatagram::destroy(QNetworkDatagramPrivate *d)
     delete d;
 }
 
+/*! \fn  void QNetworkDatagram::swap(QNetworkDatagram &other)
+  Swaps this instance with \a other.
+*/
+
+
 QT_END_NAMESPACE
 
 #endif // QT_NO_UDPSOCKET
diff --git a/src/network/kernel/qnetworkdatagram.h b/src/network/kernel/qnetworkdatagram.h
index c7605d67ba..1acb44a1e0 100644
--- a/src/network/kernel/qnetworkdatagram.h
+++ b/src/network/kernel/qnetworkdatagram.h
@@ -91,7 +91,7 @@ public:
     QByteArray data() const;
     void setData(const QByteArray &data);
 
-#ifdef Q_COMPILER_REF_QUALIFIERS
+#if defined(Q_COMPILER_REF_QUALIFIERS) || defined(Q_CLANG_QDOC)
     QNetworkDatagram makeReply(const QByteArray &payload) const &
     { return makeReply_helper(payload); }
     QNetworkDatagram makeReply(const QByteArray &payload) &&