tests: use qWaitForWindowFocused() instead of qWaitForWindowActive()
This depends on 9eb06a2848257d054447777c645231afa87429c2 . Done-with: Inho Lee <inho.lee@qt.io> Task-number: QTBUG-107157 Pick-to: 6.7 Change-Id: I9f4521c27ebc847596a94eed0c9116d71905def2 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> (cherry picked from commit bc7821764b4d50fbb4e0ca1b84f85980ce15eeb0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
9a8835c0d9
commit
1a7f6925ab
@ -2458,8 +2458,8 @@ void tst_QWidget::tabOrderWithProxyDisabled()
|
||||
container.show();
|
||||
container.activateWindow();
|
||||
|
||||
if (!QTest::qWaitForWindowActive(&container))
|
||||
QSKIP("Window failed to activate, skipping test");
|
||||
if (!QTest::qWaitForWindowFocused(&container))
|
||||
QSKIP("Window failed to activate and be focused, skipping test");
|
||||
|
||||
QVERIFY2(lineEdit1.hasFocus(),
|
||||
qPrintable(focusWidgetName()));
|
||||
@ -2629,8 +2629,8 @@ void tst_QWidget::tabOrderWithProxyOutOfOrder()
|
||||
|
||||
container.show();
|
||||
container.activateWindow();
|
||||
if (!QTest::qWaitForWindowActive(&container))
|
||||
QSKIP("Window failed to activate, skipping test");
|
||||
if (!QTest::qWaitForWindowFocused(&container))
|
||||
QSKIP("Window failed to activate and be focused, skipping test");
|
||||
|
||||
QCOMPARE(QApplication::focusWidget(), &outsideButton);
|
||||
container.tab();
|
||||
@ -2786,8 +2786,8 @@ void tst_QWidget::tabOrderWithCompoundWidgetsNoFocusPolicy()
|
||||
container.show();
|
||||
container.activateWindow();
|
||||
|
||||
if (!QTest::qWaitForWindowActive(&container))
|
||||
QSKIP("Window failed to activate, skipping test");
|
||||
if (!QTest::qWaitForWindowFocused(&container))
|
||||
QSKIP("Window failed to activate and be focused, skipping test");
|
||||
|
||||
QVERIFY2(spinbox1.hasFocus(),
|
||||
qPrintable(focusWidgetName()));
|
||||
|
Loading…
x
Reference in New Issue
Block a user