From e2fef733be92e95ff28225196e14ffeb98d61a1f Mon Sep 17 00:00:00 2001
From: Luca Di Sera <luca.disera@qt.io>
Date: Tue, 11 Oct 2022 10:26:28 +0200
Subject: 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>
---
 src/corelib/kernel/qmetaobject.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/corelib/kernel/qmetaobject.h')

diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h
index 81cd30203a..b92c808c28 100644
--- a/src/corelib/kernel/qmetaobject.h
+++ b/src/corelib/kernel/qmetaobject.h
@@ -136,7 +136,7 @@ public:
 #endif
 
     template <typename... Args>
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
     bool
 #else
     QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...>
@@ -150,7 +150,7 @@ public:
     }
 
     template <typename... Args>
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
     bool
 #else
     QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...>
@@ -161,7 +161,7 @@ public:
     }
 
     template <typename... Args>
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
     bool
 #else
     QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...>
@@ -172,7 +172,7 @@ public:
     }
 
     template <typename... Args>
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
     bool
 #else
     QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...>
@@ -183,7 +183,7 @@ public:
     }
 
     template <typename... Args>
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
     bool
 #else
     QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...>
@@ -196,7 +196,7 @@ public:
     }
 
     template <typename... Args>
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
     bool
 #else
     QtPrivate::Invoke::IfNotOldStyleArgs<bool, Args...>
-- 
cgit v1.2.3