diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-05 13:48:14 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-05 15:32:08 +0100 |
| commit | 60be58eb314349862e09d3fc106bfa23feda170f (patch) | |
| tree | d71e4bf7a2e4b6ecaf187338a279e6eeb5f7d419 | |
| parent | a65303b133e47b98c5a3d561def6597aebba56df (diff) | |
Qt Designer: Fix warnings about deprecated style metrics
Use PM_LayoutLeftMargin, PM_LayoutHorizontalSpacing instead of
PM_DefaultChildMargin, PM_DefaultLayoutSpacing, fixing:
formeditor/formwindowsettings.cpp:11452: warning: ‘PM_DefaultChildMargin’ is deprecated [-Wdeprecated-declarations]
formeditor/formwindowsettings.cpp:116:53: warning: ‘PM_DefaultLayoutSpacing’ is deprecated [-Wdeprecated-declarations]
A child widget needs to be passed to PM_LayoutLeftMargin to
correctly obtain the child margin.
Change-Id: Ided8fb45d2372a56bae3a0304c35339fcc3b83ee
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | src/designer/src/components/formeditor/formwindowsettings.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/designer/src/components/formeditor/formwindowsettings.cpp b/src/designer/src/components/formeditor/formwindowsettings.cpp index de03c6792..3e24b7623 100644 --- a/src/designer/src/components/formeditor/formwindowsettings.cpp +++ b/src/designer/src/components/formeditor/formwindowsettings.cpp @@ -108,12 +108,13 @@ void FormWindowData::fromFormWindow(FormWindowBase* fw) defaultMargin = defaultSpacing = INT_MIN; fw->layoutDefault(&defaultMargin, &defaultSpacing); - QStyle *style = fw->formContainer()->style(); + auto container = fw->formContainer(); + QStyle *style = container->style(); layoutDefaultEnabled = defaultMargin != INT_MIN || defaultSpacing != INT_MIN; if (defaultMargin == INT_MIN) - defaultMargin = style->pixelMetric(QStyle::PM_DefaultChildMargin, nullptr); + defaultMargin = style->pixelMetric(QStyle::PM_LayoutLeftMargin, nullptr, container); if (defaultSpacing == INT_MIN) - defaultSpacing = style->pixelMetric(QStyle::PM_DefaultLayoutSpacing, nullptr); + defaultSpacing = style->pixelMetric(QStyle::PM_LayoutHorizontalSpacing, nullptr); marginFunction.clear(); |