diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-06-16 13:52:36 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2009-06-16 13:52:36 (GMT) |
| commit | 2543decb7ead117fcbea2ef0618ccaedf0f1b2f4 (patch) | |
| tree | fc2aa2525f0e3c915ea6a369b3b9a9e67fe564ee /tests/auto/uic/baseline/form.ui.h | |
| parent | 237a3e690f290fd8ef8ef2a51459caa7fdc7bef1 (diff) | |
| download | Qt-2543decb7ead117fcbea2ef0618ccaedf0f1b2f4.zip Qt-2543decb7ead117fcbea2ef0618ccaedf0f1b2f4.tar.gz Qt-2543decb7ead117fcbea2ef0618ccaedf0f1b2f4.tar.bz2 | |
Made uic generate QLayout::setContentsMargin instead of setMargin.
With the exception of layout functions, which is too weird.
Task-number: 255846
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")); |