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/kernel/qplatformscreen_p.h | |
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/kernel/qplatformscreen_p.h')
-rw-r--r-- | src/gui/kernel/qplatformscreen_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/kernel/qplatformscreen_p.h b/src/gui/kernel/qplatformscreen_p.h index 6c79978f79..c47cee2746 100644 --- a/src/gui/kernel/qplatformscreen_p.h +++ b/src/gui/kernel/qplatformscreen_p.h @@ -38,7 +38,7 @@ public: namespace QNativeInterface::Private { -#if QT_CONFIG(xcb) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(xcb) || defined(Q_QDOC) struct Q_GUI_EXPORT QXcbScreen { QT_DECLARE_NATIVE_INTERFACE(QXcbScreen, 1, QScreen) @@ -46,7 +46,7 @@ struct Q_GUI_EXPORT QXcbScreen }; #endif -#if QT_CONFIG(vsp2) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vsp2) || defined(Q_QDOC) struct Q_GUI_EXPORT QVsp2Screen { QT_DECLARE_NATIVE_INTERFACE(QVsp2Screen, 1, QScreen) @@ -59,7 +59,7 @@ struct Q_GUI_EXPORT QVsp2Screen }; #endif -#if defined(Q_OS_WEBOS) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WEBOS) || defined(Q_QDOC) struct Q_GUI_EXPORT QWebOSScreen { QT_DECLARE_NATIVE_INTERFACE(QWebOSScreen, 1, QScreen) @@ -72,7 +72,7 @@ struct Q_GUI_EXPORT QWebOSScreen }; #endif -#if defined(Q_OS_WIN32) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN32) || defined(Q_QDOC) struct Q_GUI_EXPORT QWindowsScreen { QT_DECLARE_NATIVE_INTERFACE(QWindowsScreen, 1, QScreen) |