diff --git a/src/ksieveui/autocreatescripts/commonwidgets/selectconvertparameterwidget.cpp b/src/ksieveui/autocreatescripts/commonwidgets/selectconvertparameterwidget.cpp
--- a/src/ksieveui/autocreatescripts/commonwidgets/selectconvertparameterwidget.cpp
+++ b/src/ksieveui/autocreatescripts/commonwidgets/selectconvertparameterwidget.cpp
@@ -69,7 +69,7 @@
 void SelectConvertParameterWidget::initialize()
 {
     QBoxLayout *hbox = new QHBoxLayout(this);
-    hbox->setMargin(0);
+    hbox->setContentsMargins(0, 0, 0, 0);
     mWidth = new QSpinBox(this);
     mWidth->setSuffix(i18n(" px"));
     mWidth->setMinimum(1);
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.cpp
@@ -35,7 +35,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
     SelectFlagsWidget *flagsWidget = new SelectFlagsWidget;
     connect(flagsWidget, &SelectFlagsWidget::valueChanged, this, &SieveActionAbstractFlags::valueChanged);
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionaddheader.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionaddheader.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionaddheader.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionaddheader.cpp
@@ -40,7 +40,7 @@
 {
     QWidget *w = new QWidget(parent);
     QGridLayout *grid = new QGridLayout;
-    grid->setMargin(0);
+    grid->setContentsMargins(0, 0, 0, 0);
     w->setLayout(grid);
 
     SelectAddHeaderPositionCombobox *combo = new SelectAddHeaderPositionCombobox;
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.cpp
@@ -38,7 +38,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     QLabel *lab = new QLabel(i18n("Name (optional):"));
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp
@@ -38,7 +38,7 @@
 {
     QWidget *w = new QWidget(parent);
     QGridLayout *lay = new QGridLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     QLabel *lab = new QLabel(i18n("From:"));
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactiondeleteheader.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactiondeleteheader.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactiondeleteheader.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactiondeleteheader.cpp
@@ -41,7 +41,7 @@
 {
     QWidget *w = new QWidget(parent);
     QGridLayout *grid = new QGridLayout;
-    grid->setMargin(0);
+    grid->setContentsMargins(0, 0, 0, 0);
     w->setLayout(grid);
 
     SelectMatchTypeComboBox *matchType = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.cpp
@@ -39,7 +39,7 @@
 {
     QWidget *w = new QWidget(parent);
     QGridLayout *grid = new QGridLayout;
-    grid->setMargin(0);
+    grid->setContentsMargins(0, 0, 0, 0);
     w->setLayout(grid);
 
     QLabel *lab = new QLabel(i18n("Subject:"));
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionereject.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionereject.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionereject.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionereject.cpp
@@ -38,7 +38,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
     QLabel *lab = new QLabel(i18n("text:"));
     lay->addWidget(lab);
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.cpp
@@ -38,7 +38,7 @@
 {
     QWidget *w = new QWidget(parent);
     QGridLayout *grid = new QGridLayout;
-    grid->setMargin(0);
+    grid->setContentsMargins(0, 0, 0, 0);
     w->setLayout(grid);
 
     QLabel *lab = new QLabel(i18n("Number of characters:"));
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.cpp
@@ -108,7 +108,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout(w);
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
 
     if (mHasCopySupport) {
         QCheckBox *copy = new QCheckBox(i18n("Keep a copy"));
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionkeep.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionkeep.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionkeep.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionkeep.cpp
@@ -62,7 +62,7 @@
     if (mHasFlagSupport) {
         QWidget *w = new QWidget(parent);
         QHBoxLayout *lay = new QHBoxLayout;
-        lay->setMargin(0);
+        lay->setContentsMargins(0, 0, 0, 0);
         w->setLayout(lay);
         QLabel *addFlags = new QLabel(i18n("Add flags:"));
         lay->addWidget(addFlags);
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionnotify.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionnotify.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionnotify.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionnotify.cpp
@@ -40,7 +40,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     SelectImportanceCombobox *importanceCombobox = new SelectImportanceCombobox;
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp
@@ -45,7 +45,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
     if (mHasCopySupport) {
         QCheckBox *copy = new QCheckBox(i18n("Keep a copy"));
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionreject.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionreject.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionreject.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionreject.cpp
@@ -38,7 +38,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
     QLabel *lab = new QLabel(i18n("text:"));
     lay->addWidget(lab);
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.cpp
@@ -41,7 +41,7 @@
 {
     QWidget *w = new QWidget(parent);
     QGridLayout *grid = new QGridLayout;
-    grid->setMargin(0);
+    grid->setContentsMargins(0, 0, 0, 0);
     w->setLayout(grid);
 
     QLabel *lab = new QLabel(i18n("Subject:"));
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp
@@ -42,7 +42,7 @@
 {
     QWidget *w = new QWidget(parent);
     QGridLayout *grid = new QGridLayout;
-    grid->setMargin(0);
+    grid->setContentsMargins(0, 0, 0, 0);
     w->setLayout(grid);
 
     SelectVariableModifierComboBox *modifier = new SelectVariableModifierComboBox;
diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.cpp
@@ -45,7 +45,7 @@
 {
     QWidget *w = new QWidget(parent);
     QGridLayout *grid = new QGridLayout;
-    grid->setMargin(0);
+    grid->setContentsMargins(0, 0, 0, 0);
     w->setLayout(grid);
 
     QLabel *lab = nullptr;
diff --git a/src/ksieveui/autocreatescripts/sieveactions/widgets/addresslineedit.cpp b/src/ksieveui/autocreatescripts/sieveactions/widgets/addresslineedit.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/widgets/addresslineedit.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/widgets/addresslineedit.cpp
@@ -27,7 +27,7 @@
     : AbstractSelectEmailLineEdit(parent)
 {
     QHBoxLayout *mainLayout = new QHBoxLayout(this);
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     mLineEdit = new QLineEdit(this);
     mainLayout->addWidget(mLineEdit);
     mLineEdit->setClearButtonEnabled(true);
diff --git a/src/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.cpp b/src/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.cpp
--- a/src/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.cpp
+++ b/src/ksieveui/autocreatescripts/sieveactions/widgets/selectflagswidget.cpp
@@ -141,7 +141,7 @@
     : QWidget(parent)
 {
     QHBoxLayout *lay = new QHBoxLayout(this);
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     mEdit = new QLineEdit(this);
     mEdit->setReadOnly(true);
     mEdit->setPlaceholderText(i18n("Click on button for selecting flags..."));
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp
@@ -41,16 +41,16 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     SelectAddressPartComboBox *selectAddressPart = new SelectAddressPartComboBox(mSieveGraphicalModeWidget);
     connect(selectAddressPart, &SelectAddressPartComboBox::valueChanged, this, &SieveConditionAddress::valueChanged);
     selectAddressPart->setObjectName(QStringLiteral("addresspartcombobox"));
     lay->addWidget(selectAddressPart);
 
     QGridLayout *grid = new QGridLayout;
-    grid->setMargin(0);
+    grid->setContentsMargins(0, 0, 0, 0);
     lay->addLayout(grid);
     SelectMatchTypeComboBox *selectMatchCombobox = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
     connect(selectMatchCombobox, &SelectMatchTypeComboBox::valueChanged, this, &SieveConditionAddress::valueChanged);
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp
@@ -38,7 +38,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     SelectBodyTypeWidget *bodyType = new SelectBodyTypeWidget;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionconvert.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionconvert.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionconvert.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionconvert.cpp
@@ -38,7 +38,7 @@
 {
     QWidget *w = new QWidget(parent);
     QGridLayout *lay = new QGridLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     QLabel *lab = new QLabel(i18n("From:"));
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.cpp
@@ -39,7 +39,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     SelectMatchTypeComboBox *matchTypeCombo = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditiondate.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditiondate.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditiondate.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditiondate.cpp
@@ -40,16 +40,16 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     SelectMatchTypeComboBox *matchTypeCombo = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
     matchTypeCombo->setObjectName(QStringLiteral("matchtype"));
     connect(matchTypeCombo, &SelectMatchTypeComboBox::valueChanged, this, &SieveConditionDate::valueChanged);
     lay->addWidget(matchTypeCombo);
 
     QGridLayout *grid = new QGridLayout;
-    grid->setMargin(0);
+    grid->setContentsMargins(0, 0, 0, 0);
     lay->addLayout(grid);
     QLabel *lab = new QLabel(i18n("header:"));
     grid->addWidget(lab, 0, 0);
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp
@@ -42,16 +42,16 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     SelectAddressPartComboBox *selectAddressPart = new SelectAddressPartComboBox(mSieveGraphicalModeWidget);
     connect(selectAddressPart, &SelectAddressPartComboBox::valueChanged, this, &SieveConditionEnvelope::valueChanged);
     selectAddressPart->setObjectName(QStringLiteral("addresspartcombobox"));
     lay->addWidget(selectAddressPart);
 
     QGridLayout *grid = new QGridLayout;
-    grid->setMargin(0);
+    grid->setContentsMargins(0, 0, 0, 0);
     lay->addLayout(grid);
 
     SelectMatchTypeComboBox *selectMatchCombobox = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvironment.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvironment.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvironment.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionenvironment.cpp
@@ -40,7 +40,7 @@
 {
     QWidget *w = new QWidget(parent);
     QGridLayout *grid = new QGridLayout;
-    grid->setMargin(0);
+    grid->setContentsMargins(0, 0, 0, 0);
     w->setLayout(grid);
     QLabel *lab = new QLabel(i18n("Item:"));
     grid->addWidget(lab, 0, 0);
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionexists.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionexists.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionexists.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionexists.cpp
@@ -40,7 +40,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     QComboBox *combo = new QComboBox;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionfalse.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionfalse.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionfalse.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionfalse.cpp
@@ -38,7 +38,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     QLabel *label = new QLabel(i18n("false"));
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionhasflag.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionhasflag.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionhasflag.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionhasflag.cpp
@@ -42,15 +42,15 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
     SelectMatchTypeComboBox *selecttype = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
     selecttype->setObjectName(QStringLiteral("matchtype"));
     connect(selecttype, &SelectMatchTypeComboBox::valueChanged, this, &SieveConditionHasFlag::valueChanged);
     lay->addWidget(selecttype);
 
     QGridLayout *grid = new QGridLayout;
-    grid->setMargin(0);
+    grid->setContentsMargins(0, 0, 0, 0);
     lay->addLayout(grid);
 
     int row = 0;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp
@@ -40,7 +40,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     SelectMatchTypeComboBox *matchTypeCombo = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionihave.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionihave.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionihave.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionihave.cpp
@@ -38,7 +38,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     QLineEdit *edit = new QLineEdit;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmailboxexists.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmailboxexists.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmailboxexists.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmailboxexists.cpp
@@ -37,7 +37,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     QLineEdit *edit = new QLineEdit;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadata.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadata.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadata.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadata.cpp
@@ -40,16 +40,16 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     SelectMatchTypeComboBox *selectType = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
     selectType->setObjectName(QStringLiteral("selecttype"));
     connect(selectType, &SelectMatchTypeComboBox::valueChanged, this, &SieveConditionMetaData::valueChanged);
     lay->addWidget(selectType);
 
     QGridLayout *grid = new QGridLayout;
-    grid->setMargin(0);
+    grid->setContentsMargins(0, 0, 0, 0);
     lay->addLayout(grid);
 
     QLabel *lab = new QLabel(i18n("Mailbox:"));
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadataexists.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadataexists.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadataexists.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionmetadataexists.cpp
@@ -38,7 +38,7 @@
 {
     QWidget *w = new QWidget(parent);
     QGridLayout *grid = new QGridLayout;
-    grid->setMargin(0);
+    grid->setContentsMargins(0, 0, 0, 0);
     w->setLayout(grid);
 
     QLabel *lab = new QLabel(i18n("Mailbox:"));
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadata.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadata.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadata.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadata.cpp
@@ -40,16 +40,16 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     SelectMatchTypeComboBox *selectType = new SelectMatchTypeComboBox(mSieveGraphicalModeWidget);
     selectType->setObjectName(QStringLiteral("selecttype"));
     connect(selectType, &SelectMatchTypeComboBox::valueChanged, this, &SieveConditionServerMetaData::valueChanged);
     lay->addWidget(selectType);
 
     QGridLayout *grid = new QGridLayout;
-    grid->setMargin(0);
+    grid->setContentsMargins(0, 0, 0, 0);
     lay->addLayout(grid);
 
     QLabel *lab = new QLabel(i18n("Mailbox:"));
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadataexists.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadataexists.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadataexists.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionservermetadataexists.cpp
@@ -37,7 +37,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     QLabel *lab = new QLabel(i18n("Annotation:"));
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionsize.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionsize.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionsize.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionsize.cpp
@@ -38,7 +38,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     QComboBox *combo = new QComboBox;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionspamtest.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionspamtest.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionspamtest.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionspamtest.cpp
@@ -43,7 +43,7 @@
 {
     QWidget *w = new QWidget(parent);
     QVBoxLayout *lay = new QVBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     if (mHasSpamTestPlusSupport) {
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditiontrue.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditiontrue.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditiontrue.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditiontrue.cpp
@@ -38,7 +38,7 @@
 {
     QWidget *w = new QWidget(parent);
     QHBoxLayout *lay = new QHBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     QLabel *label = new QLabel(i18n("true"));
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionvirustest.cpp b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionvirustest.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionvirustest.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionvirustest.cpp
@@ -40,7 +40,7 @@
 {
     QWidget *w = new QWidget(parent);
     QVBoxLayout *lay = new QVBoxLayout;
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     w->setLayout(lay);
 
     SelectRelationalMatchType *relation = new SelectRelationalMatchType;
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/widgets/regexpeditorlineedit.cpp b/src/ksieveui/autocreatescripts/sieveconditions/widgets/regexpeditorlineedit.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/widgets/regexpeditorlineedit.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/widgets/regexpeditorlineedit.cpp
@@ -27,7 +27,7 @@
 {
     QHBoxLayout *mainLayout = new QHBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainlayout"));
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     mLineEdit = new QLineEdit(this);
     mLineEdit->setObjectName(QStringLiteral("lineedit"));
     connect(mLineEdit, &QLineEdit::textChanged, this, &RegexpEditorLineEdit::textChanged);
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectbodytypewidget.cpp b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectbodytypewidget.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectbodytypewidget.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectbodytypewidget.cpp
@@ -40,7 +40,7 @@
 void SelectBodyTypeWidget::initialize()
 {
     QHBoxLayout *lay = new QHBoxLayout(this);
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
 
     mBodyCombobox = new KComboBox(this);
     lay->addWidget(mBodyCombobox);
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.cpp b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.cpp
@@ -46,7 +46,7 @@
 void SelectDateWidget::initialize()
 {
     QHBoxLayout *lay = new QHBoxLayout(this);
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
 
     mDateType = new KComboBox;
     connect(mDateType, QOverload<int>::of(&KComboBox::activated), this, &SelectDateWidget::slotDateTypeActivated);
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.cpp b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectheadertypecombobox.cpp
@@ -52,7 +52,7 @@
 
     QVBoxLayout *lay = new QVBoxLayout;
     lay->setObjectName(QStringLiteral("widgetlayout"));
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     mainLayout->addLayout(lay);
     mListWidget = new SelectHeadersWidget(this);
     mListWidget->setObjectName(QStringLiteral("listwidget"));
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp
@@ -63,7 +63,7 @@
 void SelectRelationalMatchType::initialize()
 {
     QHBoxLayout *lay = new QHBoxLayout(this);
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
 
     mType = new KComboBox(this);
     mType->addItem(i18n("Value"), QStringLiteral(":value"));
diff --git a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectsizewidget.cpp b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectsizewidget.cpp
--- a/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectsizewidget.cpp
+++ b/src/ksieveui/autocreatescripts/sieveconditions/widgets/selectsizewidget.cpp
@@ -29,7 +29,7 @@
     : QWidget(parent)
 {
     QHBoxLayout *hbox = new QHBoxLayout(this);
-    hbox->setMargin(0);
+    hbox->setContentsMargins(0, 0, 0, 0);
 
     mSpinBoxSize = new QSpinBox(this);
     mSpinBoxSize->setMinimum(1);
diff --git a/src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.cpp b/src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.cpp
--- a/src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.cpp
+++ b/src/ksieveui/autocreatescripts/sieveeditorgraphicalmodewidget.cpp
@@ -40,7 +40,7 @@
     : SieveEditorGraphicalModeWidgetAbstract::SieveEditorGraphicalModeWidgetAbstract(parent)
 {
     QVBoxLayout *vlay = new QVBoxLayout(this);
-    vlay->setMargin(0);
+    vlay->setContentsMargins(0, 0, 0, 0);
 
     mSplitter = new QSplitter;
     mSplitter->setChildrenCollapsible(false);
diff --git a/src/ksieveui/autocreatescripts/sievescriptblockwidget.cpp b/src/ksieveui/autocreatescripts/sievescriptblockwidget.cpp
--- a/src/ksieveui/autocreatescripts/sievescriptblockwidget.cpp
+++ b/src/ksieveui/autocreatescripts/sievescriptblockwidget.cpp
@@ -43,7 +43,7 @@
     , mSieveGraphicalModeWidget(graphicalModeWidget)
 {
     QVBoxLayout *topLayout = new QVBoxLayout(this);
-    topLayout->setMargin(0);
+    topLayout->setContentsMargins(0, 0, 0, 0);
 
     mConditions = new QGroupBox(i18n("Conditions"));
     QVBoxLayout *vbox = new QVBoxLayout;
diff --git a/src/ksieveui/autocreatescripts/sievescriptlistbox.cpp b/src/ksieveui/autocreatescripts/sievescriptlistbox.cpp
--- a/src/ksieveui/autocreatescripts/sievescriptlistbox.cpp
+++ b/src/ksieveui/autocreatescripts/sievescriptlistbox.cpp
@@ -105,7 +105,7 @@
     //----------- the first row of buttons
     QWidget *hb = new QWidget(this);
     QHBoxLayout *hbHBoxLayout = new QHBoxLayout(hb);
-    hbHBoxLayout->setMargin(0);
+    hbHBoxLayout->setContentsMargins(0, 0, 0, 0);
     hbHBoxLayout->setSpacing(4);
 
     mBtnTop = new QPushButton(hb);
@@ -142,7 +142,7 @@
 
     hb = new QWidget(this);
     hbHBoxLayout = new QHBoxLayout(hb);
-    hbHBoxLayout->setMargin(0);
+    hbHBoxLayout->setContentsMargins(0, 0, 0, 0);
     hbHBoxLayout->setSpacing(4);
 
     mBtnNew = new QPushButton(hb);
diff --git a/src/ksieveui/autocreatescripts/sievescriptpage.cpp b/src/ksieveui/autocreatescripts/sievescriptpage.cpp
--- a/src/ksieveui/autocreatescripts/sievescriptpage.cpp
+++ b/src/ksieveui/autocreatescripts/sievescriptpage.cpp
@@ -39,7 +39,7 @@
     , mSieveGraphicalModeWidget(sieveEditorGraphicalWidget)
 {
     QVBoxLayout *topLayout = new QVBoxLayout(this);
-    topLayout->setMargin(0);
+    topLayout->setContentsMargins(0, 0, 0, 0);
     mTabWidget = new SieveScriptTabWidget(this);
     connect(mTabWidget, &SieveScriptTabWidget::tabCloseRequested, this, &SieveScriptPage::slotCloseTab);
 
diff --git a/src/ksieveui/editor/sieveeditortextmodewidget.cpp b/src/ksieveui/editor/sieveeditortextmodewidget.cpp
--- a/src/ksieveui/editor/sieveeditortextmodewidget.cpp
+++ b/src/ksieveui/editor/sieveeditortextmodewidget.cpp
@@ -63,7 +63,7 @@
     : SieveEditorAbstractWidget(parent)
 {
     QVBoxLayout *lay = new QVBoxLayout(this);
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
 
     mMainSplitter = new QSplitter;
     mMainSplitter->setOrientation(Qt::Vertical);
@@ -85,11 +85,11 @@
 
     QWidget *textEditWidget = new QWidget;
     QVBoxLayout *textEditLayout = new QVBoxLayout;
-    textEditLayout->setMargin(0);
+    textEditLayout->setContentsMargins(0, 0, 0, 0);
 
     mEditorWidget = new QWidget;
     QVBoxLayout *editorWidgetLayout = new QVBoxLayout;
-    editorWidgetLayout->setMargin(0);
+    editorWidgetLayout->setContentsMargins(0, 0, 0, 0);
     mEditorWidget->setLayout(editorWidgetLayout);
 
     mTabWidget = new SieveEditorTabWidget;
diff --git a/src/ksieveui/editor/sieveeditorwidget.cpp b/src/ksieveui/editor/sieveeditorwidget.cpp
--- a/src/ksieveui/editor/sieveeditorwidget.cpp
+++ b/src/ksieveui/editor/sieveeditorwidget.cpp
@@ -152,7 +152,7 @@
     nameLayout->addWidget(mScriptName);
     lay->addLayout(nameLayout);
 
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     mStackedWidget = new QStackedWidget;
 
     mTextModeWidget = new SieveEditorTextModeWidget;
diff --git a/src/ksieveui/editor/sieveinfowidget.cpp b/src/ksieveui/editor/sieveinfowidget.cpp
--- a/src/ksieveui/editor/sieveinfowidget.cpp
+++ b/src/ksieveui/editor/sieveinfowidget.cpp
@@ -27,7 +27,7 @@
     : QWidget(parent)
 {
     QHBoxLayout *lay = new QHBoxLayout(this);
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     mInfo = new QTextEdit(this);
     mInfo->setReadOnly(true);
     mInfo->setAcceptRichText(true);
diff --git a/src/ksieveui/editor/sievetexteditwidget.cpp b/src/ksieveui/editor/sievetexteditwidget.cpp
--- a/src/ksieveui/editor/sievetexteditwidget.cpp
+++ b/src/ksieveui/editor/sievetexteditwidget.cpp
@@ -57,7 +57,7 @@
 void SieveTextEditWidget::initialize(KSieveUi::SieveTextEdit *custom)
 {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     if (custom) {
         d->mTextEdit = custom;
     } else {
diff --git a/src/ksieveui/editor/webengine/findbar/findbarbase.cpp b/src/ksieveui/editor/webengine/findbar/findbarbase.cpp
--- a/src/ksieveui/editor/webengine/findbar/findbarbase.cpp
+++ b/src/ksieveui/editor/webengine/findbar/findbarbase.cpp
@@ -40,7 +40,7 @@
     : QWidget(parent)
 {
     QHBoxLayout *lay = new QHBoxLayout(this);
-    lay->setMargin(2);
+    lay->setContentsMargins(2, 2, 2, 2);
 
     QToolButton *closeBtn = new QToolButton(this);
     closeBtn->setIcon(QIcon::fromTheme(QStringLiteral("dialog-close")));
diff --git a/src/ksieveui/editor/webengine/sieveeditorhelphtmlwidget.cpp b/src/ksieveui/editor/webengine/sieveeditorhelphtmlwidget.cpp
--- a/src/ksieveui/editor/webengine/sieveeditorhelphtmlwidget.cpp
+++ b/src/ksieveui/editor/webengine/sieveeditorhelphtmlwidget.cpp
@@ -39,7 +39,7 @@
     , mZoomFactor(100)
 {
     QVBoxLayout *lay = new QVBoxLayout(this);
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     mProgressIndicator = new SieveEditorLoadProgressIndicator(this);
     mProgressIndicator->setObjectName(QStringLiteral("progressindicator"));
     connect(mProgressIndicator, &SieveEditorLoadProgressIndicator::pixmapChanged, this, &SieveEditorHelpHtmlWidget::slotPixmapChanged);
diff --git a/src/ksieveui/managesievescriptsdialog.cpp b/src/ksieveui/managesievescriptsdialog.cpp
--- a/src/ksieveui/managesievescriptsdialog.cpp
+++ b/src/ksieveui/managesievescriptsdialog.cpp
@@ -92,7 +92,7 @@
     mainLayout->addWidget(frame);
     QVBoxLayout *vlay = new QVBoxLayout(frame);
     vlay->setSpacing(0);
-    vlay->setMargin(0);
+    vlay->setContentsMargins(0, 0, 0, 0);
 
     d->mTreeView = new CustomManageSieveWidget(passwordProvider, frame);
     connect(d->mTreeView, &CustomManageSieveWidget::editScript, this, &ManageSieveScriptsDialog::slotEditScript);
diff --git a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp
--- a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp
+++ b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp
@@ -45,7 +45,7 @@
     : QWidget(parent)
 {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
 
     QFormLayout *formLayout = new QFormLayout;
     mainLayout->addLayout(formLayout);
@@ -82,7 +82,7 @@
     QWidget *sieveEditorWidget = new QWidget(this);
     QVBoxLayout *vboxSieveEditorLayout = new QVBoxLayout;
     sieveEditorWidget->setLayout(vboxSieveEditorLayout);
-    vboxSieveEditorLayout->setMargin(0);
+    vboxSieveEditorLayout->setContentsMargins(0, 0, 0, 0);
 
     KPIMTextEdit::TextToSpeechWidget *textToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this);
     textToSpeechWidget->setObjectName(QStringLiteral("texttospeechwidget"));
diff --git a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerwidget.cpp b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerwidget.cpp
--- a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerwidget.cpp
+++ b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerwidget.cpp
@@ -33,7 +33,7 @@
     : QWidget(parent)
 {
     QHBoxLayout *mainLayout = new QHBoxLayout(this);
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     mStackedWidget = new QStackedWidget(this);
     mStackedWidget->setObjectName(QStringLiteral("stackedwidget"));
     mainLayout->addWidget(mStackedWidget);
diff --git a/src/ksieveui/templates/sievetemplateeditdialog.cpp b/src/ksieveui/templates/sievetemplateeditdialog.cpp
--- a/src/ksieveui/templates/sievetemplateeditdialog.cpp
+++ b/src/ksieveui/templates/sievetemplateeditdialog.cpp
@@ -61,7 +61,7 @@
     QWidget *w = new QWidget;
 
     QVBoxLayout *vbox = new QVBoxLayout;
-    vbox->setMargin(0);
+    vbox->setContentsMargins(0, 0, 0, 0);
 
     QHBoxLayout *hbox = new QHBoxLayout;
     QLabel *label = new QLabel(i18n("Name:"));
diff --git a/src/ksieveui/templates/sievetemplatewidget.cpp b/src/ksieveui/templates/sievetemplatewidget.cpp
--- a/src/ksieveui/templates/sievetemplatewidget.cpp
+++ b/src/ksieveui/templates/sievetemplatewidget.cpp
@@ -104,7 +104,7 @@
     : QWidget(parent)
 {
     QVBoxLayout *lay = new QVBoxLayout(this);
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     QLabel *lab = new QLabel(title, this);
     lay->addWidget(lab);
     mListTemplate = new SieveTemplateListWidget(QStringLiteral("sievetemplaterc"), this);
diff --git a/src/ksieveui/vacation/vacationeditwidget.cpp b/src/ksieveui/vacation/vacationeditwidget.cpp
--- a/src/ksieveui/vacation/vacationeditwidget.cpp
+++ b/src/ksieveui/vacation/vacationeditwidget.cpp
@@ -51,7 +51,7 @@
     int row = -1;
 
     QGridLayout *glay = new QGridLayout(this);
-    glay->setMargin(0);
+    glay->setContentsMargins(0, 0, 0, 0);
     glay->setColumnStretch(1, 1);
 
     // explanation label:
diff --git a/src/ksieveui/vacation/vacationmailactionwidget.cpp b/src/ksieveui/vacation/vacationmailactionwidget.cpp
--- a/src/ksieveui/vacation/vacationmailactionwidget.cpp
+++ b/src/ksieveui/vacation/vacationmailactionwidget.cpp
@@ -34,7 +34,7 @@
 {
     QHBoxLayout *mainLayout = new QHBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainlayout"));
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
 
     mStackedWidget = new QStackedWidget(this);
     mStackedWidget->setObjectName(QStringLiteral("stackedWidget"));
diff --git a/src/ksieveui/vacation/vacationpagewidget.cpp b/src/ksieveui/vacation/vacationpagewidget.cpp
--- a/src/ksieveui/vacation/vacationpagewidget.cpp
+++ b/src/ksieveui/vacation/vacationpagewidget.cpp
@@ -38,14 +38,14 @@
     : QWidget(parent)
 {
     QVBoxLayout *lay = new QVBoxLayout(this);
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     mStackWidget = new QStackedWidget;
     lay->addWidget(mStackWidget);
 
     //Main Page
     QWidget *mainPage = new QWidget;
     QVBoxLayout *vbox = new QVBoxLayout;
-    vbox->setMargin(0);
+    vbox->setContentsMargins(0, 0, 0, 0);
     mainPage->setLayout(vbox);
     mVacationWarningWidget = new VacationWarningWidget(this);
     vbox->addWidget(mVacationWarningWidget);
diff --git a/src/ksieveui/widgets/managesievewidget.cpp b/src/ksieveui/widgets/managesievewidget.cpp
--- a/src/ksieveui/widgets/managesievewidget.cpp
+++ b/src/ksieveui/widgets/managesievewidget.cpp
@@ -68,7 +68,7 @@
     , d(new KSieveUi::ManageSieveWidgetPrivate)
 {
     QHBoxLayout *lay = new QHBoxLayout(this);
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
 
     d->mTreeView = new ManageSieveTreeView(this);
 #ifndef QT_NO_CONTEXTMENU
diff --git a/src/ksieveui/widgets/moveimapfolderwidget.cpp b/src/ksieveui/widgets/moveimapfolderwidget.cpp
--- a/src/ksieveui/widgets/moveimapfolderwidget.cpp
+++ b/src/ksieveui/widgets/moveimapfolderwidget.cpp
@@ -28,7 +28,7 @@
 {
     QHBoxLayout *mainLayout = new QHBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainlayout"));
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     mLineEdit = new QLineEdit(this);
     mLineEdit->setObjectName(QStringLiteral("lineedit"));
     mLineEdit->setClearButtonEnabled(true);