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>

5 files changed, 6 insertions, 6 deletions

diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h
index f421955e7e..1d5d45096a 100644
--- a/src/network/socket/qabstractsocket.h
+++ b/src/network/socket/qabstractsocket.h
@@ -8,7 +8,7 @@
 #if QT_VERSION >= QT_VERSION_CHECK(7, 0, 0)
 #include <QtNetwork/qabstractsocket.h>
 #endif
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
 #include <QtNetwork/qhostaddress.h>
 #endif
 #include <QtCore/qiodevice.h>
@@ -129,7 +129,7 @@ public:
 
     virtual bool bind(const QHostAddress &address, quint16 port = 0,
                       BindMode mode = DefaultForPlatform);
-#if QT_VERSION >= QT_VERSION_CHECK(7,0,0) || defined(Q_CLANG_QDOC)
+#if QT_VERSION >= QT_VERSION_CHECK(7,0,0) || defined(Q_QDOC)
     bool bind(QHostAddress::SpecialAddress addr, quint16 port = 0, BindMode mode = DefaultForPlatform)
     { return bind(QHostAddress(addr), port, mode); }
     bool bind(quint16 port = 0, BindMode mode = DefaultForPlatform)
diff --git a/src/network/socket/qsctpserver.h b/src/network/socket/qsctpserver.h
index 23ffdc770d..f82ae71f16 100644
--- a/src/network/socket/qsctpserver.h
+++ b/src/network/socket/qsctpserver.h
@@ -9,7 +9,7 @@
 QT_BEGIN_NAMESPACE
 
 
-#if !defined(QT_NO_SCTP) || defined(Q_CLANG_QDOC)
+#if !defined(QT_NO_SCTP) || defined(Q_QDOC)
 
 class QSctpServerPrivate;
 class QSctpSocket;
diff --git a/src/network/socket/qsctpsocket.h b/src/network/socket/qsctpsocket.h
index 13279ddb4a..8f0578ac26 100644
--- a/src/network/socket/qsctpsocket.h
+++ b/src/network/socket/qsctpsocket.h
@@ -9,7 +9,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#if !defined(QT_NO_SCTP) || defined(Q_CLANG_QDOC)
+#if !defined(QT_NO_SCTP) || defined(Q_QDOC)
 
 class QSctpSocketPrivate;
 
diff --git a/src/network/socket/qtcpsocket.h b/src/network/socket/qtcpsocket.h
index aeac92c678..a1c610b69b 100644
--- a/src/network/socket/qtcpsocket.h
+++ b/src/network/socket/qtcpsocket.h
@@ -21,7 +21,7 @@ public:
     explicit QTcpSocket(QObject *parent = nullptr);
     virtual ~QTcpSocket();
 
-#if QT_VERSION < QT_VERSION_CHECK(7,0,0) && !defined(Q_CLANG_QDOC)
+#if QT_VERSION < QT_VERSION_CHECK(7,0,0) && !defined(Q_QDOC)
     // ### Qt7: move into QAbstractSocket
     using QAbstractSocket::bind;
     bool bind(QHostAddress::SpecialAddress addr, quint16 port = 0, BindMode mode = DefaultForPlatform)
diff --git a/src/network/socket/qudpsocket.h b/src/network/socket/qudpsocket.h
index 34657fffa5..3fd1d3710a 100644
--- a/src/network/socket/qudpsocket.h
+++ b/src/network/socket/qudpsocket.h
@@ -24,7 +24,7 @@ public:
     explicit QUdpSocket(QObject *parent = nullptr);
     virtual ~QUdpSocket();
 
-#if QT_VERSION < QT_VERSION_CHECK(7,0,0) && !defined(Q_CLANG_QDOC)
+#if QT_VERSION < QT_VERSION_CHECK(7,0,0) && !defined(Q_QDOC)
     // ### Qt7: move into QAbstractSocket
     using QAbstractSocket::bind;
     bool bind(QHostAddress::SpecialAddress addr, quint16 port = 0, BindMode mode = DefaultForPlatform)