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/signalslotdialog.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/signalslotdialog.ui.h')
-rw-r--r-- | tests/auto/uic/baseline/signalslotdialog.ui.h | 6 |
1 files changed, 3 insertions, 3 deletions
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")); |