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/gui/painting | |
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/gui/painting')
-rw-r--r-- | src/gui/painting/qregion.cpp | 2 | ||||
-rw-r--r-- | src/gui/painting/qt_mips_asm_dsp_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp index 7d912b29e5..fc403f60b1 100644 --- a/src/gui/painting/qregion.cpp +++ b/src/gui/painting/qregion.cpp @@ -636,7 +636,7 @@ bool QRegion::intersects(const QRegion ®ion) const */ -#if !defined (Q_OS_UNIX) && !defined (Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if !defined (Q_OS_UNIX) && !defined (Q_OS_WIN) || defined(Q_QDOC) /* \overload \since 4.4 diff --git a/src/gui/painting/qt_mips_asm_dsp_p.h b/src/gui/painting/qt_mips_asm_dsp_p.h index 0b54b88934..6b33285f32 100644 --- a/src/gui/painting/qt_mips_asm_dsp_p.h +++ b/src/gui/painting/qt_mips_asm_dsp_p.h @@ -19,7 +19,7 @@ #pragma qt_sync_stop_processing #endif -#ifndef Q_CLANG_QDOC +#ifndef Q_QDOC #define zero $0 #define AT $1 #define v0 $2 |