diff options
author | Luca Di Sera <luca.disera@qt.io> | 2022-10-11 10:26:28 +0200 |
---|---|---|
committer | Luca Di Sera <luca.disera@qt.io> | 2022-10-21 09:48:36 +0200 |
commit | e2fef733be92e95ff28225196e14ffeb98d61a1f (patch) | |
tree | 42bc5a06849c48c89a74fc65a494a126e46b1797 /src/network/kernel | |
parent | 2b35b89803bc90a3595be5386da905d79d841b73 (diff) |
Replace usages of Q_CLANG_QDOC with Q_QDOC
To allow the user to customize the C++ code that QDoc sees, so as to be
able to work-around some limitations on QDoc itself, QDoc defines two
symbols: Q_QDOC and Q_CLANG_QDOC, both of which are "true" during an
entire execution of QDoc.
At a certain point in time, QDoc allowed the user the choice between a
custom C++ parser and a Clang based one.
The Q_QDOC symbol would always be defined while the Q_CLANG_QDOC symbol
would be defined only when the Clang based parser was chosen.
In more recent times, QDoc always uses a Clang based parser, such that
both Q_CLANG_QDOC and Q_QDOC are always defined, making them equivalent.
To avoid using different symbols, and the possible confusion and
fragmentation that derives from it, all usages of Q_CLANG_QDOC are now
replaced by the equivalent usages of Q_QDOC.
Change-Id: I5810abb9ad1016a4c5bbea99acd03381b8514b3f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/network/kernel')
-rw-r--r-- | src/network/kernel/qhostinfo.h | 2 | ||||
-rw-r--r-- | src/network/kernel/qnetworkdatagram.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h index eac23ac296..47db075b44 100644 --- a/src/network/kernel/qhostinfo.h +++ b/src/network/kernel/qhostinfo.h @@ -55,7 +55,7 @@ public: static QString localHostName(); static QString localDomainName(); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC template<typename Functor> static int lookupHost(const QString &name, Functor functor); template<typename Functor> diff --git a/src/network/kernel/qnetworkdatagram.h b/src/network/kernel/qnetworkdatagram.h index 597448a0ea..dcc2f1102f 100644 --- a/src/network/kernel/qnetworkdatagram.h +++ b/src/network/kernel/qnetworkdatagram.h @@ -55,7 +55,7 @@ public: QByteArray data() const; void setData(const QByteArray &data); -#if defined(Q_COMPILER_REF_QUALIFIERS) || defined(Q_CLANG_QDOC) +#if defined(Q_COMPILER_REF_QUALIFIERS) || defined(Q_QDOC) QNetworkDatagram makeReply(const QByteArray &payload) const & { return makeReply_helper(payload); } QNetworkDatagram makeReply(const QByteArray &payload) && |