From e9f4efe56354a8973d5cdff2168c40a999709aa6 Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Mon, 30 Jan 2023 09:33:56 +0100 Subject: [PATCH] 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. Task-number: QTBUG-110703 Change-Id: I519eec872505ea3673111ae300c2494113f85c36 Reviewed-by: Fabian Kosmale (cherry picked from commit 78ba5056e63c4fc6f61346807197920fb5049924) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/other/qfocusevent/tst_qfocusevent.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp index 2001f14ca44..514e8045265 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(); }