QtTools: replace deprecated QLayout::margin() with contentsMargins()

QLayout::margin()/setMargin() is deprecated - replace it with it's
successors contentsMargins()/setContentsMargins()

Change-Id: I8b6a36f3e0d0e00186a7d9cdf4827cf06f302235
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>

9 files changed, 10 insertions, 10 deletions

diff --git a/src/assistant/assistant/centralwidget.cpp b/src/assistant/assistant/centralwidget.cpp
index 31f8b1e0a..eeb1e9e17 100644
--- a/src/assistant/assistant/centralwidget.cpp
+++ b/src/assistant/assistant/centralwidget.cpp
@@ -193,7 +193,7 @@ CentralWidget::CentralWidget(QWidget *parent)
     staticCentralWidget = this;
     QVBoxLayout *vboxLayout = new QVBoxLayout(this);
 
-    vboxLayout->setMargin(0);
+    vboxLayout->setContentsMargins(QMargins());
     vboxLayout->setSpacing(0);
     vboxLayout->addWidget(m_tabBar);
     m_tabBar->setVisible(HelpEngineWrapper::instance().showTabs());
diff --git a/src/assistant/assistant/contentwindow.cpp b/src/assistant/assistant/contentwindow.cpp
index 57bd51261..c932c06b7 100644
--- a/src/assistant/assistant/contentwindow.cpp
+++ b/src/assistant/assistant/contentwindow.cpp
@@ -51,7 +51,7 @@ ContentWindow::ContentWindow()
     m_contentWidget->setContextMenuPolicy(Qt::CustomContextMenu);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setMargin(4);
+    layout->setContentsMargins(4, 4, 4, 4);
     layout->addWidget(m_contentWidget);
 
     connect(m_contentWidget, &QWidget::customContextMenuRequested,
diff --git a/src/assistant/assistant/findwidget.cpp b/src/assistant/assistant/findwidget.cpp
index b9607b703..2bbbbf6b0 100644
--- a/src/assistant/assistant/findwidget.cpp
+++ b/src/assistant/assistant/findwidget.cpp
@@ -49,7 +49,7 @@ FindWidget::FindWidget(QWidget *parent)
     QString resourcePath = QLatin1String(":/qt-project.org/assistant/images/");
 
 #ifndef Q_OS_MAC
-    hboxLayout->setMargin(0);
+    hboxLayout->setContentsMargins(QMargins());
     hboxLayout->setSpacing(6);
     resourcePath.append(QLatin1String("win"));
 #else
diff --git a/src/assistant/assistant/indexwindow.cpp b/src/assistant/assistant/indexwindow.cpp
index 44ad56fad..d49d05f5d 100644
--- a/src/assistant/assistant/indexwindow.cpp
+++ b/src/assistant/assistant/indexwindow.cpp
@@ -61,7 +61,7 @@ IndexWindow::IndexWindow(QWidget *parent)
     connect(m_searchLineEdit, &QLineEdit::textChanged,
             this, &IndexWindow::filterIndices);
     m_searchLineEdit->installEventFilter(this);
-    layout->setMargin(4);
+    layout->setContentsMargins(4, 4, 4, 4);
     layout->addWidget(m_searchLineEdit);
 
     HelpEngineWrapper &helpEngine = HelpEngineWrapper::instance();
diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp
index 677968c49..2b9c87bbf 100644
--- a/src/assistant/assistant/mainwindow.cpp
+++ b/src/assistant/assistant/mainwindow.cpp
@@ -1099,7 +1099,7 @@ void MainWindow::indexingStarted()
         progressBar->setSizePolicy(sizePolicy);
 
         hlayout->setSpacing(6);
-        hlayout->setMargin(0);
+        hlayout->setContentsMargins(QMargins());
         hlayout->addWidget(progressBar);
 
         statusBar()->addPermanentWidget(m_progressWidget);
diff --git a/src/assistant/assistant/openpagesswitcher.cpp b/src/assistant/assistant/openpagesswitcher.cpp
index 25ab24f0e..ee932def9 100644
--- a/src/assistant/assistant/openpagesswitcher.cpp
+++ b/src/assistant/assistant/openpagesswitcher.cpp
@@ -63,7 +63,7 @@ OpenPagesSwitcher::OpenPagesSwitcher(OpenPagesModel *model)
     m_openPagesWidget->installEventFilter(this);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(QMargins());
     layout->addWidget(m_openPagesWidget);
 
     connect(m_openPagesWidget, &OpenPagesWidget::closePage,
diff --git a/src/assistant/assistant/optionswidget.cpp b/src/assistant/assistant/optionswidget.cpp
index 93ea42ee3..c2deb46f1 100644
--- a/src/assistant/assistant/optionswidget.cpp
+++ b/src/assistant/assistant/optionswidget.cpp
@@ -96,7 +96,7 @@ OptionsWidget::OptionsWidget(QWidget *parent)
     m_listWidget->setItemDelegate(new ListWidgetDelegate(m_listWidget));
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->addWidget(m_listWidget);
-    layout->setMargin(0);
+    layout->setContentsMargins(QMargins());
 
     connect(m_listWidget, &QListWidget::itemChanged, this, &OptionsWidget::itemChanged);
 }
diff --git a/src/assistant/help/qhelpsearchquerywidget.cpp b/src/assistant/help/qhelpsearchquerywidget.cpp
index 3cf640489..bb7a61cc5 100644
--- a/src/assistant/help/qhelpsearchquerywidget.cpp
+++ b/src/assistant/help/qhelpsearchquerywidget.cpp
@@ -229,7 +229,7 @@ QHelpSearchQueryWidget::QHelpSearchQueryWidget(QWidget *parent)
     d = new QHelpSearchQueryWidgetPrivate();
 
     QVBoxLayout *vLayout = new QVBoxLayout(this);
-    vLayout->setMargin(0);
+    vLayout->setContentsMargins(QMargins());
 
     QHBoxLayout* hBoxLayout = new QHBoxLayout();
     d->m_searchLabel = new QLabel(this);
diff --git a/src/assistant/help/qhelpsearchresultwidget.cpp b/src/assistant/help/qhelpsearchresultwidget.cpp
index 103b9e811..86e56b733 100644
--- a/src/assistant/help/qhelpsearchresultwidget.cpp
+++ b/src/assistant/help/qhelpsearchresultwidget.cpp
@@ -253,12 +253,12 @@ QHelpSearchResultWidget::QHelpSearchResultWidget(QHelpSearchEngine *engine)
     , d(new QHelpSearchResultWidgetPrivate(engine))
 {
     QVBoxLayout *vLayout = new QVBoxLayout(this);
-    vLayout->setMargin(0);
+    vLayout->setContentsMargins(QMargins());
     vLayout->setSpacing(0);
 
     QHBoxLayout *hBoxLayout = new QHBoxLayout();
 #ifndef Q_OS_MAC
-    hBoxLayout->setMargin(0);
+    hBoxLayout->setContentsMargins(QMargins());
     hBoxLayout->setSpacing(0);
 #endif
     hBoxLayout->addWidget(d->firstResultPage = d->setupToolButton(