diff options
| author | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-06-16 15:16:09 (GMT) |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-06-16 15:16:09 (GMT) |
| commit | ed358d0f8ecaff49e72accc693c3cf8f09900449 (patch) | |
| tree | 21689389e275df17c79f2adc366a71941e4420ed /tests/auto/uic/baseline/qttoolbardialog.ui.h | |
| parent | e73e36a16bb51fa66bdccc780f177e2c4d5d8092 (diff) | |
| parent | e2451ba6eaac6c8050fd172405c1bf262d4e34d7 (diff) | |
| download | Qt-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/qttoolbardialog.ui.h')
| -rw-r--r-- | tests/auto/uic/baseline/qttoolbardialog.ui.h | 6 |
1 files changed, 3 insertions, 3 deletions
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")); |