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: I25a2fe3b870281b336d5eca1f887940a7961dc31
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

3 files changed, 10 insertions, 10 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgnode.h b/src/quick/scenegraph/coreapi/qsgnode.h
index e3facfebe3..659d085922 100644
--- a/src/quick/scenegraph/coreapi/qsgnode.h
+++ b/src/quick/scenegraph/coreapi/qsgnode.h
@@ -60,7 +60,7 @@ public:
 
         // Uppermost 8 bits are reserved for internal use.
         IsVisitableNode             = 0x01000000
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
         , InternalReserved            = 0x01000000
 #endif
     };
diff --git a/src/quick/scenegraph/coreapi/qsgtexture.cpp b/src/quick/scenegraph/coreapi/qsgtexture.cpp
index 15167f8ae5..a09e054078 100644
--- a/src/quick/scenegraph/coreapi/qsgtexture.cpp
+++ b/src/quick/scenegraph/coreapi/qsgtexture.cpp
@@ -679,7 +679,7 @@ QSGDynamicTexture::~QSGDynamicTexture()
  */
 
 
-#if QT_CONFIG(opengl) || defined(Q_CLANG_QDOC)
+#if QT_CONFIG(opengl) || defined(Q_QDOC)
 namespace QNativeInterface {
 /*!
     \class QNativeInterface::QSGOpenGLTexture
@@ -779,7 +779,7 @@ GLuint QSGTexturePlatformOpenGL::nativeTexture() const
 }
 #endif // opengl
 
-#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC)
+#if defined(Q_OS_WIN) || defined(Q_QDOC)
 namespace QNativeInterface {
 /*!
     \class QNativeInterface::QSGD3D11Texture
@@ -839,7 +839,7 @@ void *QSGTexturePlatformD3D11::nativeTexture() const
 }
 #endif // win
 
-#if defined(__OBJC__) || defined(Q_CLANG_QDOC)
+#if defined(__OBJC__) || defined(Q_QDOC)
 namespace QNativeInterface {
 /*!
     \class QNativeInterface::QSGMetalTexture
@@ -886,7 +886,7 @@ namespace QNativeInterface {
 } // QNativeInterface
 #endif // OBJC
 
-#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC)
+#if QT_CONFIG(vulkan) || defined(Q_QDOC)
 namespace QNativeInterface {
 /*!
     \class QNativeInterface::QSGVulkanTexture
diff --git a/src/quick/scenegraph/coreapi/qsgtexture_platform.h b/src/quick/scenegraph/coreapi/qsgtexture_platform.h
index 42af8593bd..e8aef9078f 100644
--- a/src/quick/scenegraph/coreapi/qsgtexture_platform.h
+++ b/src/quick/scenegraph/coreapi/qsgtexture_platform.h
@@ -15,7 +15,7 @@
 #include <QtGui/qvulkaninstance.h>
 #endif
 
-#if defined(__OBJC__) || defined(Q_CLANG_QDOC)
+#if defined(__OBJC__) || defined(Q_QDOC)
 @protocol MTLTexture;
 #endif
 
@@ -23,7 +23,7 @@ QT_BEGIN_NAMESPACE
 
 namespace QNativeInterface {
 
-#if QT_CONFIG(opengl) || defined(Q_CLANG_QDOC)
+#if QT_CONFIG(opengl) || defined(Q_QDOC)
 struct Q_QUICK_EXPORT QSGOpenGLTexture
 {
     QT_DECLARE_NATIVE_INTERFACE(QSGOpenGLTexture, 1, QSGTexture)
@@ -39,7 +39,7 @@ struct Q_QUICK_EXPORT QSGOpenGLTexture
 };
 #endif
 
-#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC)
+#if defined(Q_OS_WIN) || defined(Q_QDOC)
 struct Q_QUICK_EXPORT QSGD3D11Texture
 {
     QT_DECLARE_NATIVE_INTERFACE(QSGD3D11Texture, 1, QSGTexture)
@@ -51,7 +51,7 @@ struct Q_QUICK_EXPORT QSGD3D11Texture
 };
 #endif
 
-#if defined(__OBJC__) || defined(Q_CLANG_QDOC)
+#if defined(__OBJC__) || defined(Q_QDOC)
 struct Q_QUICK_EXPORT QSGMetalTexture
 {
     QT_DECLARE_NATIVE_INTERFACE(QSGMetalTexture, 1, QSGTexture)
@@ -63,7 +63,7 @@ struct Q_QUICK_EXPORT QSGMetalTexture
 };
 #endif
 
-#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC)
+#if QT_CONFIG(vulkan) || defined(Q_QDOC)
 struct Q_QUICK_EXPORT QSGVulkanTexture
 {
     QT_DECLARE_NATIVE_INTERFACE(QSGVulkanTexture, 1, QSGTexture)