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