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/paletteeditor.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/paletteeditor.ui.h')
-rw-r--r-- | tests/auto/uic/baseline/paletteeditor.ui.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/uic/baseline/paletteeditor.ui.h b/tests/auto/uic/baseline/paletteeditor.ui.h index 9310ab8..0dcefb3 100644 --- a/tests/auto/uic/baseline/paletteeditor.ui.h +++ b/tests/auto/uic/baseline/paletteeditor.ui.h @@ -106,7 +106,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")); advancedBox = new QGroupBox(qdesigner_internal__PaletteEditor); @@ -118,7 +118,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")); buildButton = new QtColorButton(advancedBox); @@ -167,7 +167,7 @@ public: #ifndef Q_OS_MAC gridLayout1->setSpacing(6); #endif - gridLayout1->setMargin(8); + gridLayout1->setContentsMargins(8, 8, 8, 8); gridLayout1->setObjectName(QString::fromUtf8("gridLayout1")); disabledRadio = new QRadioButton(GroupBox126); disabledRadio->setObjectName(QString::fromUtf8("disabledRadio")); |