diff options
| author | Marcel Krems <m.krems@software-vision.eu> | 2019-09-11 09:01:25 +0200 |
|---|---|---|
| committer | Marcel Krems <m.krems@software-vision.eu> | 2020-08-23 02:35:05 +0200 |
| commit | 09d3ebcce8d7cae1b6cac3687708e5acef5f5934 (patch) | |
| tree | eaaaff63634007bd0546c15ee0b24b5cbe4ed0c4 /src/widgets | |
| parent | be83b626d736c3b8e58b3e22a02774acbc2fdb10 (diff) | |
QSizePolicy: Fix warning about mixing different enums
warning: C5054: operator '&': deprecated between enumerations of different types
Pick-to: 5.15
Change-Id: I4e48a44f089d3eaca5d3f876da01335051192b28
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/kernel/qsizepolicy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h index 5056b91ea7..9de88dffb0 100644 --- a/src/widgets/kernel/qsizepolicy.h +++ b/src/widgets/kernel/qsizepolicy.h @@ -109,8 +109,8 @@ public: void setControlType(ControlType type) noexcept; constexpr Qt::Orientations expandingDirections() const noexcept { - return ( (verticalPolicy() & ExpandFlag) ? Qt::Vertical : Qt::Orientations() ) - | ( (horizontalPolicy() & ExpandFlag) ? Qt::Horizontal : Qt::Orientations() ) ; + return ( (verticalPolicy() & int(ExpandFlag)) ? Qt::Vertical : Qt::Orientations() ) + | ( (horizontalPolicy() & int(ExpandFlag)) ? Qt::Horizontal : Qt::Orientations() ) ; } constexpr void setHeightForWidth(bool b) noexcept { bits.hfw = b; } |