diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-21 10:34:41 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-11-21 10:34:41 +0100 |
| commit | c08ec43406c4ebe2e93942a8b07871c73aafde51 (patch) | |
| tree | 69e84f955ce6d0f66d39eae36b07ae0f8ef65e56 /tests/auto/quickwidgets | |
| parent | 242067390f3bd891b162164a2d01a3a982c64fa2 (diff) | |
| parent | 5b82c1b7abc515274e6348136356bbf8f1374e4a (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I3567f741394f912d4312460e85555b6c39b61cb4
Diffstat (limited to 'tests/auto/quickwidgets')
| -rw-r--r-- | tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp b/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp index 7cc5dfa7c6..79ff18011d 100644 --- a/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp +++ b/tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp @@ -75,8 +75,12 @@ void tst_qquickwidget::showHide() window.show(); QVERIFY(QTest::qWaitForWindowExposed(&window, 5000)); + QVERIFY(childView->quickWindow()->isVisible()); + QVERIFY(childView->quickWindow()->visibility() != QWindow::Hidden); - childView->hide(); + window.hide(); + QVERIFY(!childView->quickWindow()->isVisible()); + QCOMPARE(childView->quickWindow()->visibility(), QWindow::Hidden); } void tst_qquickwidget::reparentAfterShow() |