diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2012-12-20 15:16:30 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-20 21:16:53 +0100 |
commit | 71fdc0d8a65c1927d5fd2c94fb2926fdd278290b (patch) | |
tree | 54f6f98e96c40c1c7ce087b896d069ff96ef3f14 | |
parent | 92243bc346aa3b99bb0a9ad356ef5cdb190bfbca (diff) |
Tests: stabilize tst_QAbstractScrollArea::setScrollBars2()
Use QWidget::isVisibleTo(parent) instead of isVisible(), just like
QAbstractScrollArea::replaceScrollBar() does. This removes the need
of using QCoreApplication::processEvents() to deliver the actual
hide event just for testing if the scrollbar was requested to be
hidden as it should.
Change-Id: Ie9a816e7b871d280a4b3d9d76adb10601915bd56
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
-rw-r--r-- | tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp index 0420ecf1e0..d39b187c8b 100644 --- a/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp +++ b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp @@ -238,17 +238,17 @@ void tst_QAbstractScrollArea::setScrollBars2() // Hide the OLD scroll bar and ensure that the NEW one is hidden. hbar->hide(); - scrollArea.setHorizontalScrollBar(new QScrollBar); - qApp->processEvents(); - QVERIFY(!scrollArea.horizontalScrollBar()->isVisible()); + hbar = new QScrollBar(&scrollArea); + scrollArea.setHorizontalScrollBar(hbar); + QVERIFY(!hbar->isVisibleTo(hbar->parentWidget())); vbar->hide(); - scrollArea.setVerticalScrollBar(new QScrollBar); - qApp->processEvents(); - QVERIFY(!scrollArea.verticalScrollBar()->isVisible()); + vbar = new QScrollBar(&scrollArea); + scrollArea.setVerticalScrollBar(vbar); + QVERIFY(!vbar->isVisibleTo(vbar->parentWidget())); - scrollArea.verticalScrollBar()->show(); - scrollArea.horizontalScrollBar()->show(); + vbar->show(); + hbar->show(); // Hide the NEW scroll bar and ensure that it's visible // (because the OLD one is visible). |