Merge branch 'wip/qt6' into wip/cmake

Change-Id: I50ac36b8803c296998149e98cc61e38687cdd14b

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
index 936f581d89..140a367afe 100644
--- a/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
+++ b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
@@ -308,7 +308,7 @@ void tst_QLayout::controlTypes2()
 {
     QWidget main;
     QVBoxLayout *const layout = new QVBoxLayout(&main);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     QComboBox *combo = new QComboBox(&main);
     layout->addWidget(combo);
     QCOMPARE(layout->controlTypes(), QSizePolicy::ComboBox);
@@ -319,7 +319,7 @@ void tst_QLayout::adjustSizeShouldMakeSureLayoutIsActivated()
     QWidget main;
 
     QVBoxLayout *const layout = new QVBoxLayout(&main);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     SizeHinterFrame *frame = new SizeHinterFrame(QSize(200, 10), QSize(200, 8));
     frame->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
     layout->addWidget(frame);