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