summaryrefslogtreecommitdiffstats
path: root/tests/auto/other
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2023-01-30 09:33:56 +0100
committerFabian Kosmale <fabian.kosmale@qt.io>2023-01-30 13:19:41 +0000
commit78ba5056e63c4fc6f61346807197920fb5049924 (patch)
tree8694e8a9cbddf6c3155d7a07f9d5f1d687554615 /tests/auto/other
parent979a21dc4ee0c6f483c6b55e9242a153d659ab6f (diff)
Make tst_QFocusEvent::checkReason_ActiveWindow pass on macOS
It seems that on macOS 13.2 and newer, it requires explicit activation, just as on the offscreen and minimal platforms. Pick-to: 6.5 6.4 6.2 Task-number: QTBUG-110703 Change-Id: I519eec872505ea3673111ae300c2494113f85c36 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'tests/auto/other')
-rw-r--r--tests/auto/other/qfocusevent/tst_qfocusevent.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
index 2001f14ca4..514e804526 100644
--- a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
+++ b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
@@ -334,9 +334,10 @@ void tst_QFocusEvent::checkReason_ActiveWindow()
d->hide();
if (!QGuiApplication::platformName().compare(QLatin1String("offscreen"), Qt::CaseInsensitive)
- || !QGuiApplication::platformName().compare(QLatin1String("minimal"), Qt::CaseInsensitive)) {
+ || !QGuiApplication::platformName().compare(QLatin1String("minimal"), Qt::CaseInsensitive)
+ || !QGuiApplication::platformName().compare(QLatin1String("cocoa"), Qt::CaseInsensitive)) {
// Activate window of testFocusWidget, focus in that window goes to childFocusWidgetOne
- qWarning("Platforms offscreen and minimal require explicit activateWindow()");
+ qWarning("Platforms offscreen, minimal and macOS require explicit activateWindow()");
testFocusWidget->activateWindow();
}