summaryrefslogtreecommitdiffstats
path: root/tests/auto/uic/baseline/tabbedbrowser.ui.h
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 /tests/auto/uic/baseline/tabbedbrowser.ui.h
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
Diffstat (limited to 'tests/auto/uic/baseline/tabbedbrowser.ui.h')
-rw-r--r--tests/auto/uic/baseline/tabbedbrowser.ui.h6
1 files changed, 3 insertions, 3 deletions
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"));