diff --git a/src/pimcommon/configureplugins/configurepluginslistwidget.cpp b/src/pimcommon/configureplugins/configurepluginslistwidget.cpp
--- a/src/pimcommon/configureplugins/configurepluginslistwidget.cpp
+++ b/src/pimcommon/configureplugins/configurepluginslistwidget.cpp
@@ -34,7 +34,7 @@
 {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
     mainLayout->setObjectName(QStringLiteral("mainlayout"));
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
 
     mListWidget = new QTreeWidget(this);
     mListWidget->setSortingEnabled(true);
diff --git a/src/pimcommon/configureplugins/configurepluginswidget.cpp b/src/pimcommon/configureplugins/configurepluginswidget.cpp
--- a/src/pimcommon/configureplugins/configurepluginswidget.cpp
+++ b/src/pimcommon/configureplugins/configurepluginswidget.cpp
@@ -50,7 +50,7 @@
 void ConfigurePluginsWidget::initLayout(ConfigurePluginsListWidget *configurePluginListWidget)
 {
     QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
 
     KMessageWidget *messageWidget = new KMessageWidget(this);
     messageWidget->setObjectName(QStringLiteral("messagewidget"));
diff --git a/src/pimcommon/logactivities/logactivitieswidget.cpp b/src/pimcommon/logactivities/logactivitieswidget.cpp
--- a/src/pimcommon/logactivities/logactivitieswidget.cpp
+++ b/src/pimcommon/logactivities/logactivitieswidget.cpp
@@ -27,7 +27,7 @@
     : QWidget(parent)
 {
     QVBoxLayout *mainLayout = new QVBoxLayout(this);
-    mainLayout->setMargin(0);
+    mainLayout->setContentsMargins(0, 0, 0, 0);
     mainLayout->setObjectName(QStringLiteral("mainLayout"));
 
     mLog = new KPIMTextEdit::PlainTextEditorWidget(this);
diff --git a/src/pimcommon/templatewidgets/templateeditdialog.cpp b/src/pimcommon/templatewidgets/templateeditdialog.cpp
--- a/src/pimcommon/templatewidgets/templateeditdialog.cpp
+++ b/src/pimcommon/templatewidgets/templateeditdialog.cpp
@@ -57,7 +57,7 @@
     mainLayout->addWidget(buttonBox);
 
     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/pimcommon/translator/translatorwidget.cpp b/src/pimcommon/translator/translatorwidget.cpp
--- a/src/pimcommon/translator/translatorwidget.cpp
+++ b/src/pimcommon/translator/translatorwidget.cpp
@@ -217,7 +217,7 @@
     connect(d->abstractTranslator, &PimCommon::GoogleTranslator::translateFailed, this, &TranslatorWidget::slotTranslateFailed);
 
     QVBoxLayout *layout = new QVBoxLayout(this);
-    layout->setMargin(2);
+    layout->setContentsMargins(2, 2, 2, 2);
     QHBoxLayout *hboxLayout = new QHBoxLayout;
     QToolButton *closeBtn = new QToolButton(this);
     closeBtn->setObjectName(QStringLiteral("close-button"));
diff --git a/src/pimcommon/widgets/simplestringlisteditor.cpp b/src/pimcommon/widgets/simplestringlisteditor.cpp
--- a/src/pimcommon/widgets/simplestringlisteditor.cpp
+++ b/src/pimcommon/widgets/simplestringlisteditor.cpp
@@ -75,7 +75,7 @@
     setAddDialogLabel(addDialogLabel);
     setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
     QHBoxLayout *hlay = new QHBoxLayout(this);
-    hlay->setMargin(0);
+    hlay->setContentsMargins(0, 0, 0, 0);
 
     d->mListBox = new QListWidget(this);
 
diff --git a/src/pimcommonakonadi/acl/aclentrydialog.cpp b/src/pimcommonakonadi/acl/aclentrydialog.cpp
--- a/src/pimcommonakonadi/acl/aclentrydialog.cpp
+++ b/src/pimcommonakonadi/acl/aclentrydialog.cpp
@@ -97,7 +97,7 @@
     mainLayout->addWidget(buttonBox);
 
     QGridLayout *layout = new QGridLayout(page);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
 
     QLabel *label = new QLabel(i18n("&User identifier:"), page);
     layout->addWidget(label, 0, 0);
diff --git a/src/pimcommonakonadi/acl/collectionaclpage.cpp b/src/pimcommonakonadi/acl/collectionaclpage.cpp
--- a/src/pimcommonakonadi/acl/collectionaclpage.cpp
+++ b/src/pimcommonakonadi/acl/collectionaclpage.cpp
@@ -67,7 +67,7 @@
 void CollectionAclPage::init()
 {
     QHBoxLayout *layout = new QHBoxLayout(this);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     d->mCollectionAclWidget = new CollectionAclWidget(this);
     layout->addWidget(d->mCollectionAclWidget);
 }
diff --git a/src/pimcommonakonadi/acl/collectionaclwidget.cpp b/src/pimcommonakonadi/acl/collectionaclwidget.cpp
--- a/src/pimcommonakonadi/acl/collectionaclwidget.cpp
+++ b/src/pimcommonakonadi/acl/collectionaclwidget.cpp
@@ -99,7 +99,7 @@
 
     QWidget *buttonBox = new QWidget;
     QVBoxLayout *buttonBoxVBoxLayout = new QVBoxLayout(buttonBox);
-    buttonBoxVBoxLayout->setMargin(0);
+    buttonBoxVBoxLayout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(buttonBox);
 
     ActionButton *button = new ActionButton(buttonBox);
diff --git a/src/pimcommonakonadi/collectionpage/contenttypewidget.cpp b/src/pimcommonakonadi/collectionpage/contenttypewidget.cpp
--- a/src/pimcommonakonadi/collectionpage/contenttypewidget.cpp
+++ b/src/pimcommonakonadi/collectionpage/contenttypewidget.cpp
@@ -43,7 +43,7 @@
     , d(new PimCommon::ContentTypeWidgetPrivate)
 {
     QHBoxLayout *hbox = new QHBoxLayout(this);
-    hbox->setMargin(0);
+    hbox->setContentsMargins(0, 0, 0, 0);
 
     QLabel *label = new QLabel(i18n("&Folder contents:"), this);
     label->setObjectName(QStringLiteral("contenttypewidgetlabel"));
diff --git a/src/pimcommonakonadi/collectionpage/incidencesforwidget.cpp b/src/pimcommonakonadi/collectionpage/incidencesforwidget.cpp
--- a/src/pimcommonakonadi/collectionpage/incidencesforwidget.cpp
+++ b/src/pimcommonakonadi/collectionpage/incidencesforwidget.cpp
@@ -39,7 +39,7 @@
     , d(new PimCommon::IncidencesForWidgetPrivate)
 {
     QHBoxLayout *hbox = new QHBoxLayout(this);
-    hbox->setMargin(0);
+    hbox->setContentsMargins(0, 0, 0, 0);
 
     QLabel *label = new QLabel(i18n("Generate free/&busy and activate alarms for:"), this);
     label->setObjectName(QStringLiteral("contentstypelabel"));
diff --git a/src/pimcommonakonadi/folderdialog/checkedcollectionwidget.cpp b/src/pimcommonakonadi/folderdialog/checkedcollectionwidget.cpp
--- a/src/pimcommonakonadi/folderdialog/checkedcollectionwidget.cpp
+++ b/src/pimcommonakonadi/folderdialog/checkedcollectionwidget.cpp
@@ -59,7 +59,7 @@
     , d(new PimCommon::CheckedCollectionWidgetPrivate)
 {
     QVBoxLayout *vbox = new QVBoxLayout(this);
-    vbox->setMargin(0);
+    vbox->setContentsMargins(0, 0, 0, 0);
 
     // Create a new change recorder.
     Akonadi::Monitor *monitor = new Akonadi::Monitor(this);
diff --git a/src/pimcommonakonadi/folderdialog/selectmulticollectionwidget.cpp b/src/pimcommonakonadi/folderdialog/selectmulticollectionwidget.cpp
--- a/src/pimcommonakonadi/folderdialog/selectmulticollectionwidget.cpp
+++ b/src/pimcommonakonadi/folderdialog/selectmulticollectionwidget.cpp
@@ -52,7 +52,7 @@
 void SelectMultiCollectionWidget::initialize(const QString &mimetype)
 {
     QVBoxLayout *vbox = new QVBoxLayout(this);
-    vbox->setMargin(0);
+    vbox->setContentsMargins(0, 0, 0, 0);
 
     mCheckedCollectionWidget = new PimCommon::CheckedCollectionWidget(mimetype);
 
diff --git a/src/pimcommonakonadi/widgets/annotationdialog.cpp b/src/pimcommonakonadi/widgets/annotationdialog.cpp
--- a/src/pimcommonakonadi/widgets/annotationdialog.cpp
+++ b/src/pimcommonakonadi/widgets/annotationdialog.cpp
@@ -86,7 +86,7 @@
 
     QLabel *label = new QLabel(i18n("Enter the text that should be stored as a note to the mail:"));
     QVBoxLayout *vbox = new QVBoxLayout(mainWidget);
-    vbox->setMargin(0);
+    vbox->setContentsMargins(0, 0, 0, 0);
     d->mTextEdit = new KPIMTextEdit::PlainTextEditorWidget(this);
     vbox->addWidget(label);
     vbox->addWidget(d->mTextEdit);