1 files changed, 5 insertions, 4 deletions
diff --git a/src/designer/src/components/formeditor/formwindowsettings.cpp b/src/designer/src/components/formeditor/formwindowsettings.cpp
index 4ccd7210b..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();
@@ -244,7 +245,7 @@ void FormWindowSettings::setData(const FormWindowData &data)
 
     m_ui->authorLineEdit->setText(data.author);
 
-    if (data.includeHints.empty()) {
+    if (data.includeHints.isEmpty()) {
         m_ui->includeHintsTextEdit->clear();
     } else {
         m_ui->includeHintsTextEdit->setText(data.includeHints.join(QLatin1Char('\n')));