From 09d3ebcce8d7cae1b6cac3687708e5acef5f5934 Mon Sep 17 00:00:00 2001 From: Marcel Krems Date: Wed, 11 Sep 2019 09:01:25 +0200 Subject: [PATCH] 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 --- src/widgets/kernel/qsizepolicy.h | 4 ++-- 1 file 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; }