diff options
Diffstat (limited to 'src/corelib/global/qnamespace.h')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index ad4150b317..deab11f729 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -235,9 +235,7 @@ public: AlignCenter = AlignVCenter | AlignHCenter }; - Q_DECLARE_FLAGS(Alignment, AlignmentFlag) - Q_DECLARE_OPERATORS_FOR_FLAGS(Alignment) enum TextFlag { TextSingleLine = 0x0100, @@ -260,6 +258,10 @@ public: , TextBypassShaping = 0x100000 #endif }; + Q_DECLARE_MIXED_ENUM_OPERATORS_SYMMETRIC(int, AlignmentFlag, TextFlag) + // *After* we've defined the mixed operators (or verified their sanity), + // otherwise the operators defined here mess with the mixed ones: + Q_DECLARE_OPERATORS_FOR_FLAGS(Alignment) enum TextElideMode { ElideLeft, @@ -267,6 +269,7 @@ public: ElideMiddle, ElideNone }; + Q_DECLARE_MIXED_ENUM_OPERATORS_SYMMETRIC(int, TextElideMode, TextFlag) enum WhiteSpaceMode { WhiteSpaceNormal, |