tst_QWidget::showMinimizedKeepsFocus() remove setActiveWindow()
2f6fe3a26843ff68c5d3f9af0a2fc3cce6caac22 has made calls to QApplicationPrivate::setActiveWindow() redundant. Remove redundant calls from testing deletion of the focusWidget, testing reparenting of the focus widget, testing setEnabled(false) and testing clearFocus sections. Task-number: QTBUG-121488 Change-Id: I7e46ddb31bd7dbc0492d057d8d84846db8c873aa Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
This commit is contained in:
parent
80baafb900
commit
04995cf800
@ -3585,7 +3585,6 @@ void tst_QWidget::showMinimizedKeepsFocus()
|
||||
QWidget *child = new QWidget(&window);
|
||||
child->setFocusPolicy(Qt::StrongFocus);
|
||||
window.show();
|
||||
QApplicationPrivate::setActiveWindow(&window);
|
||||
QVERIFY(QTest::qWaitForWindowActive(&window));
|
||||
child->setFocus();
|
||||
QTRY_COMPARE(window.focusWidget(), child);
|
||||
@ -3604,7 +3603,6 @@ void tst_QWidget::showMinimizedKeepsFocus()
|
||||
QWidget *child = new QWidget(&window);
|
||||
child->setFocusPolicy(Qt::StrongFocus);
|
||||
window.show();
|
||||
QApplicationPrivate::setActiveWindow(&window);
|
||||
QVERIFY(QTest::qWaitForWindowActive(&window));
|
||||
child->setFocus();
|
||||
QTRY_COMPARE(window.focusWidget(), child);
|
||||
@ -3624,7 +3622,6 @@ void tst_QWidget::showMinimizedKeepsFocus()
|
||||
QWidget *child = new QWidget(&window);
|
||||
child->setFocusPolicy(Qt::StrongFocus);
|
||||
window.show();
|
||||
QApplicationPrivate::setActiveWindow(&window);
|
||||
QVERIFY(QTest::qWaitForWindowActive(&window));
|
||||
child->setFocus();
|
||||
QTRY_COMPARE(window.focusWidget(), child);
|
||||
@ -3645,7 +3642,6 @@ void tst_QWidget::showMinimizedKeepsFocus()
|
||||
QWidget *child = new QWidget(&window);
|
||||
child->setFocusPolicy(Qt::StrongFocus);
|
||||
window.show();
|
||||
QApplicationPrivate::setActiveWindow(&window);
|
||||
QVERIFY(QTest::qWaitForWindowActive(&window));
|
||||
child->setFocus();
|
||||
QTRY_COMPARE(window.focusWidget(), child);
|
||||
@ -3662,7 +3658,6 @@ void tst_QWidget::showMinimizedKeepsFocus()
|
||||
QTRY_COMPARE(QApplication::focusWidget(), nullptr);
|
||||
|
||||
window.showNormal();
|
||||
QApplicationPrivate::setActiveWindow(&window);
|
||||
QVERIFY(QTest::qWaitForWindowActive(&window));
|
||||
#ifdef Q_OS_MACOS
|
||||
if (!macHasAccessToWindowsServer())
|
||||
|
Loading…
x
Reference in New Issue
Block a user