summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLuca Di Sera <luca.disera@qt.io>2022-10-11 10:39:21 +0200
committerLuca Di Sera <luca.disera@qt.io>2022-10-13 10:29:42 +0200
commite7b271315220861a01c001709fecd51ef97ed726 (patch)
treee421d7ea13072f19cb69d6774b81088758a656fd /src
parentb3021c257dd430f4019c31a3eb1d55d929642c76 (diff)
downloadqtwayland-e7b271315220861a01c001709fecd51ef97ed726.tar.gz
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: I7b606de94889497a7ee7daebd01e6443a89a60d5 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/compositor/extensions/qwaylandxdgshell.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshell.h b/src/compositor/extensions/qwaylandxdgshell.h
index 02ae7acd..32c6dfab 100644
--- a/src/compositor/extensions/qwaylandxdgshell.h
+++ b/src/compositor/extensions/qwaylandxdgshell.h
@@ -122,7 +122,7 @@ class Q_WAYLANDCOMPOSITOR_EXPORT QWaylandXdgToplevel : public QObject
Q_PROPERTY(bool resizing READ resizing NOTIFY resizingChanged)
Q_PROPERTY(bool activated READ activated NOTIFY activatedChanged)
// QDoc fails to parse the property type that includes the keyword 'enum'
-#ifndef Q_CLANG_QDOC
+#ifndef Q_QDOC
Q_PROPERTY(enum DecorationMode decorationMode READ decorationMode NOTIFY decorationModeChanged)
#else
Q_PROPERTY(DecorationMode decorationMode READ decorationMode NOTIFY decorationModeChanged)