diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2022-08-15 22:25:37 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-18 16:59:45 +0000 |
| commit | 27933dd5af0013b77f86b7309b40ae7045563281 (patch) | |
| tree | ccaae7b23a3415509ac88c31e62ac3afd3612d4b | |
| parent | 43b42731d9ddc8e9c77c544fed94d428775931f3 (diff) | |
Use QWidget::activateWindow() instead of QApplication::setActiveWindow()
The latter is meant for the internal window activation machinery in
QtWidgets and should not be called by user code.
Change-Id: Id71420d5df62186c0ea99f45b69c999f65dcad48
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 9c6824d61a623639bb67ac8fbd065c11daca8819)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tests/auto/qchartview/tst_qchartview.cpp | 3 | ||||
| -rw-r--r-- | tests/auto/qpieslice/tst_qpieslice.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/qchartview/tst_qchartview.cpp b/tests/auto/qchartview/tst_qchartview.cpp index 4400bc47..802d38ce 100644 --- a/tests/auto/qchartview/tst_qchartview.cpp +++ b/tests/auto/qchartview/tst_qchartview.cpp @@ -157,7 +157,8 @@ void tst_QChartView::rubberBand() int maxY = vaxisY->max(); // try to ensure focus - QApplication::setActiveWindow(m_view); + m_view->activateWindow(); + QVERIFY(QTest::qWaitForWindowActive(m_view)); m_view->setFocus(); QApplication::processEvents(); QVERIFY(m_view->isActiveWindow()); diff --git a/tests/auto/qpieslice/tst_qpieslice.cpp b/tests/auto/qpieslice/tst_qpieslice.cpp index 223704ad..72454cbd 100644 --- a/tests/auto/qpieslice/tst_qpieslice.cpp +++ b/tests/auto/qpieslice/tst_qpieslice.cpp @@ -282,7 +282,8 @@ void tst_qpieslice::hoverSignal() QVERIFY(QTest::qWaitForWindowExposed(&view)); // try to ensure focus - QApplication::setActiveWindow(&view); + view.activateWindow(); + QVERIFY(QTest::qWaitForWindowActive(&view)); view.setFocus(); QApplication::processEvents(); QVERIFY(view.isActiveWindow()); |