Layouts: Add/remove contentMargins where needed

Some cases were preexisting, some were introduced recently

Change-Id: I0e7e7b74422c420fbf4563d7cbf384e53931c3a0
Reviewed-by: hjk <hjk@qt.io>

6 files changed, 8 insertions, 5 deletions

diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
index 16c9c072038..c846fb9dae0 100644
--- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
+++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp
@@ -689,6 +689,7 @@ public:
         auto inner = new ShortcutSettingsWidget;
         auto vbox = new QVBoxLayout(this);
         vbox->addWidget(inner);
+        vbox->setContentsMargins(0, 0, 0, 0);
 
         setOnApply([inner] { inner->apply(); });
     }
diff --git a/src/plugins/cppcheck/cppcheckoptions.cpp b/src/plugins/cppcheck/cppcheckoptions.cpp
index 9a16319bb29..d91c9a6ebbe 100644
--- a/src/plugins/cppcheck/cppcheckoptions.cpp
+++ b/src/plugins/cppcheck/cppcheckoptions.cpp
@@ -130,6 +130,7 @@ public:
 
         auto vbox = new QVBoxLayout(this);
         vbox->addWidget(m_optionWidget);
+        vbox->setContentsMargins(0, 0, 0, 0);
 
         m_optionWidget->load(m_page->m_tool.options());
     }
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp
index 8d71345b56f..0ac0244ff6b 100644
--- a/src/plugins/fakevim/fakevimplugin.cpp
+++ b/src/plugins/fakevim/fakevimplugin.cpp
@@ -807,6 +807,7 @@ public:
         m_exCommands = new FakeVimExCommandsMappings;
         auto vbox = new QVBoxLayout(this);
         vbox->addWidget(m_exCommands);
+        vbox->setContentsMargins(0, 0, 0, 0);
     }
 
 private:
diff --git a/src/plugins/help/filtersettingspage.cpp b/src/plugins/help/filtersettingspage.cpp
index 7f6ca802e9f..d484314f9d6 100644
--- a/src/plugins/help/filtersettingspage.cpp
+++ b/src/plugins/help/filtersettingspage.cpp
@@ -25,6 +25,7 @@ public:
 
         auto vbox = new QVBoxLayout(this);
         vbox->addWidget(m_widget);
+        vbox->setContentsMargins(0, 0, 0, 0);
 
         connect(Core::HelpManager::Signals::instance(),
                 &Core::HelpManager::Signals::documentationChanged,
diff --git a/src/plugins/nim/settings/nimcodestylesettingspage.cpp b/src/plugins/nim/settings/nimcodestylesettingspage.cpp
index 79c3634cf25..ae26a14208a 100644
--- a/src/plugins/nim/settings/nimcodestylesettingspage.cpp
+++ b/src/plugins/nim/settings/nimcodestylesettingspage.cpp
@@ -36,7 +36,6 @@ public:
 
         auto layout = new QVBoxLayout(this);
         layout->addWidget(editor);
-        layout->setContentsMargins(0, 0, 0, 0);
     }
 
 private:
diff --git a/src/plugins/vcsbase/commonvcssettings.cpp b/src/plugins/vcsbase/commonvcssettings.cpp
index 2f970ccbb83..416230e8d44 100644
--- a/src/plugins/vcsbase/commonvcssettings.cpp
+++ b/src/plugins/vcsbase/commonvcssettings.cpp
@@ -119,10 +119,10 @@ CommonSettingsWidget::CommonSettingsWidget(CommonOptionsPage *page)
     Column {
         Row { s.lineWrap, s.lineWrapWidth, st },
         Form {
-            s.submitMessageCheckScript,
-            s.nickNameMailMap,
-            s.nickNameFieldListFile,
-            s.sshPasswordPrompt,
+            s.submitMessageCheckScript, br,
+            s.nickNameMailMap, br,
+            s.nickNameFieldListFile, br,
+            s.sshPasswordPrompt, br,
             {}, cacheResetButton
         }
     }.attachTo(this);