diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-11 08:45:54 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-11 08:45:54 +1000 |
| commit | 6bb93ab2fd79ae0a04c826d9027503b644b6e374 (patch) | |
| tree | 060d9765cf3f009c86fe6e421dac4ea8930d076e /tests/auto/qboxlayout/tst_qboxlayout.cpp | |
| parent | 40db84c97769141f3f2351de1b2d5c64904fe5c2 (diff) | |
| parent | 6c3c9d812a730d5bc1bcd6261befe077a65be594 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'tests/auto/qboxlayout/tst_qboxlayout.cpp')
| -rw-r--r-- | tests/auto/qboxlayout/tst_qboxlayout.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qboxlayout/tst_qboxlayout.cpp b/tests/auto/qboxlayout/tst_qboxlayout.cpp index be6f3dd54..5803985cb 100644 --- a/tests/auto/qboxlayout/tst_qboxlayout.cpp +++ b/tests/auto/qboxlayout/tst_qboxlayout.cpp @@ -222,6 +222,8 @@ void tst_QBoxLayout::setStyleShouldChangeSpacing() QHBoxLayout *hbox = new QHBoxLayout(window); QPushButton *pb1 = new QPushButton(tr("The spacing between this")); QPushButton *pb2 = new QPushButton(tr("and this button should depend on the style of the parent widget"));; + pb1->setAttribute(Qt::WA_LayoutUsesWidgetRect); + pb2->setAttribute(Qt::WA_LayoutUsesWidgetRect); hbox->addWidget(pb1); hbox->addWidget(pb2); CustomLayoutStyle *style1 = new CustomLayoutStyle; @@ -238,7 +240,6 @@ void tst_QBoxLayout::setStyleShouldChangeSpacing() window->setStyle(style2); QTest::qWait(100); spacing = pb2->geometry().left() - pb1->geometry().right() - 1; - QEXPECT_FAIL("", "Fix for next minor release", Continue); QCOMPARE(spacing, 10); delete window; |