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/plugins | |
| 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/plugins')
| -rw-r--r-- | src/plugins/styles/mac/qmacstyle_mac.mm | 2 | ||||
| -rw-r--r-- | src/plugins/styles/windowsvista/qwindowsxpstyle.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/styles/mac/qmacstyle_mac.mm b/src/plugins/styles/mac/qmacstyle_mac.mm index 3b52ba8992..488b1da405 100644 --- a/src/plugins/styles/mac/qmacstyle_mac.mm +++ b/src/plugins/styles/mac/qmacstyle_mac.mm @@ -2502,7 +2502,7 @@ int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QW ret = 4; break; case PM_SplitterWidth: - ret = qMax(7, QApplication::globalStrut().width()); + ret = 7; break; case PM_LayoutLeftMargin: case PM_LayoutTopMargin: diff --git a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp index c7ed8909bc..67198e701c 100644 --- a/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp +++ b/src/plugins/styles/windowsvista/qwindowsxpstyle.cpp @@ -3255,8 +3255,7 @@ int QWindowsXPStyle::pixelMetric(PixelMetric pm, const QStyleOption *option, con break; case PM_SplitterWidth: - res = qMax(int(QStyleHelper::dpiScaled(5., option)), - QApplication::globalStrut().width()); + res = QStyleHelper::dpiScaled(5., option); break; case PM_MdiSubWindowMinimizedWidth: |