diff options
| author | Ulf Hermann <ulf.hermann@digia.com> | 2015-05-27 15:04:48 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-05 05:51:09 +0000 |
| commit | aa7fa616b19d5107b4bcd18945ddd16fe67322c4 (patch) | |
| tree | 100c78399cbe46046e53fd82a40f2bc53edeb4d3 /tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | |
| parent | 8d3750c2e003ede6f895484d2cacaf7b336c6566 (diff) | |
Wait for window activation, not for exposal in key press test
The previous version only worked when simulated input events were
queued and thus incidentally delivered after the window activation
that follows the exposal.
66050f2ac875d451bec31e0d8ff507795b5b18d6 in qtbase made event delivery
synchronous for simulated input events.
Change-Id: Ieea3d1360b32f3466059a2ffe570d6dc633f81dc
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'tests/auto/quick/qquickwindow/tst_qquickwindow.cpp')
| -rw-r--r-- | tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 7d7027dc0d..70226ced4b 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -1878,7 +1878,7 @@ void tst_qquickwindow::qobjectEventFilter_key() window.setPosition(100, 100); window.setTitle(QTest::currentTestFunction()); window.show(); - QVERIFY(QTest::qWaitForWindowExposed(&window)); + QVERIFY(QTest::qWaitForWindowActive(&window)); TestTouchItem *item = new TestTouchItem(window.contentItem()); item->setSize(QSizeF(150, 150)); |