3 files changed, 6 insertions, 6 deletions
diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h
index 4189d30156..7c85311856 100644
--- a/src/testlib/qsignalspy.h
+++ b/src/testlib/qsignalspy.h
@@ -50,7 +50,7 @@ public:
         initArgs(mo->method(sigIndex), obj);
     }
 
-#ifdef Q_CLANG_QDOC
+#ifdef Q_QDOC
     template <typename PointerToMemberFunction>
     QSignalSpy(const QObject *object, PointerToMemberFunction signal);
 #else
@@ -79,7 +79,7 @@ public:
         sig = signalMetaMethod.methodSignature();
         initArgs(mo->method(sigIndex), obj);
     }
-#endif // Q_CLANG_QDOC
+#endif // Q_QDOC
 
     QSignalSpy(const QObject *obj, const QMetaMethod &signal)
         : m_waiting(false)
diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h
index d68324d91e..e748b5e0e2 100644
--- a/src/testlib/qtest_gui.h
+++ b/src/testlib/qtest_gui.h
@@ -78,7 +78,7 @@ template<> inline char *toString(const QRegion &region)
     return qstrdup(result.constData());
 }
 
-#if !defined(QT_NO_VECTOR2D) || defined(Q_CLANG_QDOC)
+#if !defined(QT_NO_VECTOR2D) || defined(Q_QDOC)
 template<> inline char *toString(const QVector2D &v)
 {
     QByteArray result = "QVector2D(" + QByteArray::number(double(v.x())) + ", "
@@ -86,7 +86,7 @@ template<> inline char *toString(const QVector2D &v)
     return qstrdup(result.constData());
 }
 #endif // !QT_NO_VECTOR2D
-#if !defined(QT_NO_VECTOR3D) || defined(Q_CLANG_QDOC)
+#if !defined(QT_NO_VECTOR3D) || defined(Q_QDOC)
 template<> inline char *toString(const QVector3D &v)
 {
     QByteArray result = "QVector3D(" + QByteArray::number(double(v.x())) + ", "
@@ -94,7 +94,7 @@ template<> inline char *toString(const QVector3D &v)
     return qstrdup(result.constData());
 }
 #endif // !QT_NO_VECTOR3D
-#if !defined(QT_NO_VECTOR4D) || defined(Q_CLANG_QDOC)
+#if !defined(QT_NO_VECTOR4D) || defined(Q_QDOC)
 template<> inline char *toString(const QVector4D &v)
 {
     QByteArray result = "QVector4D(" + QByteArray::number(double(v.x())) + ", "
diff --git a/src/testlib/qtesttouch.h b/src/testlib/qtesttouch.h
index 4b1f290a14..71133ff3ec 100644
--- a/src/testlib/qtesttouch.h
+++ b/src/testlib/qtesttouch.h
@@ -29,7 +29,7 @@ QT_BEGIN_NAMESPACE
 
 namespace QTest
 {
-#if defined(QT_WIDGETS_LIB) || defined(Q_CLANG_QDOC)
+#if defined(QT_WIDGETS_LIB) || defined(Q_QDOC)
     inline
     QTouchEventWidgetSequence touchEvent(QWidget *widget,
                                    QPointingDevice *device,