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/widgets/dialogs | |
| 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/widgets/dialogs')
| -rw-r--r-- | src/widgets/dialogs/qmessagebox.h | 2 | ||||
| -rw-r--r-- | src/widgets/dialogs/qwizard.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/dialogs/qwizard.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index 0bd8f81fb9..4b1f5118c8 100644 --- a/src/widgets/dialogs/qmessagebox.h +++ b/src/widgets/dialogs/qmessagebox.h @@ -277,7 +277,7 @@ public: Q_SIGNALS: void buttonClicked(QAbstractButton *button); -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC public Q_SLOTS: int exec() override; #endif diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 1716d8182b..d54b65a173 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -3246,7 +3246,7 @@ void QWizard::paintEvent(QPaintEvent * event) #endif } -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) /*! \reimp */ diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h index bf2364f214..0ec973b0d2 100644 --- a/src/widgets/dialogs/qwizard.h +++ b/src/widgets/dialogs/qwizard.h @@ -152,7 +152,7 @@ protected: bool event(QEvent *event) override; void resizeEvent(QResizeEvent *event) override; void paintEvent(QPaintEvent *event) override; -#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) +#if defined(Q_OS_WIN) || defined(Q_QDOC) bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override; #endif void done(int result) override; |