AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QSizePolicy: Fix warning about mixing different enums

Browse Source 
warning: C5054: operator '&': deprecated between enumerations of different types

Pick-to: 5.15
Change-Id: I4e48a44f089d3eaca5d3f876da01335051192b28
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marcel Krems 2019-09-11 09:01:25 +02:00
parent be83b626d7
commit 09d3ebcce8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/widgets/kernel/qsizepolicy.h
View File

@ -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; }