summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2023-02-11 00:22:31 +0000
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-06-05 08:12:47 +0000
commit990bfb20470c6ab568465cb3b1ffcca8ad62c08d (patch)
tree2eeb018e563dce1722280f4304ac445534f89005
parent699743bef4edac63ace675e56fede3acd7143f97 (diff)
Remove QDoc-specific workaround
QDoc is now able to parse the property correctly, no need for the workaround. Change-Id: I42931a7be21fd55373477dffc28ff61290736f40 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io> (cherry picked from commit 345a612894a561846edba3b28b5f743653a23d12) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/compositor/extensions/qwaylandxdgshell.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshell.h b/src/compositor/extensions/qwaylandxdgshell.h
index 3f0f035b0..bc794c9c3 100644
--- a/src/compositor/extensions/qwaylandxdgshell.h
+++ b/src/compositor/extensions/qwaylandxdgshell.h
@@ -125,12 +125,8 @@ class Q_WAYLANDCOMPOSITOR_EXPORT QWaylandXdgToplevel : public QObject
Q_PROPERTY(bool fullscreen READ fullscreen NOTIFY fullscreenChanged)
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_QDOC
Q_PROPERTY(enum DecorationMode decorationMode READ decorationMode NOTIFY decorationModeChanged)
-#else
- Q_PROPERTY(DecorationMode decorationMode READ decorationMode NOTIFY decorationModeChanged)
-#endif
+
public:
enum State : uint {
MaximizedState = 1,