From df1876f0d0a3b97450a63b952b165ec59c35d5b8 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Wed, 1 Dec 2021 20:31:08 +0100
Subject: [PATCH] Remove nested margins in project panel wigets

While maintaining the margins in the respective option pages.

Change-Id: Ia7c0e9f68ab196be0d68632117041eca9f4b15f5
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
---
 src/plugins/autotest/projectsettingswidget.cpp       |  2 ++
 .../clangcodemodel/clangprojectsettingswidget.ui     | 12 ++++++++++++
 .../clangtools/clangtoolsprojectsettingswidget.ui    | 12 ++++++++++++
 src/plugins/cppeditor/cppcodemodelsettingspage.cpp   |  2 ++
 .../cppeditor/cppquickfixprojectsettingswidget.cpp   |  2 ++
 .../cppeditor/cppquickfixprojectsettingswidget.ui    | 12 ++++++++++++
 6 files changed, 42 insertions(+)

diff --git a/src/plugins/autotest/projectsettingswidget.cpp b/src/plugins/autotest/projectsettingswidget.cpp
index b2d507f8efb..f4ede604fcf 100644
--- a/src/plugins/autotest/projectsettingswidget.cpp
+++ b/src/plugins/autotest/projectsettingswidget.cpp
@@ -57,12 +57,14 @@ ProjectTestSettingsWidget::ProjectTestSettingsWidget(ProjectExplorer::Project *p
     , m_projectSettings(AutotestPlugin::projectSettings(project))
 {
     auto verticalLayout = new QVBoxLayout(this);
+    verticalLayout->setContentsMargins(0, 0, 0, 0);
     m_useGlobalSettings = new QComboBox;
     m_useGlobalSettings->addItem(tr("Global"));
     m_useGlobalSettings->addItem(tr("Custom"));
 
     auto generalWidget = new QWidget;
     auto groupBoxLayout = new QVBoxLayout;
+    groupBoxLayout->setContentsMargins(0, 0, 0, 0);
     m_activeFrameworks = new QTreeWidget;
     m_activeFrameworks->setHeaderHidden(true);
     m_activeFrameworks->setRootIsDecorated(false);
diff --git a/src/plugins/clangcodemodel/clangprojectsettingswidget.ui b/src/plugins/clangcodemodel/clangprojectsettingswidget.ui
index ebb717ef34e..d21ac3c7317 100644
--- a/src/plugins/clangcodemodel/clangprojectsettingswidget.ui
+++ b/src/plugins/clangcodemodel/clangprojectsettingswidget.ui
@@ -14,6 +14,18 @@
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
diff --git a/src/plugins/clangtools/clangtoolsprojectsettingswidget.ui b/src/plugins/clangtools/clangtoolsprojectsettingswidget.ui
index 68d4aa217cd..b9f3e74a36e 100644
--- a/src/plugins/clangtools/clangtoolsprojectsettingswidget.ui
+++ b/src/plugins/clangtools/clangtoolsprojectsettingswidget.ui
@@ -14,6 +14,18 @@
    <string/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
diff --git a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp b/src/plugins/cppeditor/cppcodemodelsettingspage.cpp
index b147d74d222..187413c30b8 100644
--- a/src/plugins/cppeditor/cppcodemodelsettingspage.cpp
+++ b/src/plugins/cppeditor/cppcodemodelsettingspage.cpp
@@ -245,6 +245,7 @@ ClangdSettingsWidget::ClangdSettingsWidget(const ClangdSettings::Data &settingsD
            "If the document changes again while waiting, this timeout resets.\n"));
 
     const auto layout = new QVBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(&d->useClangdCheckBox);
     const auto formLayout = new QFormLayout;
     const auto chooserLabel = new QLabel(tr("Path to executable:"));
@@ -442,6 +443,7 @@ ClangdProjectSettingsWidget::ClangdProjectSettingsWidget(const ClangdProjectSett
     : d(new Private(settings))
 {
     const auto layout = new QVBoxLayout(this);
+    layout->setContentsMargins(0, 0, 0, 0);
     const auto globalSettingsLayout = new QHBoxLayout;
     globalSettingsLayout->addWidget(&d->useGlobalSettingsCheckBox);
     const auto globalSettingsLabel = new QLabel("Use <a href=\"dummy\">global settings</a>");
diff --git a/src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp b/src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp
index 91f22856683..3414cb3a6c0 100644
--- a/src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp
+++ b/src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp
@@ -40,6 +40,8 @@ CppQuickFixProjectSettingsWidget::CppQuickFixProjectSettingsWidget(ProjectExplor
     ui->setupUi(this);
     m_settingsWidget = new CppEditor::Internal::CppQuickFixSettingsWidget(this);
     m_settingsWidget->loadSettings(m_projectSettings->getSettings());
+    if (QLayout *layout = m_settingsWidget->layout())
+        layout->setContentsMargins(0, 0, 0, 0);
     ui->layout->addWidget(m_settingsWidget);
     connect(ui->comboBox,
             QOverload<int>::of(&QComboBox::currentIndexChanged),
diff --git a/src/plugins/cppeditor/cppquickfixprojectsettingswidget.ui b/src/plugins/cppeditor/cppquickfixprojectsettingswidget.ui
index d0c047b9b68..b90b668a747 100644
--- a/src/plugins/cppeditor/cppquickfixprojectsettingswidget.ui
+++ b/src/plugins/cppeditor/cppquickfixprojectsettingswidget.ui
@@ -11,6 +11,18 @@
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item row="0" column="1">
     <widget class="QPushButton" name="pushButton_custom">
      <property name="text">