diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2022-07-01 09:07:25 +0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-07-06 07:25:14 +0000 |
| commit | 405e12b171f444c4ada02b6ab4dc84f10a7b8b42 (patch) | |
| tree | 3224b51e5bfaab00671e2d2e880ba518e2ba83f7 /tests | |
| parent | 06ba1c53695c9bfd1954870bed62513077a314e6 (diff) | |
Simplify tst_qquickfontloader::changeFontSourceViaState
Don't wait for the window to be active and have focus if
we don't need keyboard focus.
Task-number: QTBUG-89927
Change-Id: I77c4064138488fe512a9cf33b16393b9a1c5848b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 28428d7d7d2895af8c56922d6470ff4bb3ecfe62)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp b/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp index 9983997dc1..8bfeb7314a 100644 --- a/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp +++ b/tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp @@ -200,9 +200,7 @@ void tst_qquickfontloader::changeFontSourceViaState() { QQuickView window(testFileUrl("qtbug-20268.qml")); window.show(); - window.requestActivate(); - QVERIFY(QTest::qWaitForWindowActive(&window)); - QCOMPARE(&window, qGuiApp->focusWindow()); + QVERIFY(QTest::qWaitForWindowExposed(&window)); QQuickFontLoader *fontObject = qobject_cast<QQuickFontLoader*>(qvariant_cast<QObject *>(window.rootObject()->property("fontloader"))); QVERIFY(fontObject != nullptr); |