1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

doc: Ensure clangqdoc sees declarations

Browse Source 
This update corrects several uses of #ifdef macros
that needed updating because qdoc now uses clang to
parse header files.

Change-Id: I285efa4629a1a5d5bcbfaf701eeafbd0e9f1e43e
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
This commit is contained in:
Martin Smith 2017-03-09 14:18:46 +01:00
parent ceccdff4e9
commit aefb3a9a07
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/thread/qexception.cpp
View File

@ -40,8 +40,8 @@
#include "qexception.h" #include "qexception.h"
#include "QtCore/qshareddata.h" #include "QtCore/qshareddata.h"
#ifndef QT_NO_QFUTURE #if !defined(QT_NO_QFUTURE) || defined(Q_CLANG_QDOC)
#ifndef QT_NO_EXCEPTIONS #if !defined(QT_NO_EXCEPTIONS) || defined(Q_CLANG_QDOC)
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -155,7 +155,7 @@ QUnhandledException *QUnhandledException::clone() const
return new QUnhandledException(*this); return new QUnhandledException(*this);
} }
#ifndef Q_QDOC #if !defined(Q_CLANG_QDOC)
namespace QtPrivate { namespace QtPrivate {
@ -220,7 +220,7 @@ bool ExceptionStore::hasThrown() const { return exceptionHolder.base->hasThrown;
} // namespace QtPrivate } // namespace QtPrivate
#endif //Q_QDOC #endif //Q_CLANG_QDOC
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/corelib/thread/qexception.h
View File

@ -54,7 +54,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_EXCEPTIONS #if !defined(QT_NO_EXCEPTIONS) || defined(Q_CLANG_QDOC)
class Q_CORE_EXPORT QException : public std::exception class Q_CORE_EXPORT QException : public std::exception
{ {

2
src/corelib/thread/qfuture.h
View File

@ -42,7 +42,7 @@
#include <QtCore/qglobal.h> #include <QtCore/qglobal.h>
#ifndef QT_NO_QFUTURE #if !defined(QT_NO_QFUTURE) || defined(Q_CLANG_QDOC)
#include <QtCore/qfutureinterface.h> #include <QtCore/qfutureinterface.h>
#include <QtCore/qstring.h> #include <QtCore/qstring.h>

2
src/corelib/tools/qbytearraymatcher.cpp
View File

@ -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 \since 5.9
\relates QStaticByteArrayMatcher \relates QStaticByteArrayMatcher

11
src/network/kernel/qnetworkdatagram.cpp
View File

@ -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 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. way of responding to a datagram back to the original sender.
Example: Example:
@ -495,6 +496,7 @@ void QNetworkDatagram::setData(const QByteArray &data)
\endcode \endcode
*/ */
static bool isNonMulticast(const QHostAddress &addr) static bool isNonMulticast(const QHostAddress &addr)
{ {
// is it a multicast address? // is it a multicast address?
@ -528,6 +530,11 @@ void QNetworkDatagram::destroy(QNetworkDatagramPrivate *d)
delete d; delete d;
} }
/*! \fn void QNetworkDatagram::swap(QNetworkDatagram &other)
Swaps this instance with \a other.
*/
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // QT_NO_UDPSOCKET #endif // QT_NO_UDPSOCKET

2
src/network/kernel/qnetworkdatagram.h
View File

@ -91,7 +91,7 @@ public:
QByteArray data() const; QByteArray data() const;
void setData(const QByteArray &data); 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 & QNetworkDatagram makeReply(const QByteArray &payload) const &
{ return makeReply_helper(payload); } { return makeReply_helper(payload); }
QNetworkDatagram makeReply(const QByteArray &payload) && QNetworkDatagram makeReply(const QByteArray &payload) &&