summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Hilsheimer <volker.hilsheimer@nokia.com>2009-06-16 15:16:09 (GMT)
committerVolker Hilsheimer <volker.hilsheimer@nokia.com>2009-06-16 15:16:09 (GMT)
commited358d0f8ecaff49e72accc693c3cf8f09900449 (patch)
tree21689389e275df17c79f2adc366a71941e4420ed
parente73e36a16bb51fa66bdccc780f177e2c4d5d8092 (diff)
parente2451ba6eaac6c8050fd172405c1bf262d4e34d7 (diff)
downloadQt-ed358d0f8ecaff49e72accc693c3cf8f09900449.zip
Qt-ed358d0f8ecaff49e72accc693c3cf8f09900449.tar.gz
Qt-ed358d0f8ecaff49e72accc693c3cf8f09900449.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.cpp22
-rw-r--r--src/tools/uic3/converter.cpp17
-rw-r--r--tests/auto/uic/baseline/addtorrentform.ui.h6
-rw-r--r--tests/auto/uic/baseline/batchtranslation.ui.h12
-rw-r--r--tests/auto/uic/baseline/bookwindow.ui.h4
-rw-r--r--tests/auto/uic/baseline/browserwidget.ui.h6
-rw-r--r--tests/auto/uic/baseline/calculatorform.ui.h10
-rw-r--r--tests/auto/uic/baseline/chatdialog.ui.h6
-rw-r--r--tests/auto/uic/baseline/chatmainwindow.ui.h6
-rw-r--r--tests/auto/uic/baseline/chatsetnickname.ui.h6
-rw-r--r--tests/auto/uic/baseline/config.ui.h8
-rw-r--r--tests/auto/uic/baseline/controller.ui.h2
-rw-r--r--tests/auto/uic/baseline/default.ui.h2
-rw-r--r--tests/auto/uic/baseline/downloaditem.ui.h2
-rw-r--r--tests/auto/uic/baseline/downloads.ui.h2
-rw-r--r--tests/auto/uic/baseline/filternamedialog.ui.h2
-rw-r--r--tests/auto/uic/baseline/finddialog.ui.h10
-rw-r--r--tests/auto/uic/baseline/form.ui.h8
-rw-r--r--tests/auto/uic/baseline/formwindowsettings.ui.h14
-rw-r--r--tests/auto/uic/baseline/helpdialog.ui.h16
-rw-r--r--tests/auto/uic/baseline/imagedialog.ui.h6
-rw-r--r--tests/auto/uic/baseline/listwidgeteditor.ui.h2
-rw-r--r--tests/auto/uic/baseline/mainwindow.ui.h18
-rw-r--r--tests/auto/uic/baseline/mainwindowbase.ui.h40
-rw-r--r--tests/auto/uic/baseline/mydialog.ui.h2
-rw-r--r--tests/auto/uic/baseline/myform.ui.h4
-rw-r--r--tests/auto/uic/baseline/newform.ui.h4
-rw-r--r--tests/auto/uic/baseline/pagefold.ui.h4
-rw-r--r--tests/auto/uic/baseline/paletteeditor.ui.h6
-rw-r--r--tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h18
-rw-r--r--tests/auto/uic/baseline/phrasebookbox.ui.h2
-rw-r--r--tests/auto/uic/baseline/previewdialogbase.ui.h8
-rw-r--r--tests/auto/uic/baseline/previewwidget.ui.h10
-rw-r--r--tests/auto/uic/baseline/previewwidgetbase.ui.h14
-rw-r--r--tests/auto/uic/baseline/qpagesetupwidget.ui.h2
-rw-r--r--tests/auto/uic/baseline/qprintpropertieswidget.ui.h2
-rw-r--r--tests/auto/uic/baseline/qprintsettingsoutput.ui.h6
-rw-r--r--tests/auto/uic/baseline/qprintwidget.ui.h2
-rw-r--r--tests/auto/uic/baseline/qsqlconnectiondialog.ui.h8
-rw-r--r--tests/auto/uic/baseline/qttoolbardialog.ui.h6
-rw-r--r--tests/auto/uic/baseline/querywidget.ui.h6
-rw-r--r--tests/auto/uic/baseline/remotecontrol.ui.h4
-rw-r--r--tests/auto/uic/baseline/signalslotdialog.ui.h6
-rw-r--r--tests/auto/uic/baseline/statistics.ui.h4
-rw-r--r--tests/auto/uic/baseline/stringlisteditor.ui.h12
-rw-r--r--tests/auto/uic/baseline/stylesheeteditor.ui.h4
-rw-r--r--tests/auto/uic/baseline/tabbedbrowser.ui.h6
-rw-r--r--tests/auto/uic/baseline/tablewidgeteditor.ui.h2
-rw-r--r--tests/auto/uic/baseline/tetrixwindow.ui.h4
-rw-r--r--tests/auto/uic/baseline/textfinder.ui.h4
-rw-r--r--tests/auto/uic/baseline/topicchooser.ui.h4
-rw-r--r--tests/auto/uic/baseline/translatedialog.ui.h4
-rw-r--r--tests/auto/uic/baseline/translationsettings.ui.h4
-rw-r--r--tests/auto/uic/baseline/trpreviewtool.ui.h2
-rw-r--r--tests/auto/uic/baseline/validators.ui.h22
-rw-r--r--tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp10
56 files changed, 226 insertions, 197 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index b6e5ba7..d43f74e 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.cpp
+++ b/src/tools/uic/cpp/cppwriteinitialization.cpp
@@ -391,6 +391,13 @@ void WriteInitialization::LayoutDefaultHandler::acceptLayoutFunction(DomLayoutFu
}
}
+static inline void writeContentsMargins(const QString &indent, const QString &objectName, int value, QTextStream &str)
+{
+ QString contentsMargins;
+ QTextStream(&contentsMargins) << value << ", " << value << ", " << value << ", " << value;
+ writeSetter(indent, objectName, QLatin1String("setContentsMargins"), contentsMargins, str);
+ }
+
void WriteInitialization::LayoutDefaultHandler::writeProperty(int p, const QString &indent, const QString &objectName,
const DomPropertyMap &properties, const QString &propertyName, const QString &setter,
int defaultStyleValue, bool suppressDefault, QTextStream &str) const
@@ -408,7 +415,11 @@ void WriteInitialization::LayoutDefaultHandler::writeProperty(int p, const QStri
&& value == defaultStyleValue);
if (ifndefMac)
str << "#ifndef Q_OS_MAC\n";
- writeSetter(indent, objectName, setter, value, str);
+ if (p == Margin) { // Use setContentsMargins for numeric values
+ writeContentsMargins(indent, objectName, value, str);
+ } else {
+ writeSetter(indent, objectName, setter, value, str);
+ }
if (ifndefMac)
str << "#endif\n";
return;
@@ -416,13 +427,18 @@ void WriteInitialization::LayoutDefaultHandler::writeProperty(int p, const QStri
}
if (suppressDefault)
return;
- // get default
+ // get default.
if (m_state[p] & HasDefaultFunction) {
+ // Do not use setContentsMargins to avoid repetitive evaluations.
writeSetter(indent, objectName, setter, m_functions[p], str);
return;
}
if (m_state[p] & HasDefaultValue) {
- writeSetter(indent, objectName, setter, m_defaultValues[p], str);
+ if (p == Margin) { // Use setContentsMargins for numeric values
+ writeContentsMargins(indent, objectName, m_defaultValues[p], str);
+ } else {
+ writeSetter(indent, objectName, setter, m_defaultValues[p], str);
+ }
}
return;
}
diff --git a/src/tools/uic3/converter.cpp b/src/tools/uic3/converter.cpp
index 1b0460b..c5a75eb 100644
--- a/src/tools/uic3/converter.cpp
+++ b/src/tools/uic3/converter.cpp
@@ -988,6 +988,7 @@ void Ui3Reader::createProperties(const QDomElement &n, QList<DomProperty*> *prop
QString objectName;
bool wordWrapFound = false;
+ bool wordWrapPropertyFound = false;
for (QDomElement e=n.firstChild().toElement(); !e.isNull(); e = e.nextSibling().toElement()) {
if (e.tagName().toLower() == QLatin1String("property")) {
@@ -1099,14 +1100,16 @@ void Ui3Reader::createProperties(const QDomElement &n, QList<DomProperty*> *prop
name = prop->attributeName(); // sync the name
- if (className == QLatin1String("QLabel") && name == QLatin1String("alignment")) {
- QString v = prop->elementSet();
-
- if (v.contains(QRegExp(QLatin1String("\\bWordBreak\\b"))))
- wordWrapFound = true;
+ if (className == QLatin1String("QLabel")) {
+ if (name == QLatin1String("alignment")) {
+ const QString v = prop->elementSet();
+ if (v.contains(QRegExp(QLatin1String("\\bWordBreak\\b"))))
+ wordWrapFound = true;
+ } else if (name == QLatin1String("wordWrap")) {
+ wordWrapPropertyFound = true;
+ }
}
-
// resolve the flags and enumerator
if (prop->kind() == DomProperty::Set) {
QStringList flags = prop->elementSet().split(QLatin1Char('|'));
@@ -1164,7 +1167,7 @@ void Ui3Reader::createProperties(const QDomElement &n, QList<DomProperty*> *prop
}
}
}
- if (className == QLatin1String("QLabel")) {
+ if (className == QLatin1String("QLabel") && !wordWrapPropertyFound) {
DomProperty *wordWrap = new DomProperty();
wordWrap->setAttributeName(QLatin1String("wordWrap"));
if (wordWrapFound)
diff --git a/tests/auto/uic/baseline/addtorrentform.ui.h b/tests/auto/uic/baseline/addtorrentform.ui.h
index 35f0fad..fafcb16 100644
--- a/tests/auto/uic/baseline/addtorrentform.ui.h
+++ b/tests/auto/uic/baseline/addtorrentform.ui.h
@@ -68,7 +68,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout->setSpacing(6);
#endif
- vboxLayout->setMargin(8);
+ vboxLayout->setContentsMargins(8, 8, 8, 8);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
groupBox = new QGroupBox(AddTorrentFile);
groupBox->setObjectName(QString::fromUtf8("groupBox"));
@@ -79,7 +79,7 @@ public:
#ifndef Q_OS_MAC
gridLayout->setSpacing(6);
#endif
- gridLayout->setMargin(8);
+ gridLayout->setContentsMargins(8, 8, 8, 8);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
label_4 = new QLabel(groupBox);
label_4->setObjectName(QString::fromUtf8("label_4"));
@@ -175,7 +175,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout->setSpacing(6);
#endif
- hboxLayout->setMargin(0);
+ hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
spacerItem = new QSpacerItem(131, 31, QSizePolicy::Expanding, QSizePolicy::Minimum);
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);
diff --git a/tests/auto/uic/baseline/bookwindow.ui.h b/tests/auto/uic/baseline/bookwindow.ui.h
index 9eff8ce..eae06d9 100644
--- a/tests/auto/uic/baseline/bookwindow.ui.h
+++ b/tests/auto/uic/baseline/bookwindow.ui.h
@@ -61,7 +61,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(centralWidget);
@@ -71,7 +71,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"));
bookTable = new QTableView(groupBox);
diff --git a/tests/auto/uic/baseline/browserwidget.ui.h b/tests/auto/uic/baseline/browserwidget.ui.h
index 3bc7542..67f637f 100644
--- a/tests/auto/uic/baseline/browserwidget.ui.h
+++ b/tests/auto/uic/baseline/browserwidget.ui.h
@@ -60,7 +60,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout->setSpacing(6);
#endif
- vboxLayout->setMargin(8);
+ vboxLayout->setContentsMargins(8, 8, 8, 8);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
splitter_2 = new QSplitter(Browser);
splitter_2->setObjectName(QString::fromUtf8("splitter_2"));
@@ -104,7 +104,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"));
sqlEdit = new QTextEdit(groupBox);
@@ -123,7 +123,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout->setSpacing(6);
#endif
- hboxLayout->setMargin(1);
+ hboxLayout->setContentsMargins(1, 1, 1, 1);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
diff --git a/tests/auto/uic/baseline/calculatorform.ui.h b/tests/auto/uic/baseline/calculatorform.ui.h
index 5fab91f..8e9e620 100644
--- a/tests/auto/uic/baseline/calculatorform.ui.h
+++ b/tests/auto/uic/baseline/calculatorform.ui.h
@@ -59,7 +59,7 @@ public:
gridLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- gridLayout->setMargin(9);
+ gridLayout->setContentsMargins(9, 9, 9, 9);
#endif
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
gridLayout->setObjectName(QString::fromUtf8(""));
@@ -67,14 +67,14 @@ public:
#ifndef Q_OS_MAC
hboxLayout->setSpacing(6);
#endif
- hboxLayout->setMargin(1);
+ hboxLayout->setContentsMargins(1, 1, 1, 1);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
hboxLayout->setObjectName(QString::fromUtf8(""));
vboxLayout = new QVBoxLayout();
#ifndef Q_OS_MAC
vboxLayout->setSpacing(6);
#endif
- vboxLayout->setMargin(1);
+ vboxLayout->setContentsMargins(1, 1, 1, 1);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
vboxLayout->setObjectName(QString::fromUtf8(""));
label = new QLabel(CalculatorForm);
@@ -104,7 +104,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout1->setSpacing(6);
#endif
- vboxLayout1->setMargin(1);
+ vboxLayout1->setContentsMargins(1, 1, 1, 1);
vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
vboxLayout1->setObjectName(QString::fromUtf8(""));
label_2 = new QLabel(CalculatorForm);
@@ -134,7 +134,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout2->setSpacing(6);
#endif
- vboxLayout2->setMargin(1);
+ vboxLayout2->setContentsMargins(1, 1, 1, 1);
vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
vboxLayout2->setObjectName(QString::fromUtf8(""));
label_2_2_2 = new QLabel(CalculatorForm);
diff --git a/tests/auto/uic/baseline/chatdialog.ui.h b/tests/auto/uic/baseline/chatdialog.ui.h
index 062a6be..7d19376 100644
--- a/tests/auto/uic/baseline/chatdialog.ui.h
+++ b/tests/auto/uic/baseline/chatdialog.ui.h
@@ -46,7 +46,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"));
hboxLayout = new QHBoxLayout();
@@ -54,7 +54,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"));
textEdit = new QTextEdit(ChatDialog);
@@ -78,7 +78,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout1->setSpacing(6);
#endif
- hboxLayout1->setMargin(0);
+ hboxLayout1->setContentsMargins(0, 0, 0, 0);
hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
label = new QLabel(ChatDialog);
label->setObjectName(QString::fromUtf8("label"));
diff --git a/tests/auto/uic/baseline/chatmainwindow.ui.h b/tests/auto/uic/baseline/chatmainwindow.ui.h
index b2153e6..93ce435 100644
--- a/tests/auto/uic/baseline/chatmainwindow.ui.h
+++ b/tests/auto/uic/baseline/chatmainwindow.ui.h
@@ -66,7 +66,7 @@ public:
hboxLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- hboxLayout->setMargin(9);
+ hboxLayout->setContentsMargins(9, 9, 9, 9);
#endif
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
vboxLayout = new QVBoxLayout();
@@ -74,7 +74,7 @@ public:
vboxLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- vboxLayout->setMargin(0);
+ vboxLayout->setContentsMargins(0, 0, 0, 0);
#endif
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
chatHistory = new QTextBrowser(centralwidget);
@@ -88,7 +88,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout1->setSpacing(6);
#endif
- hboxLayout1->setMargin(0);
+ hboxLayout1->setContentsMargins(0, 0, 0, 0);
hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
label = new QLabel(centralwidget);
label->setObjectName(QString::fromUtf8("label"));
diff --git a/tests/auto/uic/baseline/chatsetnickname.ui.h b/tests/auto/uic/baseline/chatsetnickname.ui.h
index de52fed..c1fd62b 100644
--- a/tests/auto/uic/baseline/chatsetnickname.ui.h
+++ b/tests/auto/uic/baseline/chatsetnickname.ui.h
@@ -53,7 +53,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"));
vboxLayout1 = new QVBoxLayout();
@@ -61,7 +61,7 @@ public:
vboxLayout1->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- vboxLayout1->setMargin(0);
+ vboxLayout1->setContentsMargins(0, 0, 0, 0);
#endif
vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
label = new QLabel(NicknameDialog);
@@ -83,7 +83,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout->setSpacing(6);
#endif
- hboxLayout->setMargin(0);
+ hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
spacerItem = new QSpacerItem(131, 31, QSizePolicy::Expanding, QSizePolicy::Minimum);
diff --git a/tests/auto/uic/baseline/config.ui.h b/tests/auto/uic/baseline/config.ui.h
index 2b6eaf8..20de66f 100644
--- a/tests/auto/uic/baseline/config.ui.h
+++ b/tests/auto/uic/baseline/config.ui.h
@@ -139,7 +139,7 @@ public:
Config->setSizeGripEnabled(true);
vboxLayout = new QVBoxLayout(Config);
vboxLayout->setSpacing(6);
- vboxLayout->setMargin(11);
+ vboxLayout->setContentsMargins(11, 11, 11, 11);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
vboxLayout->setContentsMargins(8, 8, 8, 8);
hboxLayout = new QHBoxLayout();
@@ -155,7 +155,7 @@ public:
ButtonGroup1->setSizePolicy(sizePolicy);
vboxLayout1 = new QVBoxLayout(ButtonGroup1);
vboxLayout1->setSpacing(6);
- vboxLayout1->setMargin(11);
+ vboxLayout1->setContentsMargins(11, 11, 11, 11);
vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
vboxLayout1->setContentsMargins(11, 11, 11, 11);
size_176_220 = new QRadioButton(ButtonGroup1);
@@ -230,7 +230,7 @@ public:
ButtonGroup2->setObjectName(QString::fromUtf8("ButtonGroup2"));
vboxLayout2 = new QVBoxLayout(ButtonGroup2);
vboxLayout2->setSpacing(6);
- vboxLayout2->setMargin(11);
+ vboxLayout2->setContentsMargins(11, 11, 11, 11);
vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
vboxLayout2->setContentsMargins(11, 11, 11, 11);
depth_1 = new QRadioButton(ButtonGroup2);
@@ -337,7 +337,7 @@ public:
GroupBox1->setObjectName(QString::fromUtf8("GroupBox1"));
gridLayout = new QGridLayout(GroupBox1);
gridLayout->setSpacing(6);
- gridLayout->setMargin(11);
+ gridLayout->setContentsMargins(11, 11, 11, 11);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
gridLayout->setHorizontalSpacing(6);
gridLayout->setVerticalSpacing(6);
diff --git a/tests/auto/uic/baseline/controller.ui.h b/tests/auto/uic/baseline/controller.ui.h
index b5f20b7..29985c1 100644
--- a/tests/auto/uic/baseline/controller.ui.h
+++ b/tests/auto/uic/baseline/controller.ui.h
@@ -42,7 +42,7 @@ public:
gridLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- gridLayout->setMargin(9);
+ gridLayout->setContentsMargins(9, 9, 9, 9);
#endif
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
label = new QLabel(Controller);
diff --git a/tests/auto/uic/baseline/default.ui.h b/tests/auto/uic/baseline/default.ui.h
index 1769630..7717694 100644
--- a/tests/auto/uic/baseline/default.ui.h
+++ b/tests/auto/uic/baseline/default.ui.h
@@ -83,7 +83,7 @@ public:
gridLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- gridLayout->setMargin(9);
+ gridLayout->setContentsMargins(9, 9, 9, 9);
#endif
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
nameLabel = new QLabel(centralwidget);
diff --git a/tests/auto/uic/baseline/downloaditem.ui.h b/tests/auto/uic/baseline/downloaditem.ui.h
index 1d4c92f..7df99df 100644
--- a/tests/auto/uic/baseline/downloaditem.ui.h
+++ b/tests/auto/uic/baseline/downloaditem.ui.h
@@ -48,7 +48,7 @@ public:
DownloadItem->setObjectName(QString::fromUtf8("DownloadItem"));
DownloadItem->resize(423, 110);
horizontalLayout = new QHBoxLayout(DownloadItem);
- horizontalLayout->setMargin(0);
+ horizontalLayout->setContentsMargins(0, 0, 0, 0);
horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
fileIcon = new QLabel(DownloadItem);
fileIcon->setObjectName(QString::fromUtf8("fileIcon"));
diff --git a/tests/auto/uic/baseline/downloads.ui.h b/tests/auto/uic/baseline/downloads.ui.h
index 03f3aeb..b4739f6 100644
--- a/tests/auto/uic/baseline/downloads.ui.h
+++ b/tests/auto/uic/baseline/downloads.ui.h
@@ -43,7 +43,7 @@ public:
DownloadDialog->resize(332, 252);
gridLayout = new QGridLayout(DownloadDialog);
gridLayout->setSpacing(0);
- gridLayout->setMargin(0);
+ gridLayout->setContentsMargins(0, 0, 0, 0);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
downloadsView = new EditTableView(DownloadDialog);
downloadsView->setObjectName(QString::fromUtf8("downloadsView"));
diff --git a/tests/auto/uic/baseline/filternamedialog.ui.h b/tests/auto/uic/baseline/filternamedialog.ui.h
index ce67607..f4306ea 100644
--- a/tests/auto/uic/baseline/filternamedialog.ui.h
+++ b/tests/auto/uic/baseline/filternamedialog.ui.h
@@ -42,7 +42,7 @@ public:
FilterNameDialogClass->resize(312, 95);
gridLayout = new QGridLayout(FilterNameDialogClass);
gridLayout->setSpacing(6);
- gridLayout->setMargin(9);
+ gridLayout->setContentsMargins(9, 9, 9, 9);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
label = new QLabel(FilterNameDialogClass);
label->setObjectName(QString::fromUtf8("label"));
diff --git a/tests/auto/uic/baseline/finddialog.ui.h b/tests/auto/uic/baseline/finddialog.ui.h
index a0c6c78..091c54a 100644
--- a/tests/auto/uic/baseline/finddialog.ui.h
+++ b/tests/auto/uic/baseline/finddialog.ui.h
@@ -102,15 +102,15 @@ public:
FindDialog->setSizePolicy(sizePolicy);
hboxLayout = new QHBoxLayout(FindDialog);
hboxLayout->setSpacing(6);
- hboxLayout->setMargin(11);
+ hboxLayout->setContentsMargins(11, 11, 11, 11);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
vboxLayout = new QVBoxLayout();
vboxLayout->setSpacing(6);
- vboxLayout->setMargin(0);
+ vboxLayout->setContentsMargins(0, 0, 0, 0);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
hboxLayout1 = new QHBoxLayout();
hboxLayout1->setSpacing(6);
- hboxLayout1->setMargin(0);
+ hboxLayout1->setContentsMargins(0, 0, 0, 0);
hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
findWhat = new QLabel(FindDialog);
findWhat->setObjectName(QString::fromUtf8("findWhat"));
@@ -129,7 +129,7 @@ public:
groupBox->setObjectName(QString::fromUtf8("groupBox"));
gridLayout = new QGridLayout(groupBox);
gridLayout->setSpacing(6);
- gridLayout->setMargin(9);
+ gridLayout->setContentsMargins(9, 9, 9, 9);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
sourceText = new QCheckBox(groupBox);
sourceText->setObjectName(QString::fromUtf8("sourceText"));
@@ -168,7 +168,7 @@ public:
vboxLayout1 = new QVBoxLayout();
vboxLayout1->setSpacing(6);
- vboxLayout1->setMargin(0);
+ vboxLayout1->setContentsMargins(0, 0, 0, 0);
vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
findNxt = new QPushButton(FindDialog);
findNxt->setObjectName(QString::fromUtf8("findNxt"));
diff --git a/tests/auto/uic/baseline/form.ui.h b/tests/auto/uic/baseline/form.ui.h
index 2a79c26..3f85b03 100644
--- a/tests/auto/uic/baseline/form.ui.h
+++ b/tests/auto/uic/baseline/form.ui.h
@@ -51,7 +51,7 @@ public:
hboxLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- hboxLayout->setMargin(9);
+ hboxLayout->setContentsMargins(9, 9, 9, 9);
#endif
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
worldTimeClock = new WorldTimeClock(WorldTimeForm);
@@ -63,7 +63,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout->setSpacing(6);
#endif
- vboxLayout->setMargin(1);
+ vboxLayout->setContentsMargins(1, 1, 1, 1);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
spacerItem = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
@@ -73,7 +73,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout1->setSpacing(6);
#endif
- hboxLayout1->setMargin(1);
+ hboxLayout1->setContentsMargins(1, 1, 1, 1);
hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
label = new QLabel(WorldTimeForm);
label->setObjectName(QString::fromUtf8("label"));
@@ -93,7 +93,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout2->setSpacing(6);
#endif
- hboxLayout2->setMargin(1);
+ hboxLayout2->setContentsMargins(1, 1, 1, 1);
hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
label_2 = new QLabel(WorldTimeForm);
label_2->setObjectName(QString::fromUtf8("label_2"));
diff --git a/tests/auto/uic/baseline/formwindowsettings.ui.h b/tests/auto/uic/baseline/formwindowsettings.ui.h
index 7f0baf6..9e97b48 100644
--- a/tests/auto/uic/baseline/formwindowsettings.ui.h
+++ b/tests/auto/uic/baseline/formwindowsettings.ui.h
@@ -130,7 +130,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout->setSpacing(6);
#endif
- hboxLayout->setMargin(0);
+ hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
layoutDefaultGroupBox = new QGroupBox(FormWindowSettings);
layoutDefaultGroupBox->setObjectName(QString::fromUtf8("layoutDefaultGroupBox"));
@@ -139,7 +139,7 @@ public:
#ifndef Q_OS_MAC
gridLayout1->setSpacing(6);
#endif
- gridLayout1->setMargin(8);
+ gridLayout1->setContentsMargins(8, 8, 8, 8);
gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
label_2 = new QLabel(layoutDefaultGroupBox);
label_2->setObjectName(QString::fromUtf8("label_2"));
@@ -171,7 +171,7 @@ public:
#ifndef Q_OS_MAC
gridLayout2->setSpacing(6);
#endif
- gridLayout2->setMargin(8);
+ gridLayout2->setContentsMargins(8, 8, 8, 8);
gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
spacingFunctionLineEdit = new QLineEdit(layoutFunctionGroupBox);
spacingFunctionLineEdit->setObjectName(QString::fromUtf8("spacingFunctionLineEdit"));
@@ -205,7 +205,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout->setSpacing(6);
#endif
- vboxLayout->setMargin(8);
+ vboxLayout->setContentsMargins(8, 8, 8, 8);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
authorLineEdit = new QLineEdit(pixmapFunctionGroupBox_2);
authorLineEdit->setObjectName(QString::fromUtf8("authorLineEdit"));
@@ -221,7 +221,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout1->setSpacing(6);
#endif
- vboxLayout1->setMargin(8);
+ vboxLayout1->setContentsMargins(8, 8, 8, 8);
vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
includeHintsTextEdit = new QTextEdit(includeHintsGroupBox);
includeHintsTextEdit->setObjectName(QString::fromUtf8("includeHintsTextEdit"));
@@ -235,7 +235,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout1->setSpacing(6);
#endif
- hboxLayout1->setMargin(0);
+ hboxLayout1->setContentsMargins(0, 0, 0, 0);
hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
pixmapFunctionGroupBox = new QGroupBox(FormWindowSettings);
pixmapFunctionGroupBox->setObjectName(QString::fromUtf8("pixmapFunctionGroupBox"));
@@ -244,7 +244,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout2->setSpacing(6);
#endif
- vboxLayout2->setMargin(8);
+ vboxLayout2->setContentsMargins(8, 8, 8, 8);
vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
pixmapFunctionLineEdit = new QLineEdit(pixmapFunctionGroupBox);
pixmapFunctionLineEdit->setObjectName(QString::fromUtf8("pixmapFunctionLineEdit"));
diff --git a/tests/auto/uic/baseline/helpdialog.ui.h b/tests/auto/uic/baseline/helpdialog.ui.h
index e0d38b3..608dba3 100644
--- a/tests/auto/uic/baseline/helpdialog.ui.h
+++ b/tests/auto/uic/baseline/helpdialog.ui.h
@@ -119,7 +119,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout->setSpacing(6);
#endif
- vboxLayout->setMargin(0);
+ vboxLayout->setContentsMargins(0, 0, 0, 0);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
tabWidget = new QTabWidget(HelpDialog);
tabWidget->setObjectName(QString::fromUtf8("tabWidget"));
@@ -129,7 +129,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout1->setSpacing(6);
#endif
- vboxLayout1->setMargin(5);
+ vboxLayout1->setContentsMargins(5, 5, 5, 5);
vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
listContents = new QTreeWidget(contentPage);
listContents->setObjectName(QString::fromUtf8("listContents"));
@@ -146,7 +146,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout2->setSpacing(6);
#endif
- vboxLayout2->setMargin(5);
+ vboxLayout2->setContentsMargins(5, 5, 5, 5);
vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
TextLabel1 = new QLabel(indexPage);
TextLabel1->setObjectName(QString::fromUtf8("TextLabel1"));
@@ -171,7 +171,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout3->setSpacing(6);
#endif
- vboxLayout3->setMargin(5);
+ vboxLayout3->setContentsMargins(5, 5, 5, 5);
vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
listBookmarks = new QTreeWidget(bookmarkPage);
listBookmarks->setObjectName(QString::fromUtf8("listBookmarks"));
@@ -184,7 +184,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout->setSpacing(6);
#endif
- hboxLayout->setMargin(0);
+ hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
spacerItem = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -210,7 +210,7 @@ public:
#ifndef Q_OS_MAC
gridLayout->setSpacing(6);
#endif
- gridLayout->setMargin(5);
+ gridLayout->setContentsMargins(5, 5, 5, 5);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
spacerItem1 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Fixed);
@@ -241,7 +241,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout1->setSpacing(6);
#endif
- hboxLayout1->setMargin(1);
+ hboxLayout1->setContentsMargins(1, 1, 1, 1);
hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
helpButton = new QPushButton(searchPage);
helpButton->setObjectName(QString::fromUtf8("helpButton"));
@@ -273,7 +273,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout2->setSpacing(6);
#endif
- hboxLayout2->setMargin(3);
+ hboxLayout2->setContentsMargins(3, 3, 3, 3);
hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
labelPrepare = new QLabel(framePrepare);
labelPrepare->setObjectName(QString::fromUtf8("labelPrepare"));
diff --git a/tests/auto/uic/baseline/imagedialog.ui.h b/tests/auto/uic/baseline/imagedialog.ui.h
index fedc757..001532e 100644
--- a/tests/auto/uic/baseline/imagedialog.ui.h
+++ b/tests/auto/uic/baseline/imagedialog.ui.h
@@ -58,7 +58,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"));
vboxLayout->setObjectName(QString::fromUtf8(""));
@@ -66,7 +66,7 @@ public:
#ifndef Q_OS_MAC
gridLayout->setSpacing(6);
#endif
- gridLayout->setMargin(1);
+ gridLayout->setContentsMargins(1, 1, 1, 1);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
gridLayout->setObjectName(QString::fromUtf8(""));
widthLabel = new QLabel(dialog);
@@ -164,7 +164,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout->setSpacing(6);
#endif
- hboxLayout->setMargin(1);
+ hboxLayout->setContentsMargins(1, 1, 1, 1);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
hboxLayout->setObjectName(QString::fromUtf8(""));
spacerItem1 = new QSpacerItem(QSizePolicy::Expanding, QSizePolicy::Minimum);
diff --git a/tests/auto/uic/baseline/listwidgeteditor.ui.h b/tests/auto/uic/baseline/listwidgeteditor.ui.h
index 316ff39..127228c 100644
--- a/tests/auto/uic/baseline/listwidgeteditor.ui.h
+++ b/tests/auto/uic/baseline/listwidgeteditor.ui.h
@@ -102,7 +102,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(qdesigner_internal__ListWidgetEditor);
diff --git a/tests/auto/uic/baseline/mainwindow.ui.h b/tests/auto/uic/baseline/mainwindow.ui.h
index 69e45f5..73a9de2 100644
--- a/tests/auto/uic/baseline/mainwindow.ui.h
+++ b/tests/auto/uic/baseline/mainwindow.ui.h
@@ -102,7 +102,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(centralwidget);
@@ -112,7 +112,7 @@ public:
hboxLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- hboxLayout->setMargin(9);
+ hboxLayout->setContentsMargins(9, 9, 9, 9);
#endif
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
label = new QLabel(groupBox);
@@ -165,7 +165,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"));
chooseFromCodePoints = new QRadioButton(groupBox_2);
@@ -178,7 +178,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout2->setSpacing(6);
#endif
- vboxLayout2->setMargin(0);
+ vboxLayout2->setContentsMargins(0, 0, 0, 0);
vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
characterRangeView = new QListWidget(groupBox_2);
characterRangeView->setObjectName(QString::fromUtf8("characterRangeView"));
@@ -189,7 +189,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout1->setSpacing(6);
#endif
- hboxLayout1->setMargin(0);
+ hboxLayout1->setContentsMargins(0, 0, 0, 0);
hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
selectAll = new QPushButton(groupBox_2);
selectAll->setObjectName(QString::fromUtf8("selectAll"));
@@ -225,7 +225,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout2->setSpacing(6);
#endif
- hboxLayout2->setMargin(0);
+ hboxLayout2->setContentsMargins(0, 0, 0, 0);
hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
label_5 = new QLabel(groupBox_2);
label_5->setObjectName(QString::fromUtf8("label_5"));
@@ -264,7 +264,7 @@ public:
hboxLayout3->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- hboxLayout3->setMargin(9);
+ hboxLayout3->setContentsMargins(9, 9, 9, 9);
#endif
hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
preview = new QLineEdit(groupBox_3);
@@ -282,7 +282,7 @@ public:
hboxLayout4->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- hboxLayout4->setMargin(9);
+ hboxLayout4->setContentsMargins(9, 9, 9, 9);
#endif
hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
label_3 = new QLabel(groupBox_4);
@@ -318,7 +318,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout5->setSpacing(6);
#endif
- hboxLayout5->setMargin(0);
+ hboxLayout5->setContentsMargins(0, 0, 0, 0);
hboxLayout5->setObjectName(QString::fromUtf8("hboxLayout5"));
generate = new QPushButton(centralwidget);
generate->setObjectName(QString::fromUtf8("generate"));
diff --git a/tests/auto/uic/baseline/mainwindowbase.ui.h b/tests/auto/uic/baseline/mainwindowbase.ui.h
index 3b40a5c..4a49f95 100644
--- a/tests/auto/uic/baseline/mainwindowbase.ui.h
+++ b/tests/auto/uic/baseline/mainwindowbase.ui.h
@@ -218,7 +218,7 @@ public:
widget->setGeometry(QRect(0, 28, 724, 587));
hboxLayout = new QHBoxLayout(widget);
hboxLayout->setSpacing(4);
- hboxLayout->setMargin(8);
+ hboxLayout->setContentsMargins(8, 8, 8, 8);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
hboxLayout->setContentsMargins(0, 0, 0, 0);
helpview = new QTextEdit(widget);
@@ -234,13 +234,13 @@ public:
tab1->setObjectName(QString::fromUtf8("tab1"));
vboxLayout = new QVBoxLayout(tab1);
vboxLayout->setSpacing(4);
- vboxLayout->setMargin(4);
+ vboxLayout->setContentsMargins(4, 4, 4, 4);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
GroupBox40 = new QGroupBox(tab1);
GroupBox40->setObjectName(QString::fromUtf8("GroupBox40"));
hboxLayout1 = new QHBoxLayout(GroupBox40);
hboxLayout1->setSpacing(4);
- hboxLayout1->setMargin(8);
+ hboxLayout1->setContentsMargins(8, 8, 8, 8);
hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
gstylebuddy = new QLabel(GroupBox40);
gstylebuddy->setObjectName(QString::fromUtf8("gstylebuddy"));
@@ -264,7 +264,7 @@ public:
groupAutoPalette->setSizePolicy(sizePolicy);
hboxLayout2 = new QHBoxLayout(groupAutoPalette);
hboxLayout2->setSpacing(4);
- hboxLayout2->setMargin(8);
+ hboxLayout2->setContentsMargins(8, 8, 8, 8);
hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
labelMainColor = new QLabel(groupAutoPalette);
labelMainColor->setObjectName(QString::fromUtf8("labelMainColor"));
@@ -317,7 +317,7 @@ public:
GroupBox126->setSizePolicy(sizePolicy2);
gridLayout = new QGridLayout(GroupBox126);
gridLayout->setSpacing(4);
- gridLayout->setMargin(8);
+ gridLayout->setContentsMargins(8, 8, 8, 8);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
TextLabel1 = new QLabel(GroupBox126);
TextLabel1->setObjectName(QString::fromUtf8("TextLabel1"));
@@ -348,13 +348,13 @@ public:
tab2->setObjectName(QString::fromUtf8("tab2"));
vboxLayout1 = new QVBoxLayout(tab2);
vboxLayout1->setSpacing(4);
- vboxLayout1->setMargin(8);
+ vboxLayout1->setContentsMargins(8, 8, 8, 8);
vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
GroupBox1 = new QGroupBox(tab2);
GroupBox1->setObjectName(QString::fromUtf8("GroupBox1"));
gridLayout1 = new QGridLayout(GroupBox1);
gridLayout1->setSpacing(4);
- gridLayout1->setMargin(8);
+ gridLayout1->setContentsMargins(8, 8, 8, 8);
gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
stylecombo = new QComboBox(GroupBox1);
stylecombo->setObjectName(QString::fromUtf8("stylecombo"));
@@ -406,12 +406,12 @@ public:
GroupBox2->setObjectName(QString::fromUtf8("GroupBox2"));
vboxLayout2 = new QVBoxLayout(GroupBox2);
vboxLayout2->setSpacing(4);
- vboxLayout2->setMargin(8);
+ vboxLayout2->setContentsMargins(8, 8, 8, 8);
vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
hboxLayout3 = new QHBoxLayout();
hboxLayout3->setSpacing(4);
#ifndef Q_OS_MAC
- hboxLayout3->setMargin(0);
+ hboxLayout3->setContentsMargins(0, 0, 0, 0);
#endif
hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
famsubbuddy = new QLabel(GroupBox2);
@@ -450,7 +450,7 @@ public:
hboxLayout4 = new QHBoxLayout();
hboxLayout4->setSpacing(4);
- hboxLayout4->setMargin(0);
+ hboxLayout4->setContentsMargins(0, 0, 0, 0);
hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
PushButton2 = new QPushButton(GroupBox2);
PushButton2->setObjectName(QString::fromUtf8("PushButton2"));
@@ -480,7 +480,7 @@ public:
hboxLayout5 = new QHBoxLayout();
hboxLayout5->setSpacing(4);
- hboxLayout5->setMargin(0);
+ hboxLayout5->setContentsMargins(0, 0, 0, 0);
hboxLayout5->setObjectName(QString::fromUtf8("hboxLayout5"));
choosebuddy = new QLabel(GroupBox2);
choosebuddy->setObjectName(QString::fromUtf8("choosebuddy"));
@@ -510,13 +510,13 @@ public:
tab->setObjectName(QString::fromUtf8("tab"));
vboxLayout3 = new QVBoxLayout(tab);
vboxLayout3->setSpacing(4);
- vboxLayout3->setMargin(7);
+ vboxLayout3->setContentsMargins(7, 7, 7, 7);
vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
GroupBox4 = new QGroupBox(tab);
GroupBox4->setObjectName(QString::fromUtf8("GroupBox4"));
gridLayout2 = new QGridLayout(GroupBox4);
gridLayout2->setSpacing(4);
- gridLayout2->setMargin(8);
+ gridLayout2->setContentsMargins(8, 8, 8, 8);
gridLayout2->setObjectName(QString::fromUtf8("gridLayout2"));
dcispin = new QSpinBox(GroupBox4);
dcispin->setObjectName(QString::fromUtf8("dcispin"));
@@ -566,7 +566,7 @@ public:
GroupBox3->setObjectName(QString::fromUtf8("GroupBox3"));
vboxLayout4 = new QVBoxLayout(GroupBox3);
vboxLayout4->setSpacing(4);
- vboxLayout4->setMargin(8);
+ vboxLayout4->setContentsMargins(8, 8, 8, 8);
vboxLayout4->setObjectName(QString::fromUtf8("vboxLayout4"));
effectcheckbox = new QCheckBox(GroupBox3);
effectcheckbox->setObjectName(QString::fromUtf8("effectcheckbox"));
@@ -579,7 +579,7 @@ public:
effectbase->setFrameShadow(QFrame::Plain);
gridLayout3 = new QGridLayout(effectbase);
gridLayout3->setSpacing(4);
- gridLayout3->setMargin(0);
+ gridLayout3->setContentsMargins(0, 0, 0, 0);
gridLayout3->setObjectName(QString::fromUtf8("gridLayout3"));
meffectbuddy = new QLabel(effectbase);
meffectbuddy->setObjectName(QString::fromUtf8("meffectbuddy"));
@@ -632,7 +632,7 @@ public:
GroupBox5->setObjectName(QString::fromUtf8("GroupBox5"));
gridLayout4 = new QGridLayout(GroupBox5);
gridLayout4->setSpacing(4);
- gridLayout4->setMargin(8);
+ gridLayout4->setContentsMargins(8, 8, 8, 8);
gridLayout4->setObjectName(QString::fromUtf8("gridLayout4"));
swbuddy = new QLabel(GroupBox5);
swbuddy->setObjectName(QString::fromUtf8("swbuddy"));
@@ -683,7 +683,7 @@ public:
tab3->setObjectName(QString::fromUtf8("tab3"));
vboxLayout5 = new QVBoxLayout(tab3);
vboxLayout5->setSpacing(4);
- vboxLayout5->setMargin(8);
+ vboxLayout5->setContentsMargins(8, 8, 8, 8);
vboxLayout5->setObjectName(QString::fromUtf8("vboxLayout5"));
fontembeddingcheckbox = new QCheckBox(tab3);
fontembeddingcheckbox->setObjectName(QString::fromUtf8("fontembeddingcheckbox"));
@@ -697,12 +697,12 @@ public:
GroupBox10->setSizePolicy(sizePolicy2);
vboxLayout6 = new QVBoxLayout(GroupBox10);
vboxLayout6->setSpacing(4);
- vboxLayout6->setMargin(8);
+ vboxLayout6->setContentsMargins(8, 8, 8, 8);
vboxLayout6->setObjectName(QString::fromUtf8("vboxLayout6"));
gridLayout5 = new QGridLayout();
gridLayout5->setSpacing(4);
#ifndef Q_OS_MAC
- gridLayout5->setMargin(0);
+ gridLayout5->setContentsMargins(0, 0, 0, 0);
#endif
gridLayout5->setObjectName(QString::fromUtf8("gridLayout5"));
PushButton11 = new QPushButton(GroupBox10);
@@ -730,7 +730,7 @@ public:
gridLayout6 = new QGridLayout();
gridLayout6->setSpacing(4);
- gridLayout6->setMargin(0);
+ gridLayout6->setContentsMargins(0, 0, 0, 0);
gridLayout6->setObjectName(QString::fromUtf8("gridLayout6"));
spacerItem2 = new QSpacerItem(20, 20, QSizePolicy::Minimum, QSizePolicy::Minimum);
diff --git a/tests/auto/uic/baseline/mydialog.ui.h b/tests/auto/uic/baseline/mydialog.ui.h
index 12228c0..17cf6c5 100644
--- a/tests/auto/uic/baseline/mydialog.ui.h
+++ b/tests/auto/uic/baseline/mydialog.ui.h
@@ -40,7 +40,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"));
aLabel = new QLabel(MyDialog);
diff --git a/tests/auto/uic/baseline/myform.ui.h b/tests/auto/uic/baseline/myform.ui.h
index 9aaa709..07e1663 100644
--- a/tests/auto/uic/baseline/myform.ui.h
+++ b/tests/auto/uic/baseline/myform.ui.h
@@ -51,7 +51,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout->setSpacing(6);
#endif
- vboxLayout->setMargin(8);
+ vboxLayout->setContentsMargins(8, 8, 8, 8);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
groupBox = new QGroupBox(Form);
groupBox->setObjectName(QString::fromUtf8("groupBox"));
@@ -59,7 +59,7 @@ public:
#ifndef Q_OS_MAC
gridLayout->setSpacing(6);
#endif
- gridLayout->setMargin(8);
+ gridLayout->setContentsMargins(8, 8, 8, 8);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
radioButton_2 = new QRadioButton(groupBox);
radioButton_2->setObjectName(QString::fromUtf8("radioButton_2"));
diff --git a/tests/auto/uic/baseline/newform.ui.h b/tests/auto/uic/baseline/newform.ui.h
index 46af9cb..37eb709 100644
--- a/tests/auto/uic/baseline/newform.ui.h
+++ b/tests/auto/uic/baseline/newform.ui.h
@@ -89,14 +89,14 @@ public:
vboxLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- vboxLayout->setMargin(9);
+ vboxLayout->setContentsMargins(9, 9, 9, 9);
#endif
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
hboxLayout = new QHBoxLayout();
#ifndef Q_OS_MAC
hboxLayout->setSpacing(6);
#endif
- hboxLayout->setMargin(1);
+ hboxLayout->setContentsMargins(1, 1, 1, 1);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
treeWidget = new QTreeWidget(NewForm);
treeWidget->setObjectName(QString::fromUtf8("treeWidget"));
diff --git a/tests/auto/uic/baseline/pagefold.ui.h b/tests/auto/uic/baseline/pagefold.ui.h
index adff3a3..9c2a453 100644
--- a/tests/auto/uic/baseline/pagefold.ui.h
+++ b/tests/auto/uic/baseline/pagefold.ui.h
@@ -87,7 +87,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"));
mainFrame = new QFrame(centralwidget);
@@ -99,7 +99,7 @@ public:
gridLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- gridLayout->setMargin(9);
+ gridLayout->setContentsMargins(9, 9, 9, 9);
#endif
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
nameCombo = new QComboBox(mainFrame);
diff --git a/tests/auto/uic/baseline/paletteeditor.ui.h b/tests/auto/uic/baseline/paletteeditor.ui.h
index 9310ab8..0dcefb3 100644
--- a/tests/auto/uic/baseline/paletteeditor.ui.h
+++ b/tests/auto/uic/baseline/paletteeditor.ui.h
@@ -106,7 +106,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"));
advancedBox = new QGroupBox(qdesigner_internal__PaletteEditor);
@@ -118,7 +118,7 @@ public:
gridLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- gridLayout->setMargin(9);
+ gridLayout->setContentsMargins(9, 9, 9, 9);
#endif
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
buildButton = new QtColorButton(advancedBox);
@@ -167,7 +167,7 @@ public:
#ifndef Q_OS_MAC
gridLayout1->setSpacing(6);
#endif
- gridLayout1->setMargin(8);
+ gridLayout1->setContentsMargins(8, 8, 8, 8);
gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
disabledRadio = new QRadioButton(GroupBox126);
disabledRadio->setObjectName(QString::fromUtf8("disabledRadio"));
diff --git a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
index 618ddfc..bb2a959 100644
--- a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
+++ b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
@@ -114,7 +114,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout->setSpacing(6);
#endif
- vboxLayout->setMargin(11);
+ vboxLayout->setContentsMargins(11, 11, 11, 11);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
vboxLayout->setObjectName(QString::fromUtf8("unnamed"));
hboxLayout = new QHBoxLayout();
@@ -122,7 +122,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"));
hboxLayout->setObjectName(QString::fromUtf8("unnamed"));
@@ -150,7 +150,7 @@ public:
#ifndef Q_OS_MAC
ButtonGroup1->layout()->setSpacing(6);
#endif
- ButtonGroup1->layout()->setMargin(11);
+ ButtonGroup1->layout()->setContentsMargins(11, 11, 11, 11);
vboxLayout1 = new QVBoxLayout();
QBoxLayout *boxlayout = qobject_cast<QBoxLayout *>(ButtonGroup1->layout());
if (boxlayout)
@@ -179,7 +179,7 @@ public:
#ifndef Q_OS_MAC
groupCentral->layout()->setSpacing(6);
#endif
- groupCentral->layout()->setMargin(11);
+ groupCentral->layout()->setContentsMargins(11, 11, 11, 11);
vboxLayout2 = new QVBoxLayout();
QBoxLayout *boxlayout1 = qobject_cast<QBoxLayout *>(groupCentral->layout());
if (boxlayout1)
@@ -196,7 +196,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout1->setSpacing(6);
#endif
- hboxLayout1->setMargin(0);
+ hboxLayout1->setContentsMargins(0, 0, 0, 0);
hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
hboxLayout1->setObjectName(QString::fromUtf8("unnamed"));
Horizontal_Spacing1 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -237,7 +237,7 @@ public:
#ifndef Q_OS_MAC
groupEffect->layout()->setSpacing(6);
#endif
- groupEffect->layout()->setMargin(11);
+ groupEffect->layout()->setContentsMargins(11, 11, 11, 11);
vboxLayout3 = new QVBoxLayout();
QBoxLayout *boxlayout2 = qobject_cast<QBoxLayout *>(groupEffect->layout());
if (boxlayout2)
@@ -250,7 +250,7 @@ public:
hboxLayout2->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- hboxLayout2->setMargin(0);
+ hboxLayout2->setContentsMargins(0, 0, 0, 0);
#endif
hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
hboxLayout2->setObjectName(QString::fromUtf8("unnamed"));
@@ -272,7 +272,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout3->setSpacing(6);
#endif
- hboxLayout3->setMargin(0);
+ hboxLayout3->setContentsMargins(0, 0, 0, 0);
hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
hboxLayout3->setObjectName(QString::fromUtf8("unnamed"));
Horizontal_Spacing3 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -305,7 +305,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout4->setSpacing(6);
#endif
- hboxLayout4->setMargin(0);
+ hboxLayout4->setContentsMargins(0, 0, 0, 0);
hboxLayout4->setObjectName(QString::fromUtf8("hboxLayout4"));
hboxLayout4->setObjectName(QString::fromUtf8("unnamed"));
Horizontal_Spacing2 = new QSpacerItem(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
diff --git a/tests/auto/uic/baseline/phrasebookbox.ui.h b/tests/auto/uic/baseline/phrasebookbox.ui.h
index c87cbc2..f4abb1b 100644
--- a/tests/auto/uic/baseline/phrasebookbox.ui.h
+++ b/tests/auto/uic/baseline/phrasebookbox.ui.h
@@ -96,7 +96,7 @@ public:
PhraseBookBox->resize(596, 454);
unnamed = new QHBoxLayout(PhraseBookBox);
unnamed->setSpacing(6);
- unnamed->setMargin(11);
+ unnamed->setContentsMargins(11, 11, 11, 11);
unnamed->setObjectName(QString::fromUtf8("unnamed"));
inputsLayout = new QVBoxLayout();
inputsLayout->setSpacing(6);
diff --git a/tests/auto/uic/baseline/previewdialogbase.ui.h b/tests/auto/uic/baseline/previewdialogbase.ui.h
index af65a18..93bfb69 100644
--- a/tests/auto/uic/baseline/previewdialogbase.ui.h
+++ b/tests/auto/uic/baseline/previewdialogbase.ui.h
@@ -55,7 +55,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"));
hboxLayout = new QHBoxLayout();
@@ -63,7 +63,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"));
label = new QLabel(PreviewDialogBase);
@@ -104,7 +104,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout1->setSpacing(6);
#endif
- hboxLayout1->setMargin(0);
+ hboxLayout1->setContentsMargins(0, 0, 0, 0);
hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
pageList = new QTreeWidget(PreviewDialogBase);
pageList->setObjectName(QString::fromUtf8("pageList"));
@@ -133,7 +133,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout2->setSpacing(6);
#endif
- hboxLayout2->setMargin(0);
+ hboxLayout2->setContentsMargins(0, 0, 0, 0);
hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
progressBar = new QProgressBar(PreviewDialogBase);
progressBar->setObjectName(QString::fromUtf8("progressBar"));
diff --git a/tests/auto/uic/baseline/previewwidget.ui.h b/tests/auto/uic/baseline/previewwidget.ui.h
index 71755df..b76aa56 100644
--- a/tests/auto/uic/baseline/previewwidget.ui.h
+++ b/tests/auto/uic/baseline/previewwidget.ui.h
@@ -118,7 +118,7 @@ public:
gridLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- gridLayout->setMargin(9);
+ gridLayout->setContentsMargins(9, 9, 9, 9);
#endif
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
vboxLayout = new QVBoxLayout();
@@ -126,7 +126,7 @@ public:
vboxLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- vboxLayout->setMargin(0);
+ vboxLayout->setContentsMargins(0, 0, 0, 0);
#endif
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
LineEdit1 = new QLineEdit(qdesigner_internal__PreviewWidget);
@@ -143,7 +143,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout->setSpacing(6);
#endif
- hboxLayout->setMargin(0);
+ hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
SpinBox1 = new QSpinBox(qdesigner_internal__PreviewWidget);
SpinBox1->setObjectName(QString::fromUtf8("SpinBox1"));
@@ -196,7 +196,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"));
CheckBox1 = new QCheckBox(ButtonGroup2);
@@ -220,7 +220,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"));
RadioButton1 = new QRadioButton(ButtonGroup1);
diff --git a/tests/auto/uic/baseline/previewwidgetbase.ui.h b/tests/auto/uic/baseline/previewwidgetbase.ui.h
index f69a785..82899b7 100644
--- a/tests/auto/uic/baseline/previewwidgetbase.ui.h
+++ b/tests/auto/uic/baseline/previewwidgetbase.ui.h
@@ -117,7 +117,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout->setSpacing(6);
#endif
- vboxLayout->setMargin(11);
+ vboxLayout->setContentsMargins(11, 11, 11, 11);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
vboxLayout->setObjectName(QString::fromUtf8("unnamed"));
hboxLayout = new QHBoxLayout();
@@ -125,7 +125,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"));
hboxLayout->setObjectName(QString::fromUtf8("unnamed"));
@@ -134,7 +134,7 @@ public:
vboxLayout1->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- vboxLayout1->setMargin(0);
+ vboxLayout1->setContentsMargins(0, 0, 0, 0);
#endif
vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
vboxLayout1->setObjectName(QString::fromUtf8("unnamed"));
@@ -144,7 +144,7 @@ public:
#ifndef Q_OS_MAC
ButtonGroup1->layout()->setSpacing(6);
#endif
- ButtonGroup1->layout()->setMargin(11);
+ ButtonGroup1->layout()->setContentsMargins(11, 11, 11, 11);
vboxLayout2 = new QVBoxLayout();
QBoxLayout *boxlayout = qobject_cast<QBoxLayout *>(ButtonGroup1->layout());
if (boxlayout)
@@ -177,7 +177,7 @@ public:
#ifndef Q_OS_MAC
ButtonGroup2->layout()->setSpacing(6);
#endif
- ButtonGroup2->layout()->setMargin(11);
+ ButtonGroup2->layout()->setContentsMargins(11, 11, 11, 11);
vboxLayout3 = new QVBoxLayout();
QBoxLayout *boxlayout1 = qobject_cast<QBoxLayout *>(ButtonGroup2->layout());
if (boxlayout1)
@@ -212,7 +212,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout4->setSpacing(6);
#endif
- vboxLayout4->setMargin(0);
+ vboxLayout4->setContentsMargins(0, 0, 0, 0);
vboxLayout4->setObjectName(QString::fromUtf8("vboxLayout4"));
vboxLayout4->setObjectName(QString::fromUtf8("unnamed"));
LineEdit1 = new QLineEdit(PreviewWidgetBase);
@@ -229,7 +229,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout1->setSpacing(6);
#endif
- hboxLayout1->setMargin(0);
+ hboxLayout1->setContentsMargins(0, 0, 0, 0);
hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
hboxLayout1->setObjectName(QString::fromUtf8("unnamed"));
SpinBox1 = new QSpinBox(PreviewWidgetBase);
diff --git a/tests/auto/uic/baseline/qpagesetupwidget.ui.h b/tests/auto/uic/baseline/qpagesetupwidget.ui.h
index 628a8eb..f2a68bd 100644
--- a/tests/auto/uic/baseline/qpagesetupwidget.ui.h
+++ b/tests/auto/uic/baseline/qpagesetupwidget.ui.h
@@ -76,7 +76,7 @@ public:
QPageSetupWidget->setObjectName(QString::fromUtf8("QPageSetupWidget"));
QPageSetupWidget->resize(416, 488);
gridLayout_3 = new QGridLayout(QPageSetupWidget);
- gridLayout_3->setMargin(0);
+ gridLayout_3->setContentsMargins(0, 0, 0, 0);
gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3"));
horizontalLayout_4 = new QHBoxLayout();
horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4"));
diff --git a/tests/auto/uic/baseline/qprintpropertieswidget.ui.h b/tests/auto/uic/baseline/qprintpropertieswidget.ui.h
index 75a3e6d..16148ef 100644
--- a/tests/auto/uic/baseline/qprintpropertieswidget.ui.h
+++ b/tests/auto/uic/baseline/qprintpropertieswidget.ui.h
@@ -42,7 +42,7 @@ public:
QPrintPropertiesWidget->setObjectName(QString::fromUtf8("QPrintPropertiesWidget"));
QPrintPropertiesWidget->resize(396, 288);
verticalLayout_4 = new QVBoxLayout(QPrintPropertiesWidget);
- verticalLayout_4->setMargin(0);
+ verticalLayout_4->setContentsMargins(0, 0, 0, 0);
verticalLayout_4->setObjectName(QString::fromUtf8("verticalLayout_4"));
tabs = new QTabWidget(QPrintPropertiesWidget);
tabs->setObjectName(QString::fromUtf8("tabs"));
diff --git a/tests/auto/uic/baseline/qprintsettingsoutput.ui.h b/tests/auto/uic/baseline/qprintsettingsoutput.ui.h
index e51aadb..307582a 100644
--- a/tests/auto/uic/baseline/qprintsettingsoutput.ui.h
+++ b/tests/auto/uic/baseline/qprintsettingsoutput.ui.h
@@ -77,7 +77,7 @@ public:
QPrintSettingsOutput->setObjectName(QString::fromUtf8("QPrintSettingsOutput"));
QPrintSettingsOutput->resize(416, 166);
horizontalLayout_2 = new QHBoxLayout(QPrintSettingsOutput);
- horizontalLayout_2->setMargin(0);
+ horizontalLayout_2->setContentsMargins(0, 0, 0, 0);
horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
tabs = new QTabWidget(QPrintSettingsOutput);
tabs->setObjectName(QString::fromUtf8("tabs"));
@@ -95,7 +95,7 @@ public:
gbPrintRange->setSizePolicy(sizePolicy);
_3 = new QVBoxLayout(gbPrintRange);
_3->setSpacing(4);
- _3->setMargin(6);
+ _3->setContentsMargins(6, 6, 6, 6);
_3->setObjectName(QString::fromUtf8("_3"));
printAll = new QRadioButton(gbPrintRange);
printAll->setObjectName(QString::fromUtf8("printAll"));
@@ -107,7 +107,7 @@ public:
#ifndef Q_OS_MAC
_4->setSpacing(6);
#endif
- _4->setMargin(0);
+ _4->setContentsMargins(0, 0, 0, 0);
_4->setObjectName(QString::fromUtf8("_4"));
printRange = new QRadioButton(gbPrintRange);
printRange->setObjectName(QString::fromUtf8("printRange"));
diff --git a/tests/auto/uic/baseline/qprintwidget.ui.h b/tests/auto/uic/baseline/qprintwidget.ui.h
index f6c0989..7fa0b4f 100644
--- a/tests/auto/uic/baseline/qprintwidget.ui.h
+++ b/tests/auto/uic/baseline/qprintwidget.ui.h
@@ -53,7 +53,7 @@ public:
QPrintWidget->setObjectName(QString::fromUtf8("QPrintWidget"));
QPrintWidget->resize(443, 175);
horizontalLayout_2 = new QHBoxLayout(QPrintWidget);
- horizontalLayout_2->setMargin(0);
+ horizontalLayout_2->setContentsMargins(0, 0, 0, 0);
horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
printerGroup = new QGroupBox(QPrintWidget);
printerGroup->setObjectName(QString::fromUtf8("printerGroup"));
diff --git a/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h b/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h
index f36d0ac..846f34d 100644
--- a/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h
+++ b/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h
@@ -65,7 +65,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout->setSpacing(6);
#endif
- vboxLayout->setMargin(8);
+ vboxLayout->setContentsMargins(8, 8, 8, 8);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
connGroupBox = new QGroupBox(QSqlConnectionDialogUi);
connGroupBox->setObjectName(QString::fromUtf8("connGroupBox"));
@@ -73,7 +73,7 @@ public:
#ifndef Q_OS_MAC
gridLayout->setSpacing(6);
#endif
- gridLayout->setMargin(8);
+ gridLayout->setContentsMargins(8, 8, 8, 8);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
comboDriver = new QComboBox(connGroupBox);
comboDriver->setObjectName(QString::fromUtf8("comboDriver"));
@@ -146,7 +146,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout->setSpacing(6);
#endif
- hboxLayout->setMargin(0);
+ hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
spacerItem = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
@@ -164,7 +164,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(20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
diff --git a/tests/auto/uic/baseline/qttoolbardialog.ui.h b/tests/auto/uic/baseline/qttoolbardialog.ui.h
index 3b487c3..7225eda 100644
--- a/tests/auto/uic/baseline/qttoolbardialog.ui.h
+++ b/tests/auto/uic/baseline/qttoolbardialog.ui.h
@@ -59,7 +59,7 @@ public:
#ifndef Q_OS_MAC
gridLayout->setSpacing(6);
#endif
- gridLayout->setMargin(8);
+ gridLayout->setContentsMargins(8, 8, 8, 8);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
actionTree = new QTreeWidget(QtToolBarDialog);
actionTree->setObjectName(QString::fromUtf8("actionTree"));
@@ -75,7 +75,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout->setSpacing(6);
#endif
- hboxLayout->setMargin(0);
+ hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
label_2 = new QLabel(QtToolBarDialog);
label_2->setObjectName(QString::fromUtf8("label_2"));
@@ -104,7 +104,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout->setSpacing(6);
#endif
- vboxLayout->setMargin(0);
+ vboxLayout->setContentsMargins(0, 0, 0, 0);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
upButton = new QToolButton(QtToolBarDialog);
upButton->setObjectName(QString::fromUtf8("upButton"));
diff --git a/tests/auto/uic/baseline/querywidget.ui.h b/tests/auto/uic/baseline/querywidget.ui.h
index e49c197..7697328 100644
--- a/tests/auto/uic/baseline/querywidget.ui.h
+++ b/tests/auto/uic/baseline/querywidget.ui.h
@@ -62,7 +62,7 @@ public:
vboxLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- vboxLayout->setMargin(0);
+ vboxLayout->setContentsMargins(0, 0, 0, 0);
#endif
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
inputGroupBox = new QGroupBox(centralwidget);
@@ -75,7 +75,7 @@ public:
_2->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- _2->setMargin(0);
+ _2->setContentsMargins(0, 0, 0, 0);
#endif
_2->setObjectName(QString::fromUtf8("_2"));
inputTextEdit = new QTextEdit(inputGroupBox);
@@ -120,7 +120,7 @@ public:
_3->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- _3->setMargin(0);
+ _3->setContentsMargins(0, 0, 0, 0);
#endif
_3->setObjectName(QString::fromUtf8("_3"));
outputTextEdit = new QTextEdit(outputGroupBox);
diff --git a/tests/auto/uic/baseline/remotecontrol.ui.h b/tests/auto/uic/baseline/remotecontrol.ui.h
index b8acf9d..854a994 100644
--- a/tests/auto/uic/baseline/remotecontrol.ui.h
+++ b/tests/auto/uic/baseline/remotecontrol.ui.h
@@ -77,7 +77,7 @@ public:
centralWidget->setObjectName(QString::fromUtf8("centralWidget"));
gridLayout = new QGridLayout(centralWidget);
gridLayout->setSpacing(6);
- gridLayout->setMargin(11);
+ gridLayout->setContentsMargins(11, 11, 11, 11);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
label = new QLabel(centralWidget);
label->setObjectName(QString::fromUtf8("label"));
@@ -107,7 +107,7 @@ public:
actionGroupBox->setEnabled(false);
gridLayout1 = new QGridLayout(actionGroupBox);
gridLayout1->setSpacing(6);
- gridLayout1->setMargin(11);
+ gridLayout1->setContentsMargins(11, 11, 11, 11);
gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
label_2 = new QLabel(actionGroupBox);
label_2->setObjectName(QString::fromUtf8("label_2"));
diff --git a/tests/auto/uic/baseline/signalslotdialog.ui.h b/tests/auto/uic/baseline/signalslotdialog.ui.h
index 393532a..6adcf21 100644
--- a/tests/auto/uic/baseline/signalslotdialog.ui.h
+++ b/tests/auto/uic/baseline/signalslotdialog.ui.h
@@ -53,13 +53,13 @@ public:
SignalSlotDialogClass->resize(617, 535);
vboxLayout = new QVBoxLayout(SignalSlotDialogClass);
vboxLayout->setSpacing(6);
- vboxLayout->setMargin(11);
+ vboxLayout->setContentsMargins(11, 11, 11, 11);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
slotGroupBox = new QGroupBox(SignalSlotDialogClass);
slotGroupBox->setObjectName(QString::fromUtf8("slotGroupBox"));
vboxLayout1 = new QVBoxLayout(slotGroupBox);
vboxLayout1->setSpacing(6);
- vboxLayout1->setMargin(11);
+ vboxLayout1->setContentsMargins(11, 11, 11, 11);
vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
slotListView = new QListView(slotGroupBox);
slotListView->setObjectName(QString::fromUtf8("slotListView"));
@@ -93,7 +93,7 @@ public:
signalGroupBox->setObjectName(QString::fromUtf8("signalGroupBox"));
vboxLayout2 = new QVBoxLayout(signalGroupBox);
vboxLayout2->setSpacing(6);
- vboxLayout2->setMargin(11);
+ vboxLayout2->setContentsMargins(11, 11, 11, 11);
vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
signalListView = new QListView(signalGroupBox);
signalListView->setObjectName(QString::fromUtf8("signalListView"));
diff --git a/tests/auto/uic/baseline/statistics.ui.h b/tests/auto/uic/baseline/statistics.ui.h
index eb24cfe..b8257c4 100644
--- a/tests/auto/uic/baseline/statistics.ui.h
+++ b/tests/auto/uic/baseline/statistics.ui.h
@@ -97,7 +97,7 @@ public:
Statistics->resize(336, 164);
gridLayout = new QGridLayout(Statistics);
gridLayout->setSpacing(6);
- gridLayout->setMargin(11);
+ gridLayout->setContentsMargins(11, 11, 11, 11);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
gridLayout->setObjectName(QString::fromUtf8("unnamed"));
hboxLayout = new QHBoxLayout();
@@ -126,7 +126,7 @@ public:
frame4->setFrameShadow(QFrame::Raised);
gridLayout1 = new QGridLayout(frame4);
gridLayout1->setSpacing(6);
- gridLayout1->setMargin(11);
+ gridLayout1->setContentsMargins(11, 11, 11, 11);
gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
gridLayout1->setObjectName(QString::fromUtf8("unnamed"));
textLabel4 = new QLabel(frame4);
diff --git a/tests/auto/uic/baseline/stringlisteditor.ui.h b/tests/auto/uic/baseline/stringlisteditor.ui.h
index ffba0af..e6daa52 100644
--- a/tests/auto/uic/baseline/stringlisteditor.ui.h
+++ b/tests/auto/uic/baseline/stringlisteditor.ui.h
@@ -105,7 +105,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(qdesigner_internal__Dialog);
@@ -115,7 +115,7 @@ public:
gridLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- gridLayout->setMargin(9);
+ gridLayout->setContentsMargins(9, 9, 9, 9);
#endif
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
vboxLayout1 = new QVBoxLayout();
@@ -123,7 +123,7 @@ public:
vboxLayout1->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- vboxLayout1->setMargin(0);
+ vboxLayout1->setContentsMargins(0, 0, 0, 0);
#endif
vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
hboxLayout = new QHBoxLayout();
@@ -131,7 +131,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"));
newButton = new QToolButton(groupBox);
@@ -157,7 +157,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout1->setSpacing(6);
#endif
- hboxLayout1->setMargin(0);
+ hboxLayout1->setContentsMargins(0, 0, 0, 0);
hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
label = new QLabel(groupBox);
label->setObjectName(QString::fromUtf8("label"));
@@ -179,7 +179,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout2->setSpacing(6);
#endif
- vboxLayout2->setMargin(0);
+ vboxLayout2->setContentsMargins(0, 0, 0, 0);
vboxLayout2->setObjectName(QString::fromUtf8("vboxLayout2"));
spacerItem1 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
diff --git a/tests/auto/uic/baseline/stylesheeteditor.ui.h b/tests/auto/uic/baseline/stylesheeteditor.ui.h
index 9f803c6..7633d5b 100644
--- a/tests/auto/uic/baseline/stylesheeteditor.ui.h
+++ b/tests/auto/uic/baseline/stylesheeteditor.ui.h
@@ -52,7 +52,7 @@ public:
gridLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- gridLayout->setMargin(9);
+ gridLayout->setContentsMargins(9, 9, 9, 9);
#endif
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
spacerItem = new QSpacerItem(32, 20, QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
@@ -96,7 +96,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout->setSpacing(6);
#endif
- hboxLayout->setMargin(0);
+ hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
spacerItem3 = new QSpacerItem(321, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
diff --git a/tests/auto/uic/baseline/tabbedbrowser.ui.h b/tests/auto/uic/baseline/tabbedbrowser.ui.h
index ecf9024..1106f13 100644
--- a/tests/auto/uic/baseline/tabbedbrowser.ui.h
+++ b/tests/auto/uic/baseline/tabbedbrowser.ui.h
@@ -96,7 +96,7 @@ public:
TabbedBrowser->resize(710, 664);
vboxLayout = new QVBoxLayout(TabbedBrowser);
vboxLayout->setSpacing(0);
- vboxLayout->setMargin(0);
+ vboxLayout->setContentsMargins(0, 0, 0, 0);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
tab = new QTabWidget(TabbedBrowser);
tab->setObjectName(QString::fromUtf8("tab"));
@@ -106,7 +106,7 @@ public:
#ifndef Q_OS_MAC
gridLayout->setSpacing(6);
#endif
- gridLayout->setMargin(8);
+ gridLayout->setContentsMargins(8, 8, 8, 8);
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
tab->addTab(frontpage, QString());
@@ -120,7 +120,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout->setSpacing(6);
#endif
- hboxLayout->setMargin(0);
+ hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
toolClose = new QToolButton(frameFind);
toolClose->setObjectName(QString::fromUtf8("toolClose"));
diff --git a/tests/auto/uic/baseline/tablewidgeteditor.ui.h b/tests/auto/uic/baseline/tablewidgeteditor.ui.h
index 47649ec..4769c42 100644
--- a/tests/auto/uic/baseline/tablewidgeteditor.ui.h
+++ b/tests/auto/uic/baseline/tablewidgeteditor.ui.h
@@ -169,7 +169,7 @@ public:
sizePolicy.setHeightForWidth(widget->sizePolicy().hasHeightForWidth());
widget->setSizePolicy(sizePolicy);
verticalLayout = new QVBoxLayout(widget);
- verticalLayout->setMargin(0);
+ verticalLayout->setContentsMargins(0, 0, 0, 0);
verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
columnsBox = new QGroupBox(widget);
columnsBox->setObjectName(QString::fromUtf8("columnsBox"));
diff --git a/tests/auto/uic/baseline/tetrixwindow.ui.h b/tests/auto/uic/baseline/tetrixwindow.ui.h
index 73f1a79..a848545 100644
--- a/tests/auto/uic/baseline/tetrixwindow.ui.h
+++ b/tests/auto/uic/baseline/tetrixwindow.ui.h
@@ -53,7 +53,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"));
gridLayout = new QGridLayout();
@@ -61,7 +61,7 @@ public:
gridLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- gridLayout->setMargin(0);
+ gridLayout->setContentsMargins(0, 0, 0, 0);
#endif
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
startButton = new QPushButton(TetrixWindow);
diff --git a/tests/auto/uic/baseline/textfinder.ui.h b/tests/auto/uic/baseline/textfinder.ui.h
index afb1bec..f1d51f9 100644
--- a/tests/auto/uic/baseline/textfinder.ui.h
+++ b/tests/auto/uic/baseline/textfinder.ui.h
@@ -47,7 +47,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"));
gridLayout = new QGridLayout();
@@ -55,7 +55,7 @@ public:
gridLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- gridLayout->setMargin(0);
+ gridLayout->setContentsMargins(0, 0, 0, 0);
#endif
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
lineEdit = new QLineEdit(Form);
diff --git a/tests/auto/uic/baseline/topicchooser.ui.h b/tests/auto/uic/baseline/topicchooser.ui.h
index 810f11a..8404d0c 100644
--- a/tests/auto/uic/baseline/topicchooser.ui.h
+++ b/tests/auto/uic/baseline/topicchooser.ui.h
@@ -48,7 +48,7 @@ public:
#ifndef Q_OS_MAC
vboxLayout->setSpacing(6);
#endif
- vboxLayout->setMargin(11);
+ vboxLayout->setContentsMargins(11, 11, 11, 11);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
vboxLayout->setObjectName(QString::fromUtf8("unnamed"));
label = new QLabel(TopicChooser);
@@ -67,7 +67,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout->setSpacing(6);
#endif
- hboxLayout->setMargin(0);
+ hboxLayout->setContentsMargins(0, 0, 0, 0);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
hboxLayout->setObjectName(QString::fromUtf8("unnamed"));
hboxLayout->setContentsMargins(0, 0, 0, 0);
diff --git a/tests/auto/uic/baseline/translatedialog.ui.h b/tests/auto/uic/baseline/translatedialog.ui.h
index ec4a0f4..b0df4b5 100644
--- a/tests/auto/uic/baseline/translatedialog.ui.h
+++ b/tests/auto/uic/baseline/translatedialog.ui.h
@@ -104,7 +104,7 @@ public:
TranslateDialog->setSizePolicy(sizePolicy);
hboxLayout = new QHBoxLayout(TranslateDialog);
hboxLayout->setSpacing(6);
- hboxLayout->setMargin(11);
+ hboxLayout->setContentsMargins(11, 11, 11, 11);
hboxLayout->setObjectName(QString::fromUtf8("hboxLayout"));
hboxLayout->setContentsMargins(9, 9, 9, 9);
vboxLayout = new QVBoxLayout();
@@ -144,7 +144,7 @@ public:
groupBox->setObjectName(QString::fromUtf8("groupBox"));
vboxLayout1 = new QVBoxLayout(groupBox);
vboxLayout1->setSpacing(6);
- vboxLayout1->setMargin(11);
+ vboxLayout1->setContentsMargins(11, 11, 11, 11);
vboxLayout1->setObjectName(QString::fromUtf8("vboxLayout1"));
ckMatchCase = new QCheckBox(groupBox);
ckMatchCase->setObjectName(QString::fromUtf8("ckMatchCase"));
diff --git a/tests/auto/uic/baseline/translationsettings.ui.h b/tests/auto/uic/baseline/translationsettings.ui.h
index 792b733..7ce0485 100644
--- a/tests/auto/uic/baseline/translationsettings.ui.h
+++ b/tests/auto/uic/baseline/translationsettings.ui.h
@@ -47,7 +47,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(TranslationSettings);
@@ -57,7 +57,7 @@ public:
gridLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- gridLayout->setMargin(9);
+ gridLayout->setContentsMargins(9, 9, 9, 9);
#endif
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
cbLanguageList = new QComboBox(groupBox);
diff --git a/tests/auto/uic/baseline/trpreviewtool.ui.h b/tests/auto/uic/baseline/trpreviewtool.ui.h
index e607763..2575cda 100644
--- a/tests/auto/uic/baseline/trpreviewtool.ui.h
+++ b/tests/auto/uic/baseline/trpreviewtool.ui.h
@@ -142,7 +142,7 @@ public:
dockWidgetContents->setObjectName(QString::fromUtf8("dockWidgetContents"));
vboxLayout = new QVBoxLayout(dockWidgetContents);
vboxLayout->setSpacing(0);
- vboxLayout->setMargin(0);
+ vboxLayout->setContentsMargins(0, 0, 0, 0);
vboxLayout->setObjectName(QString::fromUtf8("vboxLayout"));
viewForms = new QListView(dockWidgetContents);
viewForms->setObjectName(QString::fromUtf8("viewForms"));
diff --git a/tests/auto/uic/baseline/validators.ui.h b/tests/auto/uic/baseline/validators.ui.h
index ea5d319..03bc898 100644
--- a/tests/auto/uic/baseline/validators.ui.h
+++ b/tests/auto/uic/baseline/validators.ui.h
@@ -87,7 +87,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"));
hboxLayout = new QHBoxLayout();
@@ -95,7 +95,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"));
localeSelector = new LocaleSelector(ValidatorsForm);
@@ -117,7 +117,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"));
hboxLayout1 = new QHBoxLayout();
@@ -125,7 +125,7 @@ public:
hboxLayout1->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- hboxLayout1->setMargin(0);
+ hboxLayout1->setContentsMargins(0, 0, 0, 0);
#endif
hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1"));
gridLayout = new QGridLayout();
@@ -133,7 +133,7 @@ public:
gridLayout->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- gridLayout->setMargin(0);
+ gridLayout->setContentsMargins(0, 0, 0, 0);
#endif
gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
label = new QLabel(groupBox);
@@ -182,7 +182,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"));
ledWidget = new LEDWidget(frame);
@@ -227,7 +227,7 @@ public:
vboxLayout3->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- vboxLayout3->setMargin(9);
+ vboxLayout3->setContentsMargins(9, 9, 9, 9);
#endif
vboxLayout3->setObjectName(QString::fromUtf8("vboxLayout3"));
hboxLayout2 = new QHBoxLayout();
@@ -235,7 +235,7 @@ public:
hboxLayout2->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- hboxLayout2->setMargin(0);
+ hboxLayout2->setContentsMargins(0, 0, 0, 0);
#endif
hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2"));
gridLayout1 = new QGridLayout();
@@ -243,7 +243,7 @@ public:
gridLayout1->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- gridLayout1->setMargin(0);
+ gridLayout1->setContentsMargins(0, 0, 0, 0);
#endif
gridLayout1->setObjectName(QString::fromUtf8("gridLayout1"));
label_3 = new QLabel(groupBox_2);
@@ -313,7 +313,7 @@ public:
vboxLayout4->setSpacing(6);
#endif
#ifndef Q_OS_MAC
- vboxLayout4->setMargin(9);
+ vboxLayout4->setContentsMargins(9, 9, 9, 9);
#endif
vboxLayout4->setObjectName(QString::fromUtf8("vboxLayout4"));
doubleLedWidget = new LEDWidget(frame_2);
@@ -354,7 +354,7 @@ public:
#ifndef Q_OS_MAC
hboxLayout3->setSpacing(6);
#endif
- hboxLayout3->setMargin(0);
+ hboxLayout3->setContentsMargins(0, 0, 0, 0);
hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3"));
spacerItem4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
diff --git a/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp b/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp
index 67e1184..045bfca 100644
--- a/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp
+++ b/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp
@@ -50,6 +50,7 @@
#include <formwindowbase_p.h>
#include <qdesigner_utils_p.h>
#include <qdesigner_dockwidget_p.h>
+#include <qsimpleresource_p.h>
#include <QtDesigner/QDesignerFormEditorInterface>
#include <QtDesigner/QDesignerFormWindowManagerInterface>
@@ -84,6 +85,7 @@ protected:
virtual QWidget *create(DomWidget *ui_widget, QWidget *parents);
virtual QWidget *createWidget(const QString &widgetName, QWidget *parentWidget, const QString &name);
+ virtual void createCustomWidgets(DomCustomWidgets *);
};
WidgetBoxResource::WidgetBoxResource(QDesignerFormEditorInterface *core) :
@@ -120,6 +122,14 @@ QWidget *WidgetBoxResource::create(DomWidget *ui_widget, QWidget *parent)
return result;
}
+void WidgetBoxResource::createCustomWidgets(DomCustomWidgets *dc)
+{
+ // Make a promotion entry in case someone has a promoted widget
+ // in the scratchpad.
+ QSimpleResource::handleDomCustomWidgets(core(), dc);
+
+}
+
/*******************************************************************************
** WidgetBoxResource
*/