diff options
| author | Fan RuiJie <fanruijie@uniontech.com> | 2021-10-15 16:40:44 +0800 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2021-11-29 12:24:46 +0000 |
| commit | 135ff4f78b179a69f36e548dab787dfbafa317f8 (patch) | |
| tree | ca1e3f87e109e31fccdc58de923438a4ab56aeb7 | |
| parent | f42a45d5a9bbbe30958064b0f6777f6e80430f22 (diff) | |
Fix warnings due to enums in QSizePolicy
gcc 11 generates warnings as
"bitwise operation between different enumeration types
'QSizePolicy::Policy' and 'QSizePolicy::PolicyFlag' is deprecated"
in C++20.
Fixes: QTBUG-93810
Change-Id: If8a796b33a772cc1a561eb0b6bc4def8f9f54bc0
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit ab1904363a87656b4ddec77ee9978082a25dadcd)
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | src/widgets/kernel/qsizepolicy.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h index 6e87e133fd..a3b0108b7a 100644 --- a/src/widgets/kernel/qsizepolicy.h +++ b/src/widgets/kernel/qsizepolicy.h @@ -133,9 +133,10 @@ public: Q_DECL_RELAXED_CONSTEXPR void setVerticalPolicy(Policy d) noexcept { bits.verPolicy = d; } void setControlType(ControlType type) noexcept; + // ### Qt 7: consider making Policy a QFlags and removing these casts QT_SIZEPOLICY_CONSTEXPR Qt::Orientations expandingDirections() const noexcept { - return ( (verticalPolicy() & ExpandFlag) ? Qt::Vertical : Qt::Orientations() ) - | ( (horizontalPolicy() & ExpandFlag) ? Qt::Horizontal : Qt::Orientations() ) ; + return ( (verticalPolicy() & static_cast<Policy>(ExpandFlag)) ? Qt::Vertical : Qt::Orientations() ) + | ( (horizontalPolicy() & static_cast<Policy>(ExpandFlag)) ? Qt::Horizontal : Qt::Orientations() ) ; } Q_DECL_RELAXED_CONSTEXPR void setHeightForWidth(bool b) noexcept { bits.hfw = b; } |