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/testlib | |
| 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/testlib')
| -rw-r--r-- | src/testlib/qsignalspy.h | 4 | ||||
| -rw-r--r-- | src/testlib/qtest_gui.h | 6 | ||||
| -rw-r--r-- | src/testlib/qtesttouch.h | 2 |
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 ®ion) 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, |