Skip to content

Commit

Permalink
Fix warning from MinGW/GCC 6.2
Browse files Browse the repository at this point in the history
src/widgets/styles/qwindowsvistastyle.cpp: In member function 'virtual QSize QWindowsVistaStyle::sizeFromContents(QStyle::ContentsType, const QStyleOption*, const QSize&, const QWidget*) const':
src/widgets/styles/qwindowsvistastyle.cpp:1872:9: error: this 'if' clause does not guard... [-Werror=misleading-indentation]
         if (!sz.isEmpty())
         ^~
src/widgets/styles/qwindowsvistastyle.cpp:1874:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if'
             return sz;

Change-Id: Ifd3faef8c93f12d5fadaf4edf875fbe0fc6fb785
Reviewed-by: Friedemann Kleint <[email protected]>
  • Loading branch information
xknight committed Dec 28, 2016
1 parent 0f56872 commit b16e738
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/widgets/styles/qwindowsvistastyle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1871,8 +1871,7 @@ QSize QWindowsVistaStyle::sizeFromContents(ContentsType type, const QStyleOption
case CT_MenuBarItem:
if (!sz.isEmpty())
sz += QSize(windowsItemHMargin * 5 + 1, 5);
return sz;
break;
return sz;
#endif
case CT_ItemViewItem:
sz = QWindowsXPStyle::sizeFromContents(type, option, size, widget);
Expand Down

0 comments on commit b16e738

Please sign in to comment.