Made uic generate QLayout::setContentsMargin instead of setMargin.

With the exception of layout functions, which is too weird.
Task-number:  255846

1 files changed, 6 insertions, 6 deletions

diff --git a/tests/auto/uic/baseline/batchtranslation.ui.h b/tests/auto/uic/baseline/batchtranslation.ui.h
index 23030f5..4cdad44 100644
--- a/tests/auto/uic/baseline/batchtranslation.ui.h
+++ b/tests/auto/uic/baseline/batchtranslation.ui.h
@@ -101,7 +101,7 @@ public:
         vboxLayout->setSpacing(6);
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout->setMargin(9);
+        vboxLayout->setContentsMargins(9, 9, 9, 9);
 #endif
         vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
         groupBox = new QGroupBox(databaseTranslationDialog);
@@ -116,7 +116,7 @@ public:
         vboxLayout1->setSpacing(6);
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout1->setMargin(9);
+        vboxLayout1->setContentsMargins(9, 9, 9, 9);
 #endif
         vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
         ckOnlyUntranslated = new QCheckBox(groupBox);
@@ -146,7 +146,7 @@ public:
         vboxLayout2->setSpacing(6);
 #endif
 #ifndef Q_OS_MAC
-        vboxLayout2->setMargin(9);
+        vboxLayout2->setContentsMargins(9, 9, 9, 9);
 #endif
         vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
         hboxLayout = new QHBoxLayout();
@@ -154,7 +154,7 @@ public:
         hboxLayout->setSpacing(6);
 #endif
 #ifndef Q_OS_MAC
-        hboxLayout->setMargin(0);
+        hboxLayout->setContentsMargins(0, 0, 0, 0);
 #endif
         hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
         phrasebookList = new QListView(groupBox_2);
@@ -167,7 +167,7 @@ public:
 #ifndef Q_OS_MAC
         vboxLayout3->setSpacing(6);
 #endif
-        vboxLayout3->setMargin(0);
+        vboxLayout3->setContentsMargins(0, 0, 0, 0);
         vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
         moveUpButton = new QPushButton(groupBox_2);
         moveUpButton->setObjectName(QString::fromUtf8("moveUpButton"));
@@ -202,7 +202,7 @@ public:
 #ifndef Q_OS_MAC
         hboxLayout1->setSpacing(6);
 #endif
-        hboxLayout1->setMargin(0);
+        hboxLayout1->setContentsMargins(0, 0, 0, 0);
         hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
         spacerItem1 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);