diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-15 17:01:11 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-16 16:53:18 +0200 |
commit | 90295dcd030e731acfbcfe480cadfe84200b1a0a (patch) | |
tree | 1aff3c21fc3e1c5791b0b6742b6b81621fe38053 /src/widgets/styles/qcommonstyle.cpp | |
parent | fe4a5a27e09b8109381e52aa1b71135a916dff1a (diff) |
Remove deprecated QStyle enum values
Change-Id: I7eba336017844c06b2976df53d440e167abd7894
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/widgets/styles/qcommonstyle.cpp')
-rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index cb2a620aa8..e3e6cb05df 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -4776,21 +4776,11 @@ int QCommonStyle::pixelMetric(PixelMetric m, const QStyleOption *opt, const QWid } else if (widget) { isWindow = widget->isWindow(); } - ret = proxy()->pixelMetric(isWindow ? PM_DefaultTopLevelMargin : PM_DefaultChildMargin, opt); + ret = int(QStyleHelper::dpiScaled(isWindow ? 11 : 9, opt)); } break; case PM_LayoutHorizontalSpacing: case PM_LayoutVerticalSpacing: - ret = proxy()->pixelMetric(PM_DefaultLayoutSpacing, opt); - break; - - case PM_DefaultTopLevelMargin: - ret = int(QStyleHelper::dpiScaled(11, opt)); - break; - case PM_DefaultChildMargin: - ret = int(QStyleHelper::dpiScaled(9, opt)); - break; - case PM_DefaultLayoutSpacing: ret = int(QStyleHelper::dpiScaled(6, opt)); break; |