diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-08 13:19:37 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-10 13:59:30 +0200 |
| commit | 033d01bd6e2aef740ad1408a04d3ca0ae3b9ba9b (patch) | |
| tree | af2e47a222cf6f4ed3687305df2d1cc3a578b2ed /src/widgets/widgets/qmenubar.cpp | |
| parent | c0873b7832d8aaf79dda0c5c5820f97c84b399ed (diff) | |
QApplication: remove obsolete globalStrut functionality
Change-Id: If56873f86f5291264cac720f8db7dbd4db756f49
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/widgets/widgets/qmenubar.cpp')
| -rw-r--r-- | src/widgets/widgets/qmenubar.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index c8124468df..9122273d0d 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -1654,9 +1654,7 @@ QSize QMenuBar::minimumSizeHint() const opt.menuItemType = QStyleOptionMenuItem::Normal; opt.checkType = QStyleOptionMenuItem::NotCheckable; opt.palette = palette(); - return (style()->sizeFromContents(QStyle::CT_MenuBar, &opt, - ret.expandedTo(QApplication::globalStrut()), - this)); + return style()->sizeFromContents(QStyle::CT_MenuBar, &opt, ret, this); } return ret; } @@ -1707,9 +1705,7 @@ QSize QMenuBar::sizeHint() const opt.menuItemType = QStyleOptionMenuItem::Normal; opt.checkType = QStyleOptionMenuItem::NotCheckable; opt.palette = palette(); - return (style()->sizeFromContents(QStyle::CT_MenuBar, &opt, - ret.expandedTo(QApplication::globalStrut()), - this)); + return style()->sizeFromContents(QStyle::CT_MenuBar, &opt, ret, this); } return ret; } |