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/topicchooser.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/topicchooser.ui.h')
| -rw-r--r-- | tests/auto/uic/baseline/topicchooser.ui.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/uic/baseline/topicchooser.ui.h b/tests/auto/uic/baseline/topicchooser.ui.h index 810f11a..8404d0c 100644 --- a/tests/auto/uic/baseline/topicchooser.ui.h +++ b/tests/auto/uic/baseline/topicchooser.ui.h @@ -48,7 +48,7 @@ public: #ifndef Q_OS_MAC vboxLayout->setSpacing(6); #endif - vboxLayout->setMargin(11); + vboxLayout->setContentsMargins(11, 11, 11, 11); vboxLayout->setObjectName(QString::fromUtf8("vboxLayout")); vboxLayout->setObjectName(QString::fromUtf8("unnamed")); label = new QLabel(TopicChooser); @@ -67,7 +67,7 @@ public: #ifndef Q_OS_MAC hboxLayout->setSpacing(6); #endif - hboxLayout->setMargin(0); + hboxLayout->setContentsMargins(0, 0, 0, 0); hboxLayout->setObjectName(QString::fromUtf8("hboxLayout")); hboxLayout->setObjectName(QString::fromUtf8("unnamed")); hboxLayout->setContentsMargins(0, 0, 0, 0); |