diff options
Diffstat (limited to 'tests/auto/quick/qquickapplication/tst_qquickapplication.cpp')
| -rw-r--r-- | tests/auto/quick/qquickapplication/tst_qquickapplication.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp index a440c0c2f8..48b9b833d5 100644 --- a/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp +++ b/tests/auto/quick/qquickapplication/tst_qquickapplication.cpp @@ -1,5 +1,5 @@ // Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only #include <qtest.h> #include <QtQml/qqmlcomponent.h> @@ -93,13 +93,13 @@ void tst_qquickapplication::active() window.show(); window.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&window)); - QCOMPARE(QGuiApplication::focusWindow(), &window); + QTRY_COMPARE(QGuiApplication::focusWindow(), &window); QVERIFY(item->property("active").toBool()); QVERIFY(item->property("active2").toBool()); // not active again - QWindowSystemInterface::handleWindowActivated(nullptr); - QTRY_VERIFY(QGuiApplication::focusWindow() != &window); + QWindowSystemInterface::handleFocusWindowChanged(nullptr); + QTRY_COMPARE_NE(QGuiApplication::focusWindow(), &window); QVERIFY(!item->property("active").toBool()); QVERIFY(!item->property("active2").toBool()); } @@ -166,13 +166,13 @@ void tst_qquickapplication::state() window.show(); window.requestActivate(); QVERIFY(QTest::qWaitForWindowActive(&window)); - QCOMPARE(QGuiApplication::focusWindow(), &window); + QTRY_COMPARE(QGuiApplication::focusWindow(), &window); QCOMPARE(Qt::ApplicationState(item->property("state").toInt()), Qt::ApplicationActive); QCOMPARE(Qt::ApplicationState(item->property("state2").toInt()), Qt::ApplicationActive); // not active again - QWindowSystemInterface::handleWindowActivated(nullptr); - QTRY_VERIFY(QGuiApplication::focusWindow() != &window); + QWindowSystemInterface::handleFocusWindowChanged(nullptr); + QTRY_COMPARE_NE(QGuiApplication::focusWindow(), &window); QCOMPARE(Qt::ApplicationState(item->property("state").toInt()), Qt::ApplicationInactive); QCOMPARE(Qt::ApplicationState(item->property("state2").toInt()), |