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/chatmainwindow.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/chatmainwindow.ui.h')
| -rw-r--r-- | tests/auto/uic/baseline/chatmainwindow.ui.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/uic/baseline/chatmainwindow.ui.h b/tests/auto/uic/baseline/chatmainwindow.ui.h index b2153e6..93ce435 100644 --- a/tests/auto/uic/baseline/chatmainwindow.ui.h +++ b/tests/auto/uic/baseline/chatmainwindow.ui.h @@ -66,7 +66,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")); vboxLayout = new QVBoxLayout(); @@ -74,7 +74,7 @@ public: vboxLayout->setSpacing(6); #endif #ifndef Q_OS_MAC - vboxLayout->setMargin(0); + vboxLayout->setContentsMargins(0, 0, 0, 0); #endif vboxLayout->setObjectName(QString::fromUtf8("vboxLayout")); chatHistory = new QTextBrowser(centralwidget); @@ -88,7 +88,7 @@ public: #ifndef Q_OS_MAC hboxLayout1->setSpacing(6); #endif - hboxLayout1->setMargin(0); + hboxLayout1->setContentsMargins(0, 0, 0, 0); hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1")); label = new QLabel(centralwidget); label->setObjectName(QString::fromUtf8("label")); |