diff --git a/tests/units/widgets/pageviewtest.cpp b/tests/units/widgets/pageviewtest.cpp --- a/tests/units/widgets/pageviewtest.cpp +++ b/tests/units/widgets/pageviewtest.cpp @@ -275,7 +275,8 @@ auto filterEdit = filter->findChild(); QVERIFY(filterEdit); page.show(); - QVERIFY(QTest::qWaitForWindowExposed(&page)); + page.activateWindow(); + QVERIFY(QTest::qWaitForWindowActive(&page)); centralView->setFocus(); QVERIFY(centralView->hasFocus()); @@ -333,7 +334,8 @@ auto filterEdit = filter->findChild(); QVERIFY(filterEdit); page.show(); - QVERIFY(QTest::qWaitForWindowExposed(&page)); + page.activateWindow(); + QVERIFY(QTest::qWaitForWindowActive(&page)); centralView->setFocus(); QVERIFY(centralView->hasFocus()); @@ -555,8 +557,8 @@ // Needed for shortcuts to work page.show(); - QVERIFY(QTest::qWaitForWindowExposed(&page)); - QTest::qWait(100); + page.activateWindow(); + QVERIFY(QTest::qWaitForWindowActive(&page)); // WHEN QTest::keyPress(centralView, Qt::Key_Delete); @@ -582,8 +584,8 @@ // Needed for shortcuts to work page.show(); - QVERIFY(QTest::qWaitForWindowExposed(&page)); - QTest::qWait(100); + page.activateWindow(); + QVERIFY(QTest::qWaitForWindowActive(&page)); // WHEN QTest::keyPress(centralView, Qt::Key_Delete); @@ -614,8 +616,8 @@ // Needed for shortcuts to work page.show(); - QVERIFY(QTest::qWaitForWindowExposed(&page)); - QTest::qWait(100); + page.activateWindow(); + QVERIFY(QTest::qWaitForWindowActive(&page)); // WHEN QTest::keyPress(centralView, Qt::Key_Delete); @@ -653,8 +655,8 @@ // Needed for shortcuts to work page.show(); - QVERIFY(QTest::qWaitForWindowExposed(&page)); - QTest::qWait(100); + page.activateWindow(); + QVERIFY(QTest::qWaitForWindowActive(&page)); // WHEN QTest::keyPress(centralView, Qt::Key_Delete); @@ -686,8 +688,8 @@ // Needed for shortcuts to work page.show(); - QVERIFY(QTest::qWaitForWindowExposed(&page)); - QTest::qWait(100); + page.activateWindow(); + QVERIFY(QTest::qWaitForWindowActive(&page)); // WHEN QTest::keyPress(centralView, Qt::Key_Delete);