Merge remote-tracking branch 'origin/dev' into wip/qt6

Change-Id: Ib719a6249069e6bd6c9311bbec7f364855ab82ff

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
index cbf5196bb9..feade7d443 100644
--- a/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
+++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
@@ -620,7 +620,7 @@ void tst_QTabWidget::heightForWidth()
 
     QWidget *window = new QWidget;
     QVBoxLayout *lay = new QVBoxLayout(window);
-    lay->setMargin(0);
+    lay->setContentsMargins(0, 0, 0, 0);
     lay->setSpacing(0);
     QTabWidget *tabWid = new QTabWidget(window);
     QWidget *w = new QWidget;
@@ -637,7 +637,7 @@ void tst_QTabWidget::heightForWidth()
                                );
     label->setWordWrap(true);
     lay2->addWidget(label);
-    lay2->setMargin(0);
+    lay2->setContentsMargins(0, 0, 0, 0);
 
     lay->addWidget(tabWid);
     int h = window->heightForWidth(160);