diff options
| author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-11-21 11:32:01 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-11-21 11:32:01 +0100 |
| commit | 546539562f2aff985e78f3c2426cb711a865ad65 (patch) | |
| tree | a4fac78b563b8b1d4bd40ee13bf5db3f4afdade8 /tests/auto/qquickpopup/tst_qquickpopup.cpp | |
| parent | 9c054dd5d2925adbb1ac9745013011a16f78023f (diff) | |
| parent | 49b1e3ff2ac20d8aa8b3889fc76ab4e6907817fd (diff) | |
Merge 5.14 into 5.14.0
Change-Id: I579dc498300e06d747bdc4dba12f7ecd617b6608
Diffstat (limited to 'tests/auto/qquickpopup/tst_qquickpopup.cpp')
| -rw-r--r-- | tests/auto/qquickpopup/tst_qquickpopup.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/qquickpopup/tst_qquickpopup.cpp b/tests/auto/qquickpopup/tst_qquickpopup.cpp index 7da20c37..b5c59e02 100644 --- a/tests/auto/qquickpopup/tst_qquickpopup.cpp +++ b/tests/auto/qquickpopup/tst_qquickpopup.cpp @@ -1026,12 +1026,13 @@ void tst_QQuickPopup::closeOnEscapeWithVisiblePopup() QQuickApplicationHelper helper(this, QStringLiteral("closeOnEscapeWithVisiblePopup.qml")); QQuickWindow *window = helper.window; window->show(); - QVERIFY(QTest::qWaitForWindowExposed(window)); + QVERIFY(QTest::qWaitForWindowActive(window)); QQuickPopup *popup = window->findChild<QQuickPopup *>("popup"); QVERIFY(popup); QTRY_VERIFY(popup->isOpened()); + QTRY_VERIFY(window->activeFocusItem()); QTest::keyClick(window, Qt::Key_Escape); QTRY_VERIFY(!popup->isVisible()); } |