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/remotecontrol.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/remotecontrol.ui.h')
| -rw-r--r-- | tests/auto/uic/baseline/remotecontrol.ui.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/uic/baseline/remotecontrol.ui.h b/tests/auto/uic/baseline/remotecontrol.ui.h index b8acf9d..854a994 100644 --- a/tests/auto/uic/baseline/remotecontrol.ui.h +++ b/tests/auto/uic/baseline/remotecontrol.ui.h @@ -77,7 +77,7 @@ public: centralWidget->setObjectName(QString::fromUtf8("centralWidget")); gridLayout = new QGridLayout(centralWidget); gridLayout->setSpacing(6); - gridLayout->setMargin(11); + gridLayout->setContentsMargins(11, 11, 11, 11); gridLayout->setObjectName(QString::fromUtf8("gridLayout")); label = new QLabel(centralWidget); label->setObjectName(QString::fromUtf8("label")); @@ -107,7 +107,7 @@ public: actionGroupBox->setEnabled(false); gridLayout1 = new QGridLayout(actionGroupBox); gridLayout1->setSpacing(6); - gridLayout1->setMargin(11); + gridLayout1->setContentsMargins(11, 11, 11, 11); gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); label_2 = new QLabel(actionGroupBox); label_2->setObjectName(QString::fromUtf8("label_2")); |