Remove usages of deprecated APIs of QLayout

Replaced:
  QLayout::setMargin() -> QLayout::setContentsMargins()
  QLayout::margin() -> QLayout::getContentsMargins()

Task-number: QTBUG-76491
Change-Id: If28ef6910b3afe5d04e4746b74f9362a3e3b3c8e
Reviewed-by: Eike Ziller <[email protected]>

117 files changed, 177 insertions, 181 deletions

diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp
index 7566e2ac7a4..db8b69a47f2 100644
--- a/src/libs/qmleditorwidgets/contextpanewidget.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp
@@ -158,7 +158,6 @@ void DragWidget::enterEvent(QEvent *)
 ContextPaneWidget::ContextPaneWidget(QWidget *parent) : DragWidget(parent), m_currentWidget(nullptr)
 {
     QGridLayout *layout = new QGridLayout(this);
-    layout->setMargin(0);
     layout->setContentsMargins(1, 1, 1, 1);
     layout->setSpacing(0);
     m_toolButton = new QToolButton(this);
diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
index dcc3e9ecc66..abe974ee5c4 100644
--- a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
+++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp
@@ -884,7 +884,6 @@ PreviewDialog::PreviewDialog(QWidget *parent) : DragWidget(parent)
     QVBoxLayout *layout = new QVBoxLayout(this);
     QHBoxLayout *horizontalLayout = new QHBoxLayout();
     QHBoxLayout *horizontalLayout2 = new QHBoxLayout();
-    layout->setMargin(0);
     layout->setContentsMargins(2, 2, 2, 16);
     layout->setSpacing(4);
     QToolButton *toolButton = new QToolButton(this);
diff --git a/src/libs/qmleditorwidgets/customcolordialog.cpp b/src/libs/qmleditorwidgets/customcolordialog.cpp
index de603e0ea9c..198d2730815 100644
--- a/src/libs/qmleditorwidgets/customcolordialog.cpp
+++ b/src/libs/qmleditorwidgets/customcolordialog.cpp
@@ -62,8 +62,7 @@ CustomColorDialog::CustomColorDialog(QWidget *parent) : QFrame(parent )
     QVBoxLayout* vBox = new QVBoxLayout(colorFrameWidget);
     colorFrameWidget->setLayout(vBox);
     vBox->setSpacing(0);
-    vBox->setMargin(0);
-    vBox->setContentsMargins(0,5,0,28);
+    vBox->setContentsMargins(0, 5, 0, 28);
 
     m_beforeColorWidget = new QFrame(colorFrameWidget);
     m_beforeColorWidget->setFixedSize(30, 18);
@@ -85,7 +84,7 @@ CustomColorDialog::CustomColorDialog(QWidget *parent) : QFrame(parent )
     QGridLayout *gridLayout = new QGridLayout(this);
     gridLayout->setSpacing(4);
     gridLayout->setVerticalSpacing(4);
-    gridLayout->setMargin(4);
+    gridLayout->setContentsMargins(4, 4, 4, 4);
     setLayout(gridLayout);
 
     gridLayout->addWidget(m_colorBox, 0, 0, 4, 1);
diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp
index 9d870e90d29..d49473beb75 100644
--- a/src/libs/utils/fancymainwindow.cpp
+++ b/src/libs/utils/fancymainwindow.cpp
@@ -182,7 +182,7 @@ public:
         m_maximumActiveSize   = QSize(maxWidth, activeHeight);
 
         auto layout = new QHBoxLayout(this);
-        layout->setMargin(0);
+        layout->setContentsMargins(0, 0, 0, 0);
         layout->setSpacing(0);
         layout->setContentsMargins(4, 0, 0, 0);
         layout->addWidget(m_titleLabel);
diff --git a/src/libs/utils/flowlayout.cpp b/src/libs/utils/flowlayout.cpp
index d138a15149e..fe8c7900cdb 100644
--- a/src/libs/utils/flowlayout.cpp
+++ b/src/libs/utils/flowlayout.cpp
@@ -121,7 +121,9 @@ QSize FlowLayout::minimumSize() const
     foreach (item, itemList)
         size = size.expandedTo(item->minimumSize());
 
-    size += QSize(2*margin(), 2*margin());
+    int left, top, right, bottom;
+    getContentsMargins(&left, &top, &right, &bottom);
+    size += QSize(left + right, top + bottom);
     return size;
 }
 
diff --git a/src/libs/utils/namevaluesdialog.cpp b/src/libs/utils/namevaluesdialog.cpp
index ed71d8db7f6..4f92a79680d 100644
--- a/src/libs/utils/namevaluesdialog.cpp
+++ b/src/libs/utils/namevaluesdialog.cpp
@@ -61,7 +61,7 @@ NameValueItemsWidget::NameValueItemsWidget(QWidget *parent)
 {
     m_editor = new QPlainTextEdit(this);
     auto layout = new QVBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_editor);
 }
 
diff --git a/src/libs/utils/pathlisteditor.cpp b/src/libs/utils/pathlisteditor.cpp
index 70ec975db76..522ea76bc52 100644
--- a/src/libs/utils/pathlisteditor.cpp
+++ b/src/libs/utils/pathlisteditor.cpp
@@ -110,7 +110,7 @@ PathListEditorPrivate::PathListEditorPrivate()   :
         buttonLayout(new QVBoxLayout),
         edit(new PathListPlainTextEdit)
 {
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(edit);
     layout->addLayout(buttonLayout);
     buttonLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Ignored,
diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp
index 2680f41c2dd..4efd1495b73 100644
--- a/src/libs/utils/wizard.cpp
+++ b/src/libs/utils/wizard.cpp
@@ -66,7 +66,7 @@ public:
         m_indicatorLabel->setFixedSize(m_indicatorPixmap.size());
         m_titleLabel = new QLabel(title, this);
         auto l = new QHBoxLayout(this);
-        l->setMargin(0);
+        l->setContentsMargins(0, 0, 0, 0);
         l->addWidget(m_indicatorLabel);
         l->addWidget(m_titleLabel);
     }
diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index d8e8b003c6a..97c56a34b10 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -165,7 +165,7 @@ void AndroidManifestEditorWidget::initializePage()
         m_packageNameWarningIcon->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
         auto warningRow = new QHBoxLayout;
-        warningRow->setMargin(0);
+        warningRow->setContentsMargins(0, 0, 0, 0);
         warningRow->addWidget(m_packageNameWarningIcon);
         warningRow->addWidget(m_packageNameWarning);
 
diff --git a/src/plugins/android/androidpotentialkit.cpp b/src/plugins/android/androidpotentialkit.cpp
index f755551b281..ce2851875dc 100644
--- a/src/plugins/android/androidpotentialkit.cpp
+++ b/src/plugins/android/androidpotentialkit.cpp
@@ -91,7 +91,7 @@ AndroidPotentialKitWidget::AndroidPotentialKitWidget(QWidget *parent)
     setWidget(mainWidget);
 
     auto layout = new QGridLayout(mainWidget);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     auto label = new QLabel;
     label->setText(tr("%1 needs additional settings to enable Android support."
                       " You can configure those settings in the Options dialog.")
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp
index 965483ab165..f633f7eb850 100644
--- a/src/plugins/android/androidsettingswidget.cpp
+++ b/src/plugins/android/androidsettingswidget.cpp
@@ -103,7 +103,7 @@ public:
     {
         QTC_CHECK(m_detailsWidget);
         auto layout = new QGridLayout(this);
-        layout->setMargin(12);
+        layout->setContentsMargins(12, 12, 12, 12);
         int row = 0;
         for (auto itr = validationPoints.cbegin(); itr != validationPoints.cend(); ++itr) {
             RowData data;
@@ -235,7 +235,7 @@ AndroidSettingsWidget::AndroidSettingsWidget(QWidget *parent)
     m_sdkManagerWidget = new AndroidSdkManagerWidget(m_androidConfig, m_sdkManager.get(),
                                                      m_ui->sdkManagerTab);
     auto sdkMangerLayout = new QVBoxLayout(m_ui->sdkManagerTab);
-    sdkMangerLayout->setMargin(0);
+    sdkMangerLayout->setContentsMargins(0, 0, 0, 0);
     sdkMangerLayout->addWidget(m_sdkManagerWidget);
     connect(m_sdkManagerWidget, &AndroidSdkManagerWidget::updatingSdk, [this]() {
         m_ui->SDKLocationPathChooser->setEnabled(false);
diff --git a/src/plugins/autotest/testnavigationwidget.cpp b/src/plugins/autotest/testnavigationwidget.cpp
index 9899fcc32a5..cf5db813643 100644
--- a/src/plugins/autotest/testnavigationwidget.cpp
+++ b/src/plugins/autotest/testnavigationwidget.cpp
@@ -78,7 +78,7 @@ TestNavigationWidget::TestNavigationWidget(QWidget *parent) :
     hLayout->addWidget(new QLabel(tr("No active test frameworks.")));
     m_missingFrameworksWidget->setVisible(!TestFrameworkManager::instance()->hasActiveFrameworks());
     QVBoxLayout *layout = new QVBoxLayout;
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(m_missingFrameworksWidget);
     layout->addWidget(Core::ItemViewFind::createSearchableWrapper(m_view));
diff --git a/src/plugins/autotest/testresultspane.cpp b/src/plugins/autotest/testresultspane.cpp
index be7b12657f8..c84be8481c1 100644
--- a/src/plugins/autotest/testresultspane.cpp
+++ b/src/plugins/autotest/testresultspane.cpp
@@ -89,7 +89,7 @@ TestResultsPane::TestResultsPane(QObject *parent) :
     QWidget *visualOutputWidget = new QWidget;
     m_outputWidget->addWidget(visualOutputWidget);
     QVBoxLayout *outputLayout = new QVBoxLayout;
-    outputLayout->setMargin(0);
+    outputLayout->setContentsMargins(0, 0, 0, 0);
     outputLayout->setSpacing(0);
     visualOutputWidget->setLayout(outputLayout);
 
@@ -102,7 +102,7 @@ TestResultsPane::TestResultsPane(QObject *parent) :
     m_summaryWidget->setPalette(pal);
     m_summaryWidget->setAutoFillBackground(true);
     QHBoxLayout *layout = new QHBoxLayout;
-    layout->setMargin(6);
+    layout->setContentsMargins(6, 6, 6, 6);
     m_summaryWidget->setLayout(layout);
     m_summaryLabel = new QLabel;
     m_summaryLabel->setPalette(pal);
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index 9fbba5c7f85..b6bc79d23ad 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -368,7 +368,6 @@ public:
 
         auto l = new QHBoxLayout;
         auto w = new QWidget;
-        l->setMargin(0);
         l->setContentsMargins(0, 0, 5, 0);
         l->addStretch(1);
         l->addWidget(m_addressEdit);
diff --git a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
index 8fd25083154..627299c64e7 100644
--- a/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
+++ b/src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp
@@ -637,7 +637,6 @@ ClangEditorDocumentProcessor::creatorForHeaderErrorDiagnosticWidget(
 
     return [firstHeaderErrorDiagnostic]() {
         auto vbox = new QVBoxLayout;
-        vbox->setMargin(0);
         vbox->setContentsMargins(10, 0, 0, 2);
         vbox->setSpacing(2);
 
diff --git a/src/plugins/clangpchmanager/preprocessormacrowidget.cpp b/src/plugins/clangpchmanager/preprocessormacrowidget.cpp
index dd406b4a5ed..8ebe45bef8e 100644
--- a/src/plugins/clangpchmanager/preprocessormacrowidget.cpp
+++ b/src/plugins/clangpchmanager/preprocessormacrowidget.cpp
@@ -95,10 +95,10 @@ PreprocessorMacroWidget::PreprocessorMacroWidget(QWidget *parent) : QWidget(pare
     details->setVisible(false);
 
     auto vbox2 = new QVBoxLayout(details);
-    vbox2->setMargin(0);
+    vbox2->setContentsMargins(0, 0, 0, 0);
 
     auto horizontalLayout = new QHBoxLayout;
-    horizontalLayout->setMargin(0);
+    horizontalLayout->setContentsMargins(0, 0, 0, 0);
     auto tree = new Utils::TreeView(this);
     connect(tree, &QAbstractItemView::activated, tree, [tree](const QModelIndex &idx) {
         tree->edit(idx);
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
index 293f38585a0..c8b4b8d70b9 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildsettingswidget.cpp
@@ -91,7 +91,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
     setDisplayName(tr("CMake"));
 
     auto vbox = new QVBoxLayout(this);
-    vbox->setMargin(0);
+    vbox->setContentsMargins(0, 0, 0, 0);
     auto container = new Utils::DetailsWidget;
     container->setState(Utils::DetailsWidget::NoSummary);
     vbox->addWidget(container);
@@ -100,7 +100,7 @@ CMakeBuildSettingsWidget::CMakeBuildSettingsWidget(CMakeBuildConfiguration *bc)
     container->setWidget(details);
 
     auto mainLayout = new QGridLayout(details);
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->setColumnStretch(1, 10);
 
     auto project = static_cast<CMakeProject *>(bc->project());
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index 45fd5745832..5076d816ef1 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -411,7 +411,7 @@ CMakeBuildStepConfigWidget::CMakeBuildStepConfigWidget(CMakeBuildStep *buildStep
     setDisplayName(tr("Build", "CMakeProjectManager::CMakeBuildStepConfigWidget display name."));
 
     auto fl = new QFormLayout(this);
-    fl->setMargin(0);
+    fl->setContentsMargins(0, 0, 0, 0);
     fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
     setLayout(fl);
 
@@ -424,7 +424,7 @@ CMakeBuildStepConfigWidget::CMakeBuildStepConfigWidget(CMakeBuildStep *buildStep
     auto frame = new QFrame(this);
     frame->setFrameStyle(QFrame::StyledPanel);
     auto frameLayout = new QVBoxLayout(frame);
-    frameLayout->setMargin(0);
+    frameLayout->setContentsMargins(0, 0, 0, 0);
     frameLayout->addWidget(Core::ItemViewFind::createSearchableWrapper(m_buildTargetsList,
                                                                        Core::ItemViewFind::LightColored));
 
diff --git a/src/plugins/coreplugin/dialogs/settingsdialog.cpp b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
index 8057a9e48ad..302a5042170 100644
--- a/src/plugins/coreplugin/dialogs/settingsdialog.cpp
+++ b/src/plugins/coreplugin/dialogs/settingsdialog.cpp
@@ -550,7 +550,7 @@ void SettingsDialog::createGui()
     headerHLayout->addSpacerItem(new QSpacerItem(leftMargin, 0, QSizePolicy::Fixed, QSizePolicy::Ignored));
     headerHLayout->addWidget(m_headerLabel);
 
-    m_stackedLayout->setMargin(0);
+    m_stackedLayout->setContentsMargins(0, 0, 0, 0);
     QWidget *emptyWidget = new QWidget(this);
     m_stackedLayout->addWidget(emptyWidget); // no category selected, for example when filtering
 
diff --git a/src/plugins/coreplugin/editmode.cpp b/src/plugins/coreplugin/editmode.cpp
index c3d47d291c4..d53d76e46dc 100644
--- a/src/plugins/coreplugin/editmode.cpp
+++ b/src/plugins/coreplugin/editmode.cpp
@@ -55,7 +55,7 @@ EditMode::EditMode() :
     setId(Constants::MODE_EDIT);
 
     m_rightSplitWidgetLayout->setSpacing(0);
-    m_rightSplitWidgetLayout->setMargin(0);
+    m_rightSplitWidgetLayout->setContentsMargins(0, 0, 0, 0);
     QWidget *rightSplitWidget = new QWidget;
     rightSplitWidget->setLayout(m_rightSplitWidgetLayout);
     auto editorPlaceHolder = new EditorManagerPlaceHolder;
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index 2c26d50214d..4e21664d82c 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -137,7 +137,7 @@ EditorManagerPlaceHolder::EditorManagerPlaceHolder(QWidget *parent)
     : QWidget(parent)
 {
     setLayout(new QVBoxLayout);
-    layout()->setMargin(0);
+    layout()->setContentsMargins(0, 0, 0, 0);
     setFocusProxy(EditorManagerPrivate::mainEditorArea());
 }
 
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index d38923be38e..c9adba0206d 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -72,7 +72,7 @@ EditorView::EditorView(SplitterOrView *parentSplitterOrView, QWidget *parent) :
 {
     auto tl = new QVBoxLayout(this);
     tl->setSpacing(0);
-    tl->setMargin(0);
+    tl->setContentsMargins(0, 0, 0, 0);
     {
         connect(m_toolBar, &EditorToolBar::goBackClicked,
                 this, &EditorView::goBackInNavigationHistory);
diff --git a/src/plugins/coreplugin/editormanager/editorwindow.cpp b/src/plugins/coreplugin/editormanager/editorwindow.cpp
index 83b87071318..02da562e5a4 100644
--- a/src/plugins/coreplugin/editormanager/editorwindow.cpp
+++ b/src/plugins/coreplugin/editormanager/editorwindow.cpp
@@ -50,7 +50,7 @@ EditorWindow::EditorWindow(QWidget *parent) :
 {
     m_area = new EditorArea;
     auto layout = new QVBoxLayout;
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     setLayout(layout);
     layout->addWidget(m_area);
diff --git a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
index ad1775f9d20..d7af47f372c 100644
--- a/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorswindow.cpp
@@ -73,7 +73,7 @@ OpenEditorsWindow::OpenEditorsWindow(QWidget *parent) :
     m_editorList->setFrameStyle(QFrame::NoFrame);
 
     auto layout = new QVBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_editorList);
 
     connect(m_editorList, &QTreeWidget::itemClicked,
diff --git a/src/plugins/coreplugin/editortoolbar.cpp b/src/plugins/coreplugin/editortoolbar.cpp
index 9d19415e45c..99dfab9182b 100644
--- a/src/plugins/coreplugin/editortoolbar.cpp
+++ b/src/plugins/coreplugin/editortoolbar.cpp
@@ -119,7 +119,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
         Utils::StyledBar(parent), d(new EditorToolBarPrivate(parent, this))
 {
     auto toolBarLayout = new QHBoxLayout(this);
-    toolBarLayout->setMargin(0);
+    toolBarLayout->setContentsMargins(0, 0, 0, 0);
     toolBarLayout->setSpacing(0);
     toolBarLayout->addWidget(d->m_defaultToolBar);
     d->m_toolBarPlaceholder->setLayout(toolBarLayout);
@@ -172,7 +172,7 @@ EditorToolBar::EditorToolBar(QWidget *parent) :
 
     auto toplayout = new QHBoxLayout(this);
     toplayout->setSpacing(0);
-    toplayout->setMargin(0);
+    toplayout->setContentsMargins(0, 0, 0, 0);
     toplayout->addWidget(d->m_backButton);
     toplayout->addWidget(d->m_forwardButton);
     toplayout->addWidget(d->m_lockButton);
diff --git a/src/plugins/coreplugin/fancyactionbar.cpp b/src/plugins/coreplugin/fancyactionbar.cpp
index d332817f626..03f28778f6b 100644
--- a/src/plugins/coreplugin/fancyactionbar.cpp
+++ b/src/plugins/coreplugin/fancyactionbar.cpp
@@ -359,7 +359,7 @@ FancyActionBar::FancyActionBar(QWidget *parent)
 {
     setObjectName("actionbar");
     m_actionsLayout = new QVBoxLayout;
-    m_actionsLayout->setMargin(0);
+    m_actionsLayout->setContentsMargins(0, 0, 0, 0);
     m_actionsLayout->setSpacing(0);
     setLayout(m_actionsLayout);
     setContentsMargins(0, 2, 0, 8);
diff --git a/src/plugins/coreplugin/fancytabwidget.cpp b/src/plugins/coreplugin/fancytabwidget.cpp
index 9bde8cdf3ba..1bc2ab50897 100644
--- a/src/plugins/coreplugin/fancytabwidget.cpp
+++ b/src/plugins/coreplugin/fancytabwidget.cpp
@@ -479,11 +479,11 @@ FancyTabWidget::FancyTabWidget(QWidget *parent)
     m_selectionWidget = new QWidget(this);
     auto selectionLayout = new QVBoxLayout;
     selectionLayout->setSpacing(0);
-    selectionLayout->setMargin(0);
+    selectionLayout->setContentsMargins(0, 0, 0, 0);
 
     auto bar = new StyledBar;
     auto layout = new QHBoxLayout(bar);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     auto fancyButton = new FancyColorButton(this);
     connect(fancyButton, &FancyColorButton::clicked, this, &FancyTabWidget::topAreaClicked);
@@ -501,7 +501,7 @@ FancyTabWidget::FancyTabWidget(QWidget *parent)
 
     auto cornerWidgetLayout = new QVBoxLayout;
     cornerWidgetLayout->setSpacing(0);
-    cornerWidgetLayout->setMargin(0);
+    cornerWidgetLayout->setContentsMargins(0, 0, 0, 0);
     cornerWidgetLayout->addStretch();
     m_cornerWidgetContainer->setLayout(cornerWidgetLayout);
 
@@ -512,7 +512,7 @@ FancyTabWidget::FancyTabWidget(QWidget *parent)
     m_statusBar->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Fixed);
 
     auto vlayout = new QVBoxLayout;
-    vlayout->setMargin(0);
+    vlayout->setContentsMargins(0, 0, 0, 0);
     vlayout->setSpacing(0);
     vlayout->addLayout(m_modesStack);
     vlayout->addWidget(m_statusBar);
@@ -521,7 +521,7 @@ FancyTabWidget::FancyTabWidget(QWidget *parent)
     m_infoBarDisplay.setStyle(QFrame::Sunken);
 
     auto mainLayout = new QHBoxLayout;
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->setSpacing(1);
     mainLayout->addWidget(m_selectionWidget);
     mainLayout->addLayout(vlayout);
diff --git a/src/plugins/coreplugin/find/findtoolwindow.cpp b/src/plugins/coreplugin/find/findtoolwindow.cpp
index 0490e8481fe..e25a0d33c66 100644
--- a/src/plugins/coreplugin/find/findtoolwindow.cpp
+++ b/src/plugins/coreplugin/find/findtoolwindow.cpp
@@ -93,7 +93,7 @@ FindToolWindow::FindToolWindow(QWidget *parent)
             this, &FindToolWindow::updateButtonStates);
 
     auto layout = new QVBoxLayout;
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     m_ui.configWidget->setLayout(layout);
     updateButtonStates();
diff --git a/src/plugins/coreplugin/find/itemviewfind.cpp b/src/plugins/coreplugin/find/itemviewfind.cpp
index 87f1160e979..3f07dff596c 100644
--- a/src/plugins/coreplugin/find/itemviewfind.cpp
+++ b/src/plugins/coreplugin/find/itemviewfind.cpp
@@ -139,7 +139,7 @@ static QFrame *createHelper(QAbstractItemView *treeView,
     placeHolder->setLightColored(colorOption);
 
     auto vbox = new QVBoxLayout(widget);
-    vbox->setMargin(0);
+    vbox->setContentsMargins(0, 0, 0, 0);
     vbox->setSpacing(0);
     vbox->addWidget(treeView);
     vbox->addWidget(placeHolder);
diff --git a/src/plugins/coreplugin/find/searchresultwidget.cpp b/src/plugins/coreplugin/find/searchresultwidget.cpp
index 5827885802e..bbc9f24d2bf 100644
--- a/src/plugins/coreplugin/find/searchresultwidget.cpp
+++ b/src/plugins/coreplugin/find/searchresultwidget.cpp
@@ -82,7 +82,7 @@ SearchResultWidget::SearchResultWidget(QWidget *parent) :
     QWidget(parent)
 {
     auto layout = new QVBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     setLayout(layout);
 
@@ -104,13 +104,13 @@ SearchResultWidget::SearchResultWidget(QWidget *parent) :
 
     auto topFindWidget = new QWidget(topWidget);
     auto topFindLayout = new QHBoxLayout(topFindWidget);
-    topFindLayout->setMargin(0);
+    topFindLayout->setContentsMargins(0, 0, 0, 0);
     topFindWidget->setLayout(topFindLayout);
     topLayout->addWidget(topFindWidget);
 
     m_topReplaceWidget = new QWidget(topWidget);
     auto topReplaceLayout = new QHBoxLayout(m_topReplaceWidget);
-    topReplaceLayout->setMargin(0);
+    topReplaceLayout->setContentsMargins(0, 0, 0, 0);
     m_topReplaceWidget->setLayout(topReplaceLayout);
     topLayout->addWidget(m_topReplaceWidget);
 
@@ -123,7 +123,7 @@ SearchResultWidget::SearchResultWidget(QWidget *parent) :
     }
     m_messageWidget->setAutoFillBackground(true);
     auto messageLayout = new QHBoxLayout(m_messageWidget);
-    messageLayout->setMargin(2);
+    messageLayout->setContentsMargins(2, 2, 2, 2);
     m_messageWidget->setLayout(messageLayout);
     QLabel *messageLabel = new QLabel(tr("Search was canceled."));
     messageLabel->setPalette(pal);
@@ -146,7 +146,7 @@ SearchResultWidget::SearchResultWidget(QWidget *parent) :
     m_descriptionContainer = new QWidget(topFindWidget);
     auto descriptionLayout = new QHBoxLayout(m_descriptionContainer);
     m_descriptionContainer->setLayout(descriptionLayout);
-    descriptionLayout->setMargin(0);
+    descriptionLayout->setContentsMargins(0, 0, 0, 0);
     m_descriptionContainer->setMinimumWidth(200);
     m_descriptionContainer->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
     m_label = new QLabel(m_descriptionContainer);
diff --git a/src/plugins/coreplugin/findplaceholder.cpp b/src/plugins/coreplugin/findplaceholder.cpp
index 101ccf87df8..13a5b243fbb 100644
--- a/src/plugins/coreplugin/findplaceholder.cpp
+++ b/src/plugins/coreplugin/findplaceholder.cpp
@@ -40,7 +40,7 @@ FindToolBarPlaceHolder::FindToolBarPlaceHolder(QWidget *owner, QWidget *parent)
     g_findToolBarPlaceHolders.append(this);
     setLayout(new QVBoxLayout);
     setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum);
-    layout()->setMargin(0);
+    layout()->setContentsMargins(0, 0, 0, 0);
 }
 
 FindToolBarPlaceHolder::~FindToolBarPlaceHolder()
diff --git a/src/plugins/coreplugin/infobar.cpp b/src/plugins/coreplugin/infobar.cpp
index eb6496e36ad..2113e0b78e1 100644
--- a/src/plugins/coreplugin/infobar.cpp
+++ b/src/plugins/coreplugin/infobar.cpp
@@ -251,10 +251,10 @@ void InfoBarDisplay::update()
         infoWidget->setAutoFillBackground(true);
 
         auto hbox = new QHBoxLayout;
-        hbox->setMargin(2);
+        hbox->setContentsMargins(2, 2, 2, 2);
 
         auto vbox = new QVBoxLayout(infoWidget);
-        vbox->setMargin(0);
+        vbox->setContentsMargins(0, 0, 0, 0);
         vbox->addLayout(hbox);
 
         QLabel *infoWidgetLabel = new QLabel(info.m_infoText);
diff --git a/src/plugins/coreplugin/locator/locatorwidget.cpp b/src/plugins/coreplugin/locator/locatorwidget.cpp
index b21afd2adc8..e545b8313c3 100644
--- a/src/plugins/coreplugin/locator/locatorwidget.cpp
+++ b/src/plugins/coreplugin/locator/locatorwidget.cpp
@@ -558,7 +558,7 @@ LocatorWidget::LocatorWidget(Locator *locator) :
 
     auto layout = new QHBoxLayout(this);
     setLayout(layout);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_fileLineEdit);
 
     const QIcon icon = Utils::Icons::MAGNIFIER.icon();
diff --git a/src/plugins/coreplugin/navigationsubwidget.cpp b/src/plugins/coreplugin/navigationsubwidget.cpp
index ab4858e3882..c839b3b5511 100644
--- a/src/plugins/coreplugin/navigationsubwidget.cpp
+++ b/src/plugins/coreplugin/navigationsubwidget.cpp
@@ -65,7 +65,7 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget, int pos
 
     m_toolBar = new Utils::StyledBar(this);
     auto toolBarLayout = new QHBoxLayout;
-    toolBarLayout->setMargin(0);
+    toolBarLayout->setContentsMargins(0, 0, 0, 0);
     toolBarLayout->setSpacing(0);
     m_toolBar->setLayout(toolBarLayout);
     toolBarLayout->addWidget(m_navigationComboBox);
@@ -87,7 +87,7 @@ NavigationSubWidget::NavigationSubWidget(NavigationWidget *parentWidget, int pos
     toolBarLayout->addWidget(m_closeButton);
 
     auto lay = new QVBoxLayout();
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     lay->setSpacing(0);
     setLayout(lay);
     lay->addWidget(m_toolBar);
diff --git a/src/plugins/coreplugin/navigationwidget.cpp b/src/plugins/coreplugin/navigationwidget.cpp
index 40fa487e5f1..6cb8fed4960 100644
--- a/src/plugins/coreplugin/navigationwidget.cpp
+++ b/src/plugins/coreplugin/navigationwidget.cpp
@@ -70,7 +70,7 @@ NavigationWidgetPlaceHolder::NavigationWidgetPlaceHolder(Id mode, Side side, QWi
     :QWidget(parent), m_mode(mode), m_side(side)
 {
     setLayout(new QVBoxLayout);
-    layout()->setMargin(0);
+    layout()->setContentsMargins(0, 0, 0, 0);
     connect(ModeManager::instance(), &ModeManager::currentModeAboutToChange,
             this, &NavigationWidgetPlaceHolder::currentModeAboutToChange);
 }
diff --git a/src/plugins/coreplugin/outputpane.cpp b/src/plugins/coreplugin/outputpane.cpp
index b6d118d6b69..5043ac8abd3 100644
--- a/src/plugins/coreplugin/outputpane.cpp
+++ b/src/plugins/coreplugin/outputpane.cpp
@@ -63,7 +63,7 @@ OutputPanePlaceHolder::OutputPanePlaceHolder(Id mode, QSplitter *parent)
     sp.setVerticalPolicy(QSizePolicy::Preferred);
     sp.setHorizontalStretch(0);
     setSizePolicy(sp);
-    layout()->setMargin(0);
+    layout()->setContentsMargins(0, 0, 0, 0);
     connect(ModeManager::instance(), &ModeManager::currentModeChanged,
             this, &OutputPanePlaceHolder::currentModeChanged);
     // if this is part of a lazily created mode widget,
diff --git a/src/plugins/coreplugin/outputpanemanager.cpp b/src/plugins/coreplugin/outputpanemanager.cpp
index 7cf2ec2c90a..b0153eda50b 100644
--- a/src/plugins/coreplugin/outputpanemanager.cpp
+++ b/src/plugins/coreplugin/outputpanemanager.cpp
@@ -346,10 +346,10 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
 
     auto mainlayout = new QVBoxLayout;
     mainlayout->setSpacing(0);
-    mainlayout->setMargin(0);
+    mainlayout->setContentsMargins(0, 0, 0, 0);
     m_toolBar = new StyledBar;
     auto toolLayout = new QHBoxLayout(m_toolBar);
-    toolLayout->setMargin(0);
+    toolLayout->setContentsMargins(0, 0, 0, 0);
     toolLayout->setSpacing(0);
     toolLayout->addWidget(m_titleLabel);
     toolLayout->addWidget(new StyledSeparator);
@@ -451,7 +451,7 @@ OutputPaneManager::OutputPaneManager(QWidget *parent) :
 
         QWidget *toolButtonsContainer = new QWidget(m_opToolBarWidgets);
         auto toolButtonsLayout = new QHBoxLayout;
-        toolButtonsLayout->setMargin(0);
+        toolButtonsLayout->setContentsMargins(0, 0, 0, 0);
         toolButtonsLayout->setSpacing(0);
         foreach (QWidget *toolButton, outPane->toolBarWidgets())
             toolButtonsLayout->addWidget(toolButton);
diff --git a/src/plugins/coreplugin/progressmanager/futureprogress.cpp b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
index 32193fd08b3..b39738bed47 100644
--- a/src/plugins/coreplugin/progressmanager/futureprogress.cpp
+++ b/src/plugins/coreplugin/progressmanager/futureprogress.cpp
@@ -128,7 +128,7 @@ FutureProgress::FutureProgress(QWidget *parent) :
     auto layout = new QVBoxLayout;
     setLayout(layout);
     layout->addWidget(d->m_progress);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addLayout(d->m_widgetLayout);
     d->m_widgetLayout->setContentsMargins(7, 0, 7, 2);
diff --git a/src/plugins/coreplugin/rightpane.cpp b/src/plugins/coreplugin/rightpane.cpp
index 403fe4b0c68..66741063962 100644
--- a/src/plugins/coreplugin/rightpane.cpp
+++ b/src/plugins/coreplugin/rightpane.cpp
@@ -49,7 +49,7 @@ RightPanePlaceHolder::RightPanePlaceHolder(Id mode, QWidget *parent)
     :QWidget(parent), m_mode(mode)
 {
     setLayout(new QVBoxLayout);
-    layout()->setMargin(0);
+    layout()->setContentsMargins(0, 0, 0, 0);
     connect(ModeManager::instance(), &ModeManager::currentModeChanged,
             this, &RightPanePlaceHolder::currentModeChanged);
 }
@@ -124,7 +124,7 @@ RightPaneWidget::RightPaneWidget()
     m_instance = this;
 
     auto layout = new QVBoxLayout;
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     setLayout(layout);
 }
 
diff --git a/src/plugins/coreplugin/sidebarwidget.cpp b/src/plugins/coreplugin/sidebarwidget.cpp
index fd561611c2e..2cb1c6539e3 100644
--- a/src/plugins/coreplugin/sidebarwidget.cpp
+++ b/src/plugins/coreplugin/sidebarwidget.cpp
@@ -81,7 +81,7 @@ SideBarWidget::SideBarWidget(SideBar *sideBar, const QString &id)
     m_toolbar->addAction(m_closeAction);
 
     auto lay = new QVBoxLayout();
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     lay->setSpacing(0);
     setLayout(lay);
     lay->addWidget(m_toolbar);
diff --git a/src/plugins/coreplugin/statusbarmanager.cpp b/src/plugins/coreplugin/statusbarmanager.cpp
index e71e7450777..a5d48489816 100644
--- a/src/plugins/coreplugin/statusbarmanager.cpp
+++ b/src/plugins/coreplugin/statusbarmanager.cpp
@@ -63,7 +63,7 @@ static QWidget *createWidget(QWidget *parent)
     QWidget *w = new QWidget(parent);
     w->setLayout(new QHBoxLayout);
     w->setVisible(true);
-    w->layout()->setMargin(0);
+    w->layout()->setContentsMargins(0, 0, 0, 0);
     return w;
 }
 
diff --git a/src/plugins/coreplugin/themechooser.cpp b/src/plugins/coreplugin/themechooser.cpp
index 7fedfea06f0..0c01084f4ca 100644
--- a/src/plugins/coreplugin/themechooser.cpp
+++ b/src/plugins/coreplugin/themechooser.cpp
@@ -141,7 +141,7 @@ ThemeChooserPrivate::ThemeChooserPrivate(QWidget *widget)
     overriddenLabel->setText(ThemeChooser::tr("Current theme: %1")
                              .arg(creatorTheme()->displayName()));
     layout->addWidget(overriddenLabel);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     auto horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
     layout->addSpacerItem(horizontalSpacer);
     m_themeComboBox->setModel(m_themeListModel);
diff --git a/src/plugins/cpaster/columnindicatortextedit.cpp b/src/plugins/cpaster/columnindicatortextedit.cpp
index cfbe8b24897..721ade51c1c 100644
--- a/src/plugins/cpaster/columnindicatortextedit.cpp
+++ b/src/plugins/cpaster/columnindicatortextedit.cpp
@@ -41,9 +41,8 @@ ColumnIndicatorTextEdit::ColumnIndicatorTextEdit(QWidget *parent) :
     QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     sizePolicy.setVerticalStretch(3);
     setSizePolicy(sizePolicy);
-    int cmx = 0, cmy = 0, cmw = 0, cmh = 0;
-    getContentsMargins(&cmx, &cmy, &cmw, &cmh);
-    m_columnIndicator = QFontMetrics(font).horizontalAdvance(QLatin1Char('W')) * 100 + cmx + 1;
+    m_columnIndicator = QFontMetrics(font).horizontalAdvance(QLatin1Char('W')) * 100
+            + contentsMargins().left() + 1;
     m_columnIndicatorFont.setFamily(QLatin1String("Times"));
     m_columnIndicatorFont.setPointSizeF(7.0);
 }
diff --git a/src/plugins/cppeditor/cppincludehierarchy.cpp b/src/plugins/cppeditor/cppincludehierarchy.cpp
index 856703199c6..41985bd5553 100644
--- a/src/plugins/cppeditor/cppincludehierarchy.cpp
+++ b/src/plugins/cppeditor/cppincludehierarchy.cpp
@@ -409,7 +409,7 @@ CppIncludeHierarchyWidget::CppIncludeHierarchyWidget()
             this, &CppIncludeHierarchyWidget::syncFromEditorManager);
 
     auto layout = new QVBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(m_inspectedFile);
     layout->addWidget(ItemViewFind::createSearchableWrapper(new IncludeFinder(m_treeView, &m_model)));
diff --git a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp
index 68fbbf8bc7f..1985203f47c 100644
--- a/src/plugins/cppeditor/cppinsertvirtualmethods.cpp
+++ b/src/plugins/cppeditor/cppinsertvirtualmethods.cpp
@@ -1011,7 +1011,7 @@ void InsertVirtualMethodsDialog::initGui()
 
     auto overrideWidgetsLayout = new QHBoxLayout(this);
     overrideWidgetsLayout->setSpacing(0);
-    overrideWidgetsLayout->setMargin(0);
+    overrideWidgetsLayout->setContentsMargins(0, 0, 0, 0);
     overrideWidgetsLayout->addWidget(m_overrideReplacementCheckBox);
     overrideWidgetsLayout->addWidget(m_overrideReplacementComboBox);
     overrideWidgetsLayout->addWidget(m_clearUserAddedReplacementsButton);
diff --git a/src/plugins/cppeditor/cppoutline.cpp b/src/plugins/cppeditor/cppoutline.cpp
index 55a2e93f194..137e73292a9 100644
--- a/src/plugins/cppeditor/cppoutline.cpp
+++ b/src/plugins/cppeditor/cppoutline.cpp
@@ -108,7 +108,7 @@ CppOutlineWidget::CppOutlineWidget(CppEditorWidget *editor) :
     m_proxyModel->setSourceModel(model);
 
     auto *layout = new QVBoxLayout;
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(Core::ItemViewFind::createSearchableWrapper(m_treeView));
     setLayout(layout);
diff --git a/src/plugins/cppeditor/cpptypehierarchy.cpp b/src/plugins/cppeditor/cpptypehierarchy.cpp
index 822ec44ff99..081a0c5e981 100644
--- a/src/plugins/cppeditor/cpptypehierarchy.cpp
+++ b/src/plugins/cppeditor/cpptypehierarchy.cpp
@@ -114,7 +114,7 @@ CppTypeHierarchyWidget::CppTypeHierarchyWidget()
 
     m_hierarchyWidget = new QWidget(this);
     auto layout = new QVBoxLayout;
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(m_inspectedClass);
     layout->addWidget(Core::ItemViewFind::createSearchableWrapper(m_treeView));
diff --git a/src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.cpp b/src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.cpp
index 7899fcae4cd..217ca95cb20 100644
--- a/src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.cpp
+++ b/src/plugins/cpptools/clangdiagnosticconfigsselectionwidget.cpp
@@ -45,7 +45,7 @@ ClangDiagnosticConfigsSelectionWidget::ClangDiagnosticConfigsSelectionWidget(QWi
     , m_selectionComboBox(new QComboBox(this))
 {
     auto *layout = new QHBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     setLayout(layout);
     layout->addWidget(m_label);
     layout->addWidget(m_selectionComboBox, 1);
@@ -108,7 +108,7 @@ void ClangDiagnosticConfigsSelectionWidget::connectToClangDiagnosticConfigsDialo
 {
     connect(button, &QPushButton::clicked, [this]() {
         ClangDiagnosticConfigsWidget *widget = new ClangDiagnosticConfigsWidget(currentConfigId());
-        widget->layout()->setMargin(0);
+        widget->layout()->setContentsMargins(0, 0, 0, 0);
         QDialog dialog;
         dialog.setWindowTitle(ClangDiagnosticConfigsWidget::tr("Diagnostic Configurations"));
         dialog.setLayout(new QVBoxLayout);
diff --git a/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp b/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
index 4c0ca8d9a53..0146af8336e 100644
--- a/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
+++ b/src/plugins/cpptools/cppcodestylepreferencesfactory.cpp
@@ -106,7 +106,7 @@ QWidget *CppCodeStylePreferencesFactory::createEditor(TextEditor::ICodeStylePref
     if (!cppPreferences)
         return nullptr;
     auto widget = new Internal::CppCodeStylePreferencesWidget(parent);
-    widget->layout()->setMargin(0);
+    widget->layout()->setContentsMargins(0, 0, 0, 0);
     widget->setCodeStyle(cppPreferences);
     return widget;
 }
diff --git a/src/plugins/cpptools/symbolsfindfilter.cpp b/src/plugins/cpptools/symbolsfindfilter.cpp
index 404a4209a6d..3cba0303529 100644
--- a/src/plugins/cpptools/symbolsfindfilter.cpp
+++ b/src/plugins/cpptools/symbolsfindfilter.cpp
@@ -263,7 +263,7 @@ SymbolsFindFilterConfigWidget::SymbolsFindFilterConfigWidget(SymbolsFindFilter *
 
     auto layout = new QGridLayout(this);
     setLayout(layout);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
 
     auto typeLabel = new QLabel(tr("Types:"));
     layout->addWidget(typeLabel, 0, 0);
diff --git a/src/plugins/debugger/cdb/cdboptionspage.cpp b/src/plugins/debugger/cdb/cdboptionspage.cpp
index cf00c70c8a2..868e554d78d 100644
--- a/src/plugins/debugger/cdb/cdboptionspage.cpp
+++ b/src/plugins/debugger/cdb/cdboptionspage.cpp
@@ -78,7 +78,7 @@ CdbBreakEventWidget::CdbBreakEventWidget(QWidget *parent) : QWidget(parent)
     // 1 column with checkboxes only,
     // further columns with checkbox + parameter
     auto mainLayout = new QHBoxLayout;
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     auto leftLayout = new QVBoxLayout;
     QFormLayout *parameterLayout = nullptr;
     mainLayout->addLayout(leftLayout);
@@ -163,8 +163,9 @@ CdbOptionsPageWidget::CdbOptionsPageWidget(QWidget *parent)
     // accommodate all options. This page only shows on
     // Windows, which has large margins by default.
 
-    const int margin = layout()->margin();
-    const QMargins margins(margin, margin / 3, margin, margin / 3);
+    int left, top, right, bottom;
+    layout()->getContentsMargins(&left, &top, &right, &bottom);
+    const QMargins margins(left, top / 3, right, bottom / 3);
 
     m_ui.startupFormLayout->setContentsMargins(margins);
 
diff --git a/src/plugins/debugger/console/console.cpp b/src/plugins/debugger/console/console.cpp
index c7fe001c746..0fb3ec1940d 100644
--- a/src/plugins/debugger/console/console.cpp
+++ b/src/plugins/debugger/console/console.cpp
@@ -64,7 +64,7 @@ Console::Console()
     m_consoleWidget->setEnabled(true);
 
     auto vbox = new QVBoxLayout(m_consoleWidget);
-    vbox->setMargin(0);
+    vbox->setContentsMargins(0, 0, 0, 0);
     vbox->setSpacing(0);
 
     m_consoleView = new ConsoleView(m_consoleItemModel, m_consoleWidget);
diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp
index fc6e74b866e..44c828122cd 100644
--- a/src/plugins/debugger/debuggermainwindow.cpp
+++ b/src/plugins/debugger/debuggermainwindow.cpp
@@ -202,18 +202,18 @@ DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *parent)
     // "Engine switcher" style comboboxes
     auto subPerspectiveSwitcher = new QWidget;
     m_subPerspectiveSwitcherLayout = new QHBoxLayout(subPerspectiveSwitcher);
-    m_subPerspectiveSwitcherLayout->setMargin(0);
+    m_subPerspectiveSwitcherLayout->setContentsMargins(0, 0, 0, 0);
     m_subPerspectiveSwitcherLayout->setSpacing(0);
 
     // All perspective toolbars will get inserted here, but only
     // the current perspective's toolbar is set visible.
     auto innerTools = new QWidget;
     m_innerToolsLayout = new QHBoxLayout(innerTools);
-    m_innerToolsLayout->setMargin(0);
+    m_innerToolsLayout->setContentsMargins(0, 0, 0, 0);
     m_innerToolsLayout->setSpacing(0);
 
     auto hbox = new QHBoxLayout(toolbar);
-    hbox->setMargin(0);
+    hbox->setContentsMargins(0, 0, 0, 0);
     hbox->setSpacing(0);
     hbox->addWidget(m_perspectiveChooser);
     hbox->addWidget(subPerspectiveSwitcher);
@@ -727,7 +727,7 @@ Perspective::Perspective(const QString &id, const QString &name,
     theMainWindow->d->m_innerToolsLayout->addWidget(d->m_innerToolBar);
 
     d->m_innerToolBarLayout = new QHBoxLayout(d->m_innerToolBar);
-    d->m_innerToolBarLayout->setMargin(0);
+    d->m_innerToolBarLayout->setContentsMargins(0, 0, 0, 0);
     d->m_innerToolBarLayout->setSpacing(0);
 }
 
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index ec7f47f6b70..a3d622a6a34 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -482,7 +482,7 @@ public:
         DebuggerMainWindow *mainWindow = DebuggerMainWindow::instance();
 
         auto editorHolderLayout = new QVBoxLayout;
-        editorHolderLayout->setMargin(0);
+        editorHolderLayout->setContentsMargins(0, 0, 0, 0);
         editorHolderLayout->setSpacing(0);
 
         auto editorAndFindWidget = new QWidget;
@@ -499,7 +499,7 @@ public:
         auto centralEditorWidget = new QWidget;
         auto centralLayout = new QVBoxLayout(centralEditorWidget);
         centralEditorWidget->setLayout(centralLayout);
-        centralLayout->setMargin(0);
+        centralLayout->setContentsMargins(0, 0, 0, 0);
         centralLayout->setSpacing(0);
         centralLayout->addWidget(documentAndRightPane);
         centralLayout->setStretch(0, 1);
diff --git a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
index 161c755d101..baae994a13f 100644
--- a/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
+++ b/src/plugins/debugger/debuggerrunconfigurationaspect.cpp
@@ -127,7 +127,7 @@ DebuggerRunConfigWidget::DebuggerRunConfigWidget(DebuggerRunConfigurationAspect
             this, &DebuggerRunConfigWidget::useMultiProcessToggled);
 
     auto qmlLayout = new QHBoxLayout;
-    qmlLayout->setMargin(0);
+    qmlLayout->setContentsMargins(0, 0, 0, 0);
     qmlLayout->addWidget(m_useQmlDebugger);
     qmlLayout->addWidget(m_debugServerPortLabel);
     qmlLayout->addWidget(m_debugServerPort);
@@ -135,7 +135,7 @@ DebuggerRunConfigWidget::DebuggerRunConfigWidget(DebuggerRunConfigurationAspect
     qmlLayout->addStretch();
 
     auto layout = new QVBoxLayout;
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_useCppDebugger);
     layout->addLayout(qmlLayout);
     layout->addWidget(m_useMultiProcess);
diff --git a/src/plugins/debugger/localsandexpressionswindow.cpp b/src/plugins/debugger/localsandexpressionswindow.cpp
index 6aef8c44818..0c6ab3d5b8f 100644
--- a/src/plugins/debugger/localsandexpressionswindow.cpp
+++ b/src/plugins/debugger/localsandexpressionswindow.cpp
@@ -39,7 +39,7 @@ LocalsAndInspectorWindow::LocalsAndInspectorWindow(QWidget *locals,
       QWidget *inspector, QWidget *returnWidget)
 {
     auto layout = new QVBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
 
     auto splitter = new Core::MiniSplitter(Qt::Vertical);
diff --git a/src/plugins/debugger/logwindow.cpp b/src/plugins/debugger/logwindow.cpp
index e6717091615..dd9530744b0 100644
--- a/src/plugins/debugger/logwindow.cpp
+++ b/src/plugins/debugger/logwindow.cpp
@@ -423,13 +423,13 @@ LogWindow::LogWindow(DebuggerEngine *engine)
     commandBox->addWidget(repeatButton);
     commandBox->addWidget(new QLabel(tr("Command:"), this));
     commandBox->addWidget(m_commandEdit);
-    commandBox->setMargin(2);
+    commandBox->setContentsMargins(2, 2, 2, 2);
     commandBox->setSpacing(6);
 
     auto leftBox = new QVBoxLayout;
     leftBox->addWidget(m_inputText);
     leftBox->addItem(commandBox);
-    leftBox->setMargin(0);
+    leftBox->setContentsMargins(0, 0, 0, 0);
     leftBox->setSpacing(0);
 
     auto leftDummy = new QWidget;
@@ -441,7 +441,7 @@ LogWindow::LogWindow(DebuggerEngine *engine)
     m_splitter->setStretchFactor(1, 3);
 
     auto layout = new QVBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(m_splitter);
     layout->addWidget(new Core::FindToolBarPlaceHolder(this));
@@ -678,7 +678,7 @@ GlobalLogWindow::GlobalLogWindow()
     m_splitter->setStretchFactor(1, 3);
 
     auto layout = new QVBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(m_splitter);
     layout->addWidget(new Core::FindToolBarPlaceHolder(this));
diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp
index c210bdd9e48..36db2e05ba8 100644
--- a/src/plugins/designer/formeditorw.cpp
+++ b/src/plugins/designer/formeditorw.cpp
@@ -410,7 +410,7 @@ void FormEditorData::fullInit()
     m_modeWidget = new QWidget;
     m_modeWidget->setObjectName("DesignerModeWidget");
     QVBoxLayout *layout = new QVBoxLayout;
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(m_toolBar);
     // Avoid mode switch to 'Edit' mode when the application started by
diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
index c63d9695193..a2799e7ca06 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
@@ -727,7 +727,7 @@ SideBySideDiffEditorWidget::SideBySideDiffEditorWidget(QWidget *parent)
     m_splitter->addWidget(m_leftEditor);
     m_splitter->addWidget(m_rightEditor);
     QVBoxLayout *l = new QVBoxLayout(this);
-    l->setMargin(0);
+    l->setContentsMargins(0, 0, 0, 0);
     l->addWidget(m_splitter);
     setFocusProxy(m_leftEditor);
 
diff --git a/src/plugins/git/gerrit/gerritremotechooser.cpp b/src/plugins/git/gerrit/gerritremotechooser.cpp
index 9d0c465ded9..8e5e7cd8828 100644
--- a/src/plugins/git/gerrit/gerritremotechooser.cpp
+++ b/src/plugins/git/gerrit/gerritremotechooser.cpp
@@ -51,7 +51,7 @@ GerritRemoteChooser::GerritRemoteChooser(QWidget *parent) :
     m_remoteComboBox->setMinimumSize(QSize(40, 0));
 
     horizontalLayout->addWidget(m_remoteComboBox);
-    horizontalLayout->setMargin(0);
+    horizontalLayout->setContentsMargins(0, 0, 0, 0);
 
     m_resetRemoteButton = new QToolButton(this);
     m_resetRemoteButton->setToolTip(tr("Refresh Remote Servers"));
diff --git a/src/plugins/git/gitgrep.cpp b/src/plugins/git/gitgrep.cpp
index f276a5e7257..056903f855e 100644
--- a/src/plugins/git/gitgrep.cpp
+++ b/src/plugins/git/gitgrep.cpp
@@ -240,7 +240,7 @@ GitGrep::GitGrep(QObject *parent)
 {
     m_widget = new QWidget;
     auto layout = new QHBoxLayout(m_widget);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     m_treeLineEdit = new FancyLineEdit;
     m_treeLineEdit->setPlaceholderText(tr("Tree (optional)"));
     m_treeLineEdit->setToolTip(tr("Can be HEAD, tag, local or remote branch, or a commit hash.\n"
diff --git a/src/plugins/help/helpwidget.cpp b/src/plugins/help/helpwidget.cpp
index 689570edef0..90363debec8 100644
--- a/src/plugins/help/helpwidget.cpp
+++ b/src/plugins/help/helpwidget.cpp
@@ -84,12 +84,12 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
     m_viewerStack = new QStackedWidget;
 
     auto topLayout = new QVBoxLayout;
-    topLayout->setMargin(0);
+    topLayout->setContentsMargins(0, 0, 0, 0);
     topLayout->setSpacing(0);
     setLayout(topLayout);
 
     auto hLayout = new QHBoxLayout;
-    hLayout->setMargin(0);
+    hLayout->setContentsMargins(0, 0, 0, 0);
     hLayout->setSpacing(0);
     topLayout->addLayout(hLayout, 10);
 
@@ -100,12 +100,12 @@ HelpWidget::HelpWidget(const Core::Context &context, WidgetStyle style, QWidget
     auto toolBar = new Utils::StyledBar();
     auto layout = new QHBoxLayout(toolBar);
     layout->setSpacing(0);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
 
     auto rightSide = new QWidget(this);
     m_sideBarSplitter->insertWidget(1, rightSide);
     auto vLayout = new QVBoxLayout(rightSide);
-    vLayout->setMargin(0);
+    vLayout->setContentsMargins(0, 0, 0, 0);
     vLayout->setSpacing(0);
     vLayout->addWidget(toolBar);
     vLayout->addWidget(m_viewerStack);
diff --git a/src/plugins/help/openpagesswitcher.cpp b/src/plugins/help/openpagesswitcher.cpp
index 091239c14f4..c8fe4906674 100644
--- a/src/plugins/help/openpagesswitcher.cpp
+++ b/src/plugins/help/openpagesswitcher.cpp
@@ -59,7 +59,7 @@ OpenPagesSwitcher::OpenPagesSwitcher(OpenPagesModel *model)
     m_openPagesWidget->installEventFilter(this);
 
     auto layout = new QVBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_openPagesWidget);
 
     connect(m_openPagesWidget, &OpenPagesWidget::closePage,
diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp
index fe03f6e0e68..4d893e15d21 100644
--- a/src/plugins/help/searchwidget.cpp
+++ b/src/plugins/help/searchwidget.cpp
@@ -99,7 +99,7 @@ void SearchWidget::showEvent(QShowEvent *event)
 {
     if (!event->spontaneous() && !searchEngine) {
         auto vLayout = new QVBoxLayout(this);
-        vLayout->setMargin(0);
+        vLayout->setContentsMargins(0, 0, 0, 0);
         vLayout->setSpacing(0);
 
         searchEngine = new QHelpSearchEngine(&LocalHelpManager::helpEngine(), this);
@@ -109,7 +109,7 @@ void SearchWidget::showEvent(QShowEvent *event)
         m_queryWidget = searchEngine->queryWidget();
         QLayout *tbLayout = new QVBoxLayout();
         tbLayout->setSpacing(6);
-        tbLayout->setMargin(4);
+        tbLayout->setContentsMargins(4, 4, 4, 4);
         tbLayout->addWidget(m_queryWidget);
         m_indexingDocumentationLabel = new QLabel(tr("Indexing Documentation"), toolbar);
         m_indexingDocumentationLabel->hide();
@@ -120,7 +120,7 @@ void SearchWidget::showEvent(QShowEvent *event)
         toolbar2->setSingleRow(false);
         tbLayout = new QVBoxLayout();
         tbLayout->setSpacing(0);
-        tbLayout->setMargin(0);
+        tbLayout->setContentsMargins(0, 0, 0, 0);
         tbLayout->addWidget(resultWidget = searchEngine->resultWidget());
         toolbar2->setLayout(tbLayout);
 
diff --git a/src/plugins/ios/iosbuildconfiguration.cpp b/src/plugins/ios/iosbuildconfiguration.cpp
index 0ef0002071c..4a37779ca31 100644
--- a/src/plugins/ios/iosbuildconfiguration.cpp
+++ b/src/plugins/ios/iosbuildconfiguration.cpp
@@ -184,7 +184,7 @@ IosBuildSettingsWidget::IosBuildSettingsWidget(IosBuildConfiguration *bc)
     adjustSize();
 
     auto rootLayout = new QVBoxLayout(this);
-    rootLayout->setMargin(0);
+    rootLayout->setContentsMargins(0, 0, 0, 0);
     rootLayout->addWidget(detailsWidget);
 
     auto gridLayout = new QGridLayout();
diff --git a/src/plugins/languageclient/languageclientoutline.cpp b/src/plugins/languageclient/languageclientoutline.cpp
index 8a15a9e0b80..0f86e019a2d 100644
--- a/src/plugins/languageclient/languageclientoutline.cpp
+++ b/src/plugins/languageclient/languageclientoutline.cpp
@@ -148,7 +148,7 @@ LanguageClientOutlineWidget::LanguageClientOutlineWidget(Client *client,
     client->documentSymbolCache()->requestSymbols(m_uri);
 
     auto *layout = new QVBoxLayout;
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(Core::ItemViewFind::createSearchableWrapper(&m_view));
     setLayout(layout);
diff --git a/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp b/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
index 299c6d13e58..d7b7eac6c19 100644
--- a/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
+++ b/src/plugins/nim/settings/nimcodestylepreferencesfactory.cpp
@@ -63,7 +63,7 @@ QWidget *NimCodeStylePreferencesFactory::createEditor(TextEditor::ICodeStylePref
                                                       QWidget *parent) const
 {
     auto result = new NimCodeStylePreferencesWidget(preferences, parent);
-    result->layout()->setMargin(0);
+    result->layout()->setContentsMargins(0, 0, 0, 0);
     return result;
 }
 
diff --git a/src/plugins/projectexplorer/abiwidget.cpp b/src/plugins/projectexplorer/abiwidget.cpp
index 5df9a3ee059..8171ec03d55 100644
--- a/src/plugins/projectexplorer/abiwidget.cpp
+++ b/src/plugins/projectexplorer/abiwidget.cpp
@@ -78,7 +78,7 @@ AbiWidget::AbiWidget(QWidget *parent) : QWidget(parent),
     d(std::make_unique<Internal::AbiWidgetPrivate>())
 {
     auto *layout = new QHBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(2);
 
     d->m_abi = new QComboBox(this);
diff --git a/src/plugins/projectexplorer/allprojectsfind.cpp b/src/plugins/projectexplorer/allprojectsfind.cpp
index feb80bad050..28ed75fe5fa 100644
--- a/src/plugins/projectexplorer/allprojectsfind.cpp
+++ b/src/plugins/projectexplorer/allprojectsfind.cpp
@@ -128,7 +128,7 @@ QWidget *AllProjectsFind::createConfigWidget()
     if (!m_configWidget) {
         m_configWidget = new QWidget;
         auto gridLayout = new QGridLayout(m_configWidget);
-        gridLayout->setMargin(0);
+        gridLayout->setContentsMargins(0, 0, 0, 0);
         m_configWidget->setLayout(gridLayout);
         const QList<QPair<QWidget *, QWidget *>> patternWidgets = createPatternWidgets();
         int row = 0;
diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp
index f04f4e09db4..d9f2f06fc82 100644
--- a/src/plugins/projectexplorer/appoutputpane.cpp
+++ b/src/plugins/projectexplorer/appoutputpane.cpp
@@ -230,7 +230,7 @@ AppOutputPane::AppOutputPane() :
     // Spacer (?)
 
     auto *layout = new QVBoxLayout;
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     m_tabWidget->setDocumentMode(true);
     m_tabWidget->setTabsClosable(true);
     m_tabWidget->setMovable(true);
diff --git a/src/plugins/projectexplorer/buildconfiguration.cpp b/src/plugins/projectexplorer/buildconfiguration.cpp
index e53728b5a1c..ccf333aa214 100644
--- a/src/plugins/projectexplorer/buildconfiguration.cpp
+++ b/src/plugins/projectexplorer/buildconfiguration.cpp
@@ -151,14 +151,14 @@ NamedWidget *BuildConfiguration::createConfigWidget()
         container->setWidget(widget);
 
         auto vbox = new QVBoxLayout(named);
-        vbox->setMargin(0);
+        vbox->setContentsMargins(0, 0, 0, 0);
         vbox->addWidget(container);
     } else {
         widget = named;
     }
 
     auto formLayout = new QFormLayout(widget);
-    formLayout->setMargin(0);
+    formLayout->setContentsMargins(0, 0, 0, 0);
     formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
 
     for (ProjectConfigurationAspect *aspect : aspects()) {
diff --git a/src/plugins/projectexplorer/buildenvironmentwidget.cpp b/src/plugins/projectexplorer/buildenvironmentwidget.cpp
index 047412fbf35..4995d1bc505 100644
--- a/src/plugins/projectexplorer/buildenvironmentwidget.cpp
+++ b/src/plugins/projectexplorer/buildenvironmentwidget.cpp
@@ -39,7 +39,7 @@ BuildEnvironmentWidget::BuildEnvironmentWidget(BuildConfiguration *bc) :
     m_buildConfiguration(nullptr)
 {
     auto vbox = new QVBoxLayout(this);
-    vbox->setMargin(0);
+    vbox->setContentsMargins(0, 0, 0, 0);
     m_clearSystemEnvironmentCheckBox = new QCheckBox(this);
     m_clearSystemEnvironmentCheckBox->setText(tr("Clear system environment"));
 
diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp
index 3067b8c800a..38968fe5146 100644
--- a/src/plugins/projectexplorer/buildstep.cpp
+++ b/src/plugins/projectexplorer/buildstep.cpp
@@ -150,7 +150,7 @@ BuildStepConfigWidget *BuildStep::createConfigWidget()
     auto widget = new BuildStepConfigWidget(this);
 
     auto formLayout = new QFormLayout(widget);
-    formLayout->setMargin(0);
+    formLayout->setContentsMargins(0, 0, 0, 0);
     formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
 
     for (ProjectConfigurationAspect *aspect : m_aspects) {
diff --git a/src/plugins/projectexplorer/buildstepspage.cpp b/src/plugins/projectexplorer/buildstepspage.cpp
index 7942bceae01..de40258b116 100644
--- a/src/plugins/projectexplorer/buildstepspage.cpp
+++ b/src/plugins/projectexplorer/buildstepspage.cpp
@@ -53,7 +53,7 @@ using namespace Utils;
 ToolWidget::ToolWidget(QWidget *parent) : FadingPanel(parent)
 {
     auto layout = new QHBoxLayout;
-    layout->setMargin(4);
+    layout->setContentsMargins(4, 4, 4, 4);
     layout->setSpacing(4);
     setLayout(layout);
     m_firstWidget = new FadingWidget(this);
@@ -75,7 +75,7 @@ ToolWidget::ToolWidget(QWidget *parent) : FadingPanel(parent)
     m_secondWidget = new FadingWidget(this);
     m_secondWidget->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
     hbox = new QHBoxLayout();
-    hbox->setMargin(0);
+    hbox->setContentsMargins(0, 0, 0, 0);
     hbox->setSpacing(4);
     m_secondWidget->setLayout(hbox);
 
diff --git a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
index c96eed5e105..2f5e4463b7f 100644
--- a/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
+++ b/src/plugins/projectexplorer/customexecutablerunconfiguration.cpp
@@ -101,7 +101,7 @@ CustomExecutableDialog::CustomExecutableDialog(RunConfiguration *rc)
 
     auto layout = new QFormLayout;
     layout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
 
     auto detailsContainer = new DetailsWidget(this);
     detailsContainer->setState(DetailsWidget::NoSummary);
diff --git a/src/plugins/projectexplorer/environmentaspectwidget.cpp b/src/plugins/projectexplorer/environmentaspectwidget.cpp
index db341ab609a..b50c8619723 100644
--- a/src/plugins/projectexplorer/environmentaspectwidget.cpp
+++ b/src/plugins/projectexplorer/environmentaspectwidget.cpp
@@ -49,11 +49,11 @@ EnvironmentAspectWidget::EnvironmentAspectWidget(EnvironmentAspect *aspect, QWid
 
     setContentsMargins(0, 0, 0, 0);
     auto topLayout = new QVBoxLayout(this);
-    topLayout->setMargin(0);
+    topLayout->setContentsMargins(0, 0, 0, 0);
 
     auto baseEnvironmentWidget = new QWidget;
     auto baseLayout = new QHBoxLayout(baseEnvironmentWidget);
-    baseLayout->setMargin(0);
+    baseLayout->setContentsMargins(0, 0, 0, 0);
     auto label = new QLabel(tr("Base environment for this run configuration:"), this);
     baseLayout->addWidget(label);
 
diff --git a/src/plugins/projectexplorer/environmentwidget.cpp b/src/plugins/projectexplorer/environmentwidget.cpp
index c517bbd9963..04d68dd42da 100644
--- a/src/plugins/projectexplorer/environmentwidget.cpp
+++ b/src/plugins/projectexplorer/environmentwidget.cpp
@@ -123,13 +123,13 @@ EnvironmentWidget::EnvironmentWidget(QWidget *parent, Type type, QWidget *additi
     details->setVisible(false);
 
     auto vbox2 = new QVBoxLayout(details);
-    vbox2->setMargin(0);
+    vbox2->setContentsMargins(0, 0, 0, 0);
 
     if (additionalDetailsWidget)
         vbox2->addWidget(additionalDetailsWidget);
 
     auto horizontalLayout = new QHBoxLayout();
-    horizontalLayout->setMargin(0);
+    horizontalLayout->setContentsMargins(0, 0, 0, 0);
     auto tree = new Utils::TreeView(this);
     connect(tree, &QAbstractItemView::activated,
             tree, [tree](const QModelIndex &idx) { tree->edit(idx); });
diff --git a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
index f709d58c72c..fd7584ea21b 100644
--- a/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
+++ b/src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
@@ -95,7 +95,7 @@ KitManagerConfigWidget::KitManagerConfigWidget(Kit *k) :
     inner->setLayout(m_layout);
 
     auto mainLayout = new QGridLayout(this);
-    mainLayout->setMargin(1);
+    mainLayout->setContentsMargins(1, 1, 1, 1);
     mainLayout->addWidget(inner, 0, 0);
 
     label = createLabel(tr("Name:"), tr("Kit name and icon."));
diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
index c609dc8e625..372712f8bc9 100644
--- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp
+++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp
@@ -612,7 +612,7 @@ QListWidgetItem *GenericListWidget::itemForProjectConfiguration(QObject *pc)
 KitAreaWidget::KitAreaWidget(QWidget *parent) : QWidget(parent),
     m_layout(new QGridLayout(this))
 {
-    m_layout->setMargin(3);
+    m_layout->setContentsMargins(3, 3, 3, 3);
     setAutoFillBackground(true);
     connect(KitManager::instance(), &KitManager::kitUpdated, this, &KitAreaWidget::updateKit);
 }
diff --git a/src/plugins/projectexplorer/panelswidget.cpp b/src/plugins/projectexplorer/panelswidget.cpp
index 6e6e1f01774..77e4cb204a9 100644
--- a/src/plugins/projectexplorer/panelswidget.cpp
+++ b/src/plugins/projectexplorer/panelswidget.cpp
@@ -128,7 +128,7 @@ PanelsWidget::PanelsWidget(QWidget *parent) :
 
     // The layout holding the individual panels:
     auto topLayout = new QVBoxLayout(m_root);
-    topLayout->setMargin(0);
+    topLayout->setContentsMargins(0, 0, 0, 0);
     topLayout->setSpacing(0);
 
     m_layout = new QGridLayout;
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp
index 2aa005ad4fa..0830211946f 100644
--- a/src/plugins/projectexplorer/runconfiguration.cpp
+++ b/src/plugins/projectexplorer/runconfiguration.cpp
@@ -252,7 +252,7 @@ QWidget *RunConfiguration::createConfigurationWidget()
 {
     auto widget = new QWidget;
     auto formLayout = new QFormLayout(widget);
-    formLayout->setMargin(0);
+    formLayout->setContentsMargins(0, 0, 0, 0);
     formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow);
 
     for (ProjectConfigurationAspect *aspect : m_aspects) {
diff --git a/src/plugins/projectexplorer/runsettingspropertiespage.cpp b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
index b740a6b9af0..8a934874a76 100644
--- a/src/plugins/projectexplorer/runsettingspropertiespage.cpp
+++ b/src/plugins/projectexplorer/runsettingspropertiespage.cpp
@@ -121,7 +121,7 @@ RunSettingsWidget::RunSettingsWidget(Target *target) :
     // deploy part
     deployWidget->setContentsMargins(0, 10, 0, 25);
     m_deployLayout = new QVBoxLayout(deployWidget);
-    m_deployLayout->setMargin(0);
+    m_deployLayout->setContentsMargins(0, 0, 0, 0);
     m_deployLayout->setSpacing(5);
 
     m_deployConfigurationCombo->setModel(m_target->deployConfigurationModel());
@@ -153,7 +153,7 @@ RunSettingsWidget::RunSettingsWidget(Target *target) :
     // run part
     runWidget->setContentsMargins(0, 10, 0, 25);
     m_runLayout = new QVBoxLayout(runWidget);
-    m_runLayout->setMargin(0);
+    m_runLayout->setContentsMargins(0, 0, 0, 0);
     m_runLayout->setSpacing(5);
 
     m_disabledIcon = new QLabel;
diff --git a/src/plugins/projectexplorer/selectablefilesmodel.cpp b/src/plugins/projectexplorer/selectablefilesmodel.cpp
index cfb99c4b681..6ef592598e5 100644
--- a/src/plugins/projectexplorer/selectablefilesmodel.cpp
+++ b/src/plugins/projectexplorer/selectablefilesmodel.cpp
@@ -550,7 +550,7 @@ SelectableFilesWidget::SelectableFilesWidget(QWidget *parent) :
                                              QLatin1String(HIDE_FILE_FILTER_DEFAULT)).toString();
 
     auto layout = new QGridLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
 
     m_baseDirLabel->setText(tr("Source directory:"));
     m_baseDirChooser->setHistoryCompleter(QLatin1String("PE.AddToProjectDir.History"));
diff --git a/src/plugins/projectexplorer/targetsettingspanel.cpp b/src/plugins/projectexplorer/targetsettingspanel.cpp
index 3377c12ee03..6774cb73e34 100644
--- a/src/plugins/projectexplorer/targetsettingspanel.cpp
+++ b/src/plugins/projectexplorer/targetsettingspanel.cpp
@@ -151,7 +151,7 @@ TargetSetupPageWrapper::TargetSetupPageWrapper(Project *project)
     hbox->addWidget(box);
 
     auto layout = new QVBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     m_setupPageContainer = new QVBoxLayout;
     layout->addLayout(m_setupPageContainer);
     layout->addLayout(hbox);
@@ -268,7 +268,7 @@ void TargetGroupItemPrivate::ensureWidget()
         label->setAlignment(Qt::AlignTop);
 
         auto layout = new QVBoxLayout(m_noKitLabel);
-        layout->setMargin(0);
+        layout->setContentsMargins(0, 0, 0, 0);
         layout->setSpacing(0);
         layout->addWidget(label);
         layout->addStretch(10);
@@ -287,7 +287,7 @@ void TargetGroupItemPrivate::ensureWidget()
         auto widget = new QWidget;
         auto label = new QLabel("This project is already configured.");
         auto layout = new QVBoxLayout(widget);
-        layout->setMargin(0);
+        layout->setContentsMargins(0, 0, 0, 0);
         layout->addWidget(label);
         layout->addStretch(10);
         m_configuredPage = new PanelsWidget(tr("Configure Project"),
diff --git a/src/plugins/projectexplorer/targetsetuppage.cpp b/src/plugins/projectexplorer/targetsetuppage.cpp
index 0f3d9944fa7..7f45cf69b71 100644
--- a/src/plugins/projectexplorer/targetsetuppage.cpp
+++ b/src/plugins/projectexplorer/targetsetuppage.cpp
@@ -195,7 +195,7 @@ TargetSetupPage::TargetSetupPage(QWidget *parent) :
     m_ui->scrollArea->setWidget(centralWidget);
     centralWidget->setLayout(new QVBoxLayout);
     m_ui->centralWidget->setLayout(new QVBoxLayout);
-    m_ui->centralWidget->layout()->setMargin(0);
+    m_ui->centralWidget->layout()->setContentsMargins(0, 0, 0, 0);
 
     setTitle(tr("Kit Selection"));
 
diff --git a/src/plugins/projectexplorer/targetsetupwidget.cpp b/src/plugins/projectexplorer/targetsetupwidget.cpp
index e6cbff14604..12a16d31c12 100644
--- a/src/plugins/projectexplorer/targetsetupwidget.cpp
+++ b/src/plugins/projectexplorer/targetsetupwidget.cpp
@@ -84,7 +84,7 @@ TargetSetupWidget::TargetSetupWidget(Kit *k, const FilePath &projectPath) :
 
     auto w = new QWidget;
     m_newBuildsLayout = new QGridLayout;
-    m_newBuildsLayout->setMargin(0);
+    m_newBuildsLayout->setContentsMargins(0, 0, 0, 0);
     if (Utils::HostOsInfo::isMacHost())
         m_newBuildsLayout->setSpacing(0);
     w->setLayout(m_newBuildsLayout);
diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp
index 419248c8edd..962fd13b312 100644
--- a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp
@@ -69,7 +69,7 @@ QmakeProjectConfigWidget::QmakeProjectConfigWidget(QmakeBuildConfiguration *bc)
     m_detailsContainer->setState(Utils::DetailsWidget::NoSummary);
 
     auto vbox = new QVBoxLayout(this);
-    vbox->setMargin(0);
+    vbox->setContentsMargins(0, 0, 0, 0);
     vbox->addWidget(m_detailsContainer);
 
     auto details = new QWidget(m_detailsContainer);
diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
index 37e1fdfd539..b9282a3326b 100644
--- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
@@ -1070,10 +1070,10 @@ DesignerActionToolBar::DesignerActionToolBar(QWidget *parentWidget) : Utils::Sty
 
     auto horizontalLayout = new QHBoxLayout(this);
 
-    horizontalLayout->setMargin(0);
+    horizontalLayout->setContentsMargins(0, 0, 0, 0);
     horizontalLayout->setSpacing(0);
 
-    horizontalLayout->setMargin(0);
+    horizontalLayout->setContentsMargins(0, 0, 0, 0);
     horizontalLayout->setSpacing(0);
 
     horizontalLayout->addWidget(m_toolBar);
diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
index b42bf35e624..d7e17d35f7d 100644
--- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp
@@ -61,7 +61,7 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) :
     setStyleSheet(Theme::replaceCssColors(QString::fromUtf8(Utils::FileReader::fetchQrc(QLatin1String(":/qmldesigner/formeditorstylesheet.css")))));
 
     auto fillLayout = new QVBoxLayout(this);
-    fillLayout->setMargin(0);
+    fillLayout->setContentsMargins(0, 0, 0, 0);
     fillLayout->setSpacing(0);
     setLayout(fillLayout);
 
diff --git a/src/plugins/qmldesigner/components/formeditor/toolbox.cpp b/src/plugins/qmldesigner/components/formeditor/toolbox.cpp
index 3c641397484..c72db4c37c2 100644
--- a/src/plugins/qmldesigner/components/formeditor/toolbox.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/toolbox.cpp
@@ -43,7 +43,7 @@ ToolBox::ToolBox(QWidget *parentWidget)
     m_leftToolBar->setOrientation(Qt::Horizontal);
 
     auto horizontalLayout = new QHBoxLayout(this);
-    horizontalLayout->setMargin(0);
+    horizontalLayout->setContentsMargins(0, 0, 0, 0);
     horizontalLayout->setSpacing(0);
 
     auto stretchToolbar = new QToolBar(this);
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index 8dd1c0727ed..b37bbdfa365 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -129,7 +129,7 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
     QWidget *lineEditFrame = new QWidget(this);
     lineEditFrame->setObjectName(QStringLiteral("itemLibrarySearchInputFrame"));
     auto lineEditLayout = new QGridLayout(lineEditFrame);
-    lineEditLayout->setMargin(2);
+    lineEditLayout->setContentsMargins(2, 2, 2, 2);
     lineEditLayout->setSpacing(0);
     lineEditLayout->addItem(new QSpacerItem(5, 3, QSizePolicy::Fixed, QSizePolicy::Fixed), 0, 0, 1, 3);
     lineEditLayout->addItem(new QSpacerItem(5, 5, QSizePolicy::Fixed, QSizePolicy::Fixed), 1, 0);
@@ -167,11 +167,11 @@ ItemLibraryWidget::ItemLibraryWidget(QWidget *parent) :
     connect(&m_compressionTimer, &QTimer::timeout, this, &ItemLibraryWidget::updateModel);
 
     auto flowLayout = new Utils::FlowLayout(m_importTagsWidget.data());
-    flowLayout->setMargin(4);
+    flowLayout->setContentsMargins(4, 4, 4, 4);
 
     m_addResourcesWidget->setVisible(false);
     flowLayout = new Utils::FlowLayout(m_addResourcesWidget.data());
-    flowLayout->setMargin(4);
+    flowLayout->setContentsMargins(4, 4, 4, 4);
     auto button = new QToolButton(m_addResourcesWidget.data());
     auto font = button->font();
     font.setPixelSize(Theme::instance()->smallFontPixelSize());
diff --git a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
index 0fbdc044153..12103b048ba 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatorwidget.cpp
@@ -59,7 +59,7 @@ NavigatorWidget::NavigatorWidget(NavigatorView *view)
 
     auto layout = new QVBoxLayout;
     layout->setSpacing(0);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
 
     auto tabBar = new QTabBar(this);
     tabBar->addTab(tr("Navigator"));
diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp
index 96013e242b6..bf6705fbeef 100644
--- a/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp
+++ b/src/plugins/qmldesigner/components/timelineeditor/timelinesectionitem.cpp
@@ -546,10 +546,10 @@ TimelineRulerSectionItem *TimelineRulerSectionItem::create(QGraphicsScene *paren
 
     auto layout = new QHBoxLayout(widget);
     layout->addWidget(toolBar);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
 
     layout->addWidget(toolBar);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
 
     QGraphicsProxyWidget *proxy = parentScene->addWidget(widget);
     proxy->setParentItem(item);
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp
index f171c89c0f1..759789d7ce2 100644
--- a/src/plugins/qmldesigner/designmodewidget.cpp
+++ b/src/plugins/qmldesigner/designmodewidget.cpp
@@ -376,7 +376,7 @@ void DesignModeWidget::setup()
     m_mainSplitter->setSizes({150, 300, 150});
 
     QLayout *mainLayout = new QBoxLayout(QBoxLayout::RightToLeft, this);
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->setSpacing(0);
     mainLayout->addWidget(m_mainSplitter);
 
@@ -514,7 +514,7 @@ QWidget *DesignModeWidget::createCenterWidget()
     QWidget *centerWidget = new QWidget;
 
     auto horizontalLayout = new QVBoxLayout(centerWidget);
-    horizontalLayout->setMargin(0);
+    horizontalLayout->setContentsMargins(0, 0, 0, 0);
     horizontalLayout->setSpacing(0);
 
     horizontalLayout->addWidget(m_toolBar);
@@ -537,7 +537,7 @@ QWidget *DesignModeWidget::createCrumbleBarFrame()
     auto frame = new Utils::StyledBar(this);
     frame->setSingleRow(false);
     auto layout = new QHBoxLayout(frame);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(m_crumbleBar->crumblePath());
 
diff --git a/src/plugins/qmldesigner/documentwarningwidget.cpp b/src/plugins/qmldesigner/documentwarningwidget.cpp
index bab42723957..08a2a129a9e 100644
--- a/src/plugins/qmldesigner/documentwarningwidget.cpp
+++ b/src/plugins/qmldesigner/documentwarningwidget.cpp
@@ -91,7 +91,7 @@ DocumentWarningWidget::DocumentWarningWidget(QWidget *parent)
     auto layout = new QVBoxLayout(this);
     layout->addWidget(m_headerLabel);
     auto messageLayout = new QVBoxLayout;
-    messageLayout->setMargin(20);
+    messageLayout->setContentsMargins(20, 20, 20, 20);
     messageLayout->setSpacing(5);
     messageLayout->addWidget(m_navigateLabel);
     messageLayout->addWidget(m_messageLabel);
diff --git a/src/plugins/qmljseditor/qmljsoutline.cpp b/src/plugins/qmljseditor/qmljsoutline.cpp
index 0eb0d401616..abd333f4685 100644
--- a/src/plugins/qmljseditor/qmljsoutline.cpp
+++ b/src/plugins/qmljseditor/qmljsoutline.cpp
@@ -105,7 +105,7 @@ QmlJSOutlineWidget::QmlJSOutlineWidget(QWidget *parent)
 
     auto layout = new QVBoxLayout;
 
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(Core::ItemViewFind::createSearchableWrapper(m_treeView));
 
diff --git a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
index 3ca3bbc999f..c822e274101 100644
--- a/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
+++ b/src/plugins/qmljstools/qmljscodestylepreferencesfactory.cpp
@@ -75,7 +75,7 @@ QWidget *QmlJSCodeStylePreferencesFactory::createEditor(TextEditor::ICodeStylePr
                                                            QWidget *parent) const
 {
     auto widget = new Internal::QmlJSCodeStylePreferencesWidget(parent);
-    widget->layout()->setMargin(0);
+    widget->layout()->setContentsMargins(0, 0, 0, 0);
     widget->setPreferences(preferences);
     return widget;
 }
diff --git a/src/plugins/scxmleditor/common/colorpicker.cpp b/src/plugins/scxmleditor/common/colorpicker.cpp
index fc999765964..bd9e86f0e3a 100644
--- a/src/plugins/scxmleditor/common/colorpicker.cpp
+++ b/src/plugins/scxmleditor/common/colorpicker.cpp
@@ -49,7 +49,6 @@ ColorPicker::ColorPicker(const QString &key, QWidget *parent)
 
     auto vBoxLayout = new QVBoxLayout;
     vBoxLayout->setContentsMargins(0, 0, 0, 0);
-    vBoxLayout->setMargin(0);
     vBoxLayout->setSpacing(0);
 
     const int buttonRowsCount = 4;
@@ -58,7 +57,6 @@ ColorPicker::ColorPicker(const QString &key, QWidget *parent)
     for (int r = 0; r < buttonRowsCount; ++r) {
         auto hBoxLayout = new QHBoxLayout;
         hBoxLayout->setContentsMargins(0, 0, 0, 0);
-        hBoxLayout->setMargin(0);
         hBoxLayout->setSpacing(0);
 
         for (int c = 0; c < buttonColumnsCount; ++c)
diff --git a/src/plugins/scxmleditor/common/mainwidget.cpp b/src/plugins/scxmleditor/common/mainwidget.cpp
index d2c880d0d60..298d0219105 100644
--- a/src/plugins/scxmleditor/common/mainwidget.cpp
+++ b/src/plugins/scxmleditor/common/mainwidget.cpp
@@ -672,7 +672,7 @@ void MainWidget::createUi()
 
     m_mainContentWidget = new QWidget;
     m_mainContentWidget->setLayout(new QVBoxLayout);
-    m_mainContentWidget->layout()->setMargin(0);
+    m_mainContentWidget->layout()->setContentsMargins(0, 0, 0, 0);
     m_mainContentWidget->layout()->addWidget(m_stackedWidget);
     m_mainContentWidget->layout()->addWidget(m_outputPaneWindow);
 
@@ -692,7 +692,7 @@ void MainWidget::createUi()
 
     setLayout(new QVBoxLayout);
     layout()->addWidget(m_horizontalSplitter);
-    layout()->setMargin(0);
+    layout()->setContentsMargins(0, 0, 0, 0);
 }
 
 void MainWidget::showEvent(QShowEvent *e)
diff --git a/src/plugins/scxmleditor/common/navigator.cpp b/src/plugins/scxmleditor/common/navigator.cpp
index b907021434e..f8624230f9e 100644
--- a/src/plugins/scxmleditor/common/navigator.cpp
+++ b/src/plugins/scxmleditor/common/navigator.cpp
@@ -96,7 +96,7 @@ void Navigator::createUi()
 
     setLayout(new QVBoxLayout);
     layout()->setSpacing(0);
-    layout()->setMargin(0);
+    layout()->setContentsMargins(0, 0, 0, 0);
     layout()->addWidget(titleToolBar);
     layout()->addWidget(m_navigatorView);
     layout()->addWidget(m_navigatorSlider);
diff --git a/src/plugins/scxmleditor/common/shapegroupwidget.cpp b/src/plugins/scxmleditor/common/shapegroupwidget.cpp
index 17edf2fb873..5fe0c158052 100644
--- a/src/plugins/scxmleditor/common/shapegroupwidget.cpp
+++ b/src/plugins/scxmleditor/common/shapegroupwidget.cpp
@@ -76,7 +76,7 @@ void ShapeGroupWidget::createUi()
     m_content->setLayout(new Utils::FlowLayout);
 
     setLayout(new QVBoxLayout);
-    layout()->setMargin(0);
+    layout()->setContentsMargins(0, 0, 0, 0);
     layout()->setSpacing(0);
     layout()->addWidget(toolBar);
     layout()->addWidget(m_content);
diff --git a/src/plugins/scxmleditor/common/stateproperties.cpp b/src/plugins/scxmleditor/common/stateproperties.cpp
index b9797aeed30..2c181ab8aab 100644
--- a/src/plugins/scxmleditor/common/stateproperties.cpp
+++ b/src/plugins/scxmleditor/common/stateproperties.cpp
@@ -154,7 +154,7 @@ void StateProperties::createUi()
     splitter->addWidget(m_contentFrame);
 
     setLayout(new QVBoxLayout);
-    layout()->setMargin(0);
+    layout()->setContentsMargins(0, 0, 0, 0);
     layout()->setSpacing(0);
     layout()->addWidget(propertiesToolBar);
     layout()->addWidget(splitter);
diff --git a/src/plugins/scxmleditor/common/structure.cpp b/src/plugins/scxmleditor/common/structure.cpp
index ea5fe972e98..be49e9711df 100644
--- a/src/plugins/scxmleditor/common/structure.cpp
+++ b/src/plugins/scxmleditor/common/structure.cpp
@@ -270,7 +270,7 @@ void Structure::createUi()
 
     m_checkboxFrame = new QWidget;
     m_checkboxFrame->setLayout(new QVBoxLayout);
-    m_checkboxFrame->layout()->setMargin(0);
+    m_checkboxFrame->layout()->setContentsMargins(0, 0, 0, 0);
     auto spacer = new QWidget;
     spacer->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Expanding);
 
@@ -279,18 +279,18 @@ void Structure::createUi()
     m_tagVisibilityFrame->layout()->addWidget(m_visibleTagsTitle);
     m_tagVisibilityFrame->layout()->addWidget(m_checkboxFrame);
     m_tagVisibilityFrame->layout()->addWidget(spacer);
-    m_tagVisibilityFrame->layout()->setMargin(0);
+    m_tagVisibilityFrame->layout()->setContentsMargins(0, 0, 0, 0);
 
     auto paneInnerFrame = new QWidget;
     paneInnerFrame->setLayout(new QHBoxLayout);
     paneInnerFrame->layout()->addWidget(m_structureView);
     paneInnerFrame->layout()->addWidget(m_tagVisibilityFrame);
-    paneInnerFrame->layout()->setMargin(0);
+    paneInnerFrame->layout()->setContentsMargins(0, 0, 0, 0);
 
     setLayout(new QVBoxLayout);
     layout()->addWidget(toolBar);
     layout()->addWidget(paneInnerFrame);
-    layout()->setMargin(0);
+    layout()->setContentsMargins(0, 0, 0, 0);
     layout()->setSpacing(0);
 }
 
diff --git a/src/plugins/scxmleditor/outputpane/errorwidget.cpp b/src/plugins/scxmleditor/outputpane/errorwidget.cpp
index 455bd88e7bd..bd53724e7f5 100644
--- a/src/plugins/scxmleditor/outputpane/errorwidget.cpp
+++ b/src/plugins/scxmleditor/outputpane/errorwidget.cpp
@@ -151,7 +151,7 @@ void ErrorWidget::createUi()
     setLayout(new QVBoxLayout);
     layout()->addWidget(toolBar);
     layout()->addWidget(m_errorsTable);
-    layout()->setMargin(0);
+    layout()->setContentsMargins(0, 0, 0, 0);
     layout()->setSpacing(0);
 }
 
diff --git a/src/plugins/scxmleditor/outputpane/outputtabwidget.cpp b/src/plugins/scxmleditor/outputpane/outputtabwidget.cpp
index 678b017be69..be8af10f42e 100644
--- a/src/plugins/scxmleditor/outputpane/outputtabwidget.cpp
+++ b/src/plugins/scxmleditor/outputpane/outputtabwidget.cpp
@@ -178,7 +178,7 @@ void OutputTabWidget::createUi()
 
     setLayout(new QVBoxLayout);
     layout()->setSpacing(0);
-    layout()->setMargin(0);
+    layout()->setContentsMargins(0, 0, 0, 0);
     layout()->addWidget(m_toolBar);
     layout()->addWidget(m_stackedWidget);
 }
diff --git a/src/plugins/scxmleditor/scxmleditordata.cpp b/src/plugins/scxmleditor/scxmleditordata.cpp
index 205eaa8b90c..394b00533c3 100644
--- a/src/plugins/scxmleditor/scxmleditordata.cpp
+++ b/src/plugins/scxmleditor/scxmleditordata.cpp
@@ -222,7 +222,7 @@ QWidget *ScxmlEditorData::createModeWidget()
 
     widget->setObjectName("ScxmlEditorDesignModeWidget");
     auto layout = new QVBoxLayout;
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(m_mainToolBar);
     // Avoid mode switch to 'Edit' mode when the application started by
diff --git a/src/plugins/serialterminal/serialoutputpane.cpp b/src/plugins/serialterminal/serialoutputpane.cpp
index e1eca5aec13..a5a17196d72 100644
--- a/src/plugins/serialterminal/serialoutputpane.cpp
+++ b/src/plugins/serialterminal/serialoutputpane.cpp
@@ -142,7 +142,7 @@ SerialOutputPane::SerialOutputPane(Settings &settings) :
     createToolButtons();
 
     auto layout = new QVBoxLayout;
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
 
     m_tabWidget->setDocumentMode(true);
@@ -157,7 +157,7 @@ SerialOutputPane::SerialOutputPane(Settings &settings) :
             this, &SerialOutputPane::contextMenuRequested);
 
     auto inputLayout = new QHBoxLayout;
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(2);
 
     m_inputLine->setPlaceholderText(tr("Type text and hit Enter to send."));
diff --git a/src/plugins/silversearcher/findinfilessilversearcher.cpp b/src/plugins/silversearcher/findinfilessilversearcher.cpp
index f0d6fa7eaee..c7794f89ac7 100644
--- a/src/plugins/silversearcher/findinfilessilversearcher.cpp
+++ b/src/plugins/silversearcher/findinfilessilversearcher.cpp
@@ -165,7 +165,7 @@ FindInFilesSilverSearcher::FindInFilesSilverSearcher(QObject *parent)
 {
     m_widget = new QWidget;
     auto layout = new QHBoxLayout(m_widget);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     m_searchOptionsLineEdit = new QLineEdit;
     m_searchOptionsLineEdit->setPlaceholderText(tr("Search Options (optional)"));
     layout->addWidget(m_searchOptionsLineEdit);
diff --git a/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp b/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp
index 4e72e4449bd..81da4d15fac 100644
--- a/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp
+++ b/src/plugins/texteditor/codeassist/functionhintproposalwidget.cpp
@@ -141,14 +141,14 @@ FunctionHintProposalWidget::FunctionHintProposalWidget()
     upArrow->setAutoRaise(true);
 
     auto pagerLayout = new QHBoxLayout(d->m_pager);
-    pagerLayout->setMargin(0);
+    pagerLayout->setContentsMargins(0, 0, 0, 0);
     pagerLayout->setSpacing(0);
     pagerLayout->addWidget(upArrow);
     pagerLayout->addWidget(d->m_numberLabel);
     pagerLayout->addWidget(downArrow);
 
     auto popupLayout = new QHBoxLayout(d->m_popupFrame);
-    popupLayout->setMargin(0);
+    popupLayout->setContentsMargins(0, 0, 0, 0);
     popupLayout->setSpacing(0);
     popupLayout->addWidget(d->m_pager);
     popupLayout->addWidget(d->m_hintLabel);
diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp
index 2d117514ac3..92f3e9a3b91 100644
--- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp
+++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp
@@ -119,7 +119,7 @@ public:
         : FakeToolTip(parent), m_label(new QLabel(this))
     {
         auto layout = new QVBoxLayout(this);
-        layout->setMargin(0);
+        layout->setContentsMargins(0, 0, 0, 0);
         layout->setSpacing(0);
         layout->addWidget(m_label);
 
@@ -361,7 +361,7 @@ GenericProposalWidget::GenericProposalWidget()
             this, &GenericProposalWidget::turnOnAutoWidth);
 
     auto layout = new QVBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(d->m_completionListView);
 
     d->m_completionListView->installEventFilter(this);
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp
index 4372dd03948..e753ad79a1d 100644
--- a/src/plugins/texteditor/findinfiles.cpp
+++ b/src/plugins/texteditor/findinfiles.cpp
@@ -144,7 +144,7 @@ QWidget *FindInFiles::createConfigWidget()
     if (!m_configWidget) {
         m_configWidget = new QWidget;
         auto gridLayout = new QGridLayout(m_configWidget);
-        gridLayout->setMargin(0);
+        gridLayout->setContentsMargins(0, 0, 0, 0);
         m_configWidget->setLayout(gridLayout);
 
         int row = 0;
diff --git a/src/plugins/vcsbase/submitfieldwidget.cpp b/src/plugins/vcsbase/submitfieldwidget.cpp
index b92579be437..df3513e59fd 100644
--- a/src/plugins/vcsbase/submitfieldwidget.cpp
+++ b/src/plugins/vcsbase/submitfieldwidget.cpp
@@ -80,7 +80,7 @@ struct FieldEntry {
 void FieldEntry::createGui(const QIcon &removeIcon)
 {
     layout = new QHBoxLayout;
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout ->setSpacing(spacing);
     combo = new QComboBox;
     layout->addWidget(combo);
@@ -174,7 +174,7 @@ SubmitFieldWidget::SubmitFieldWidget(QWidget *parent) :
         d(new SubmitFieldWidgetPrivate)
 {
     d->layout = new QVBoxLayout;
-    d->layout->setMargin(0);
+    d->layout->setContentsMargins(0, 0, 0, 0);
     d->layout->setSpacing(spacing);
     setLayout(d->layout);
 }
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index 88a8a1ace4a..8ccf751ddd1 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -348,7 +348,7 @@ WelcomeMode::WelcomeMode()
     hbox->setStretchFactor(m_pageStack, 10);
 
     auto layout = new QVBoxLayout(m_modeWidget);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
     layout->addWidget(new StyledBar(m_modeWidget));
     layout->addItem(hbox);
diff --git a/src/shared/designerintegrationv2/formresizer.cpp b/src/shared/designerintegrationv2/formresizer.cpp
index a88f0ac6e32..34de90a477c 100644
--- a/src/shared/designerintegrationv2/formresizer.cpp
+++ b/src/shared/designerintegrationv2/formresizer.cpp
@@ -50,12 +50,13 @@ FormResizer::FormResizer(QWidget *parent) :
     setBackgroundRole(QPalette::Base);
 
     QVBoxLayout *handleLayout = new QVBoxLayout(this);
-    handleLayout->setMargin(SELECTION_MARGIN);
+    handleLayout->setContentsMargins(SELECTION_MARGIN, SELECTION_MARGIN,
+                                     SELECTION_MARGIN, SELECTION_MARGIN);
     handleLayout->addWidget(m_frame);
 
     m_frame->setFrameStyle(QFrame::Panel | QFrame::Raised);
     QVBoxLayout *layout = new QVBoxLayout(m_frame);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     // handles
     m_handles.reserve(SizeHandleRect::Left);
     for (int i = SizeHandleRect::LeftTop; i <= SizeHandleRect::Left; ++i) {
diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp
index dc19b8e92ad..7f652b41cfb 100644
--- a/src/shared/help/bookmarkmanager.cpp
+++ b/src/shared/help/bookmarkmanager.cpp
@@ -411,7 +411,7 @@ void BookmarkWidget::setup()
     regExp.setCaseSensitivity(Qt::CaseInsensitive);
 
     QLayout *vlayout = new QVBoxLayout(this);
-    vlayout->setMargin(0);
+    vlayout->setContentsMargins(0, 0, 0, 0);
     vlayout->setSpacing(0);
 
     searchField = new Utils::FancyLineEdit(this);
@@ -421,7 +421,7 @@ void BookmarkWidget::setup()
     Utils::StyledBar *toolbar = new Utils::StyledBar(this);
     toolbar->setSingleRow(false);
     QLayout *tbLayout = new QHBoxLayout();
-    tbLayout->setMargin(4);
+    tbLayout->setContentsMargins(4, 4, 4, 4);
     tbLayout->addWidget(searchField);
     toolbar->setLayout(tbLayout);
 
diff --git a/src/shared/help/contentwindow.cpp b/src/shared/help/contentwindow.cpp
index e50a47c25d4..16f7aaccbde 100644
--- a/src/shared/help/contentwindow.cpp
+++ b/src/shared/help/contentwindow.cpp
@@ -56,7 +56,7 @@ ContentWindow::ContentWindow()
     setFocusProxy(m_contentWidget);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_contentWidget);
 
     connect(m_contentWidget, &QWidget::customContextMenuRequested,
diff --git a/src/shared/help/indexwindow.cpp b/src/shared/help/indexwindow.cpp
index 5139c8574d5..324a071ab6a 100644
--- a/src/shared/help/indexwindow.cpp
+++ b/src/shared/help/indexwindow.cpp
@@ -69,14 +69,14 @@ IndexWindow::IndexWindow()
     QLabel *l = new QLabel(tr("&Look for:"));
     l->setBuddy(m_searchLineEdit);
     layout->addWidget(l);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->setSpacing(0);
 
     Utils::StyledBar *toolbar = new Utils::StyledBar(this);
     toolbar->setSingleRow(false);
     QLayout *tbLayout = new QHBoxLayout();
     tbLayout->setSpacing(6);
-    tbLayout->setMargin(4);
+    tbLayout->setContentsMargins(4, 4, 4, 4);
     tbLayout->addWidget(l);
     tbLayout->addWidget(m_searchLineEdit);
     toolbar->setLayout(tbLayout);