diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2022-03-01 16:44:14 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-03-02 18:45:30 +0000 |
| commit | 60e7a5ddc26b4b80cb9bea8404d2fab981cdcfb2 (patch) | |
| tree | aa72e30c0a4c1a719ddd6b5cdb9e15835468ce45 | |
| parent | bd4fecee6421d660b74084dbb066019f00f4080b (diff) | |
Fix Q_FLAG declaration over enumerations
One should use Q_ENUM, not Q_FLAG, to mark an enumeration.
Q_FLAG should go on the respective flag type.
Change-Id: I16cd5c0d405c3db1951569b72805fdae18898c45
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 44eff8f39f56cfe25dbd5a8b9d289b42137d06e2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/plugin/qlibrary.h | 2 | ||||
| -rw-r--r-- | src/gui/painting/qpainter.h | 2 | ||||
| -rw-r--r-- | src/network/socket/qlocalserver.h | 2 | ||||
| -rw-r--r-- | src/widgets/effects/qgraphicseffect.h | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qgesture.h | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/plugin/qlibrary.h b/src/corelib/plugin/qlibrary.h index ac59f45789..f3fa0d40f5 100644 --- a/src/corelib/plugin/qlibrary.h +++ b/src/corelib/plugin/qlibrary.h @@ -63,7 +63,7 @@ public: DeepBindHint = 0x10 }; Q_DECLARE_FLAGS(LoadHints, LoadHint) - Q_FLAG(LoadHint) + Q_ENUM(LoadHint) Q_FLAG(LoadHints) explicit QLibrary(QObject *parent = nullptr); diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h index 4c854e0026..6446e88b0b 100644 --- a/src/gui/painting/qpainter.h +++ b/src/gui/painting/qpainter.h @@ -90,7 +90,7 @@ public: VerticalSubpixelPositioning = 0x08, LosslessImageRendering = 0x40, }; - Q_FLAG(RenderHint) + Q_ENUM(RenderHint) Q_DECLARE_FLAGS(RenderHints, RenderHint) Q_FLAG(RenderHints) diff --git a/src/network/socket/qlocalserver.h b/src/network/socket/qlocalserver.h index 9106bcad45..12bd2411a8 100644 --- a/src/network/socket/qlocalserver.h +++ b/src/network/socket/qlocalserver.h @@ -71,7 +71,7 @@ public: WorldAccessOption = 0x7, AbstractNamespaceOption = 0x8 }; - Q_FLAG(SocketOption) + Q_ENUM(SocketOption) Q_DECLARE_FLAGS(SocketOptions, SocketOption) Q_FLAG(SocketOptions) diff --git a/src/widgets/effects/qgraphicseffect.h b/src/widgets/effects/qgraphicseffect.h index f7c0769778..f656a9b83c 100644 --- a/src/widgets/effects/qgraphicseffect.h +++ b/src/widgets/effects/qgraphicseffect.h @@ -163,7 +163,7 @@ public: QualityHint = 0x01, AnimationHint = 0x02 }; - Q_FLAG(BlurHint) + Q_ENUM(BlurHint) Q_DECLARE_FLAGS(BlurHints, BlurHint) Q_FLAG(BlurHints) diff --git a/src/widgets/kernel/qgesture.h b/src/widgets/kernel/qgesture.h index 312962f9bf..5ccf635e2e 100644 --- a/src/widgets/kernel/qgesture.h +++ b/src/widgets/kernel/qgesture.h @@ -143,7 +143,7 @@ public: RotationAngleChanged = 0x2, CenterPointChanged = 0x4 }; - Q_FLAG(ChangeFlag) + Q_ENUM(ChangeFlag) Q_DECLARE_FLAGS(ChangeFlags, ChangeFlag) Q_FLAG(ChangeFlags) |