1 files changed, 7 insertions, 2 deletions
diff --git a/tests/manual/diaglib/eventfilter.cpp b/tests/manual/diaglib/eventfilter.cpp
index b35d29cc8a..6df885ebb6 100644
--- a/tests/manual/diaglib/eventfilter.cpp
+++ b/tests/manual/diaglib/eventfilter.cpp
@@ -190,8 +190,13 @@ static void formatApplicationState(QDebug debug)
         debug << "\n  QGuiApplication::modalWindow    = ";
         formatObject(mw, debug);
     }
-    debug << "\n  QGuiApplication::focusWindow    = ";
-    formatObject(QGuiApplication::focusWindow(), debug);
+    const QObject *focusObject = QGuiApplication::focusObject();
+    const QObject *focusWindow = QGuiApplication::focusWindow();
+    debug << "\n  QGuiApplication::focusObject    = ";
+    formatObject(focusObject, debug);
+    if (focusWindow && focusWindow != focusObject)
+        debug << "\n  QGuiApplication::focusWindow    = ";
+    formatObject(focusWindow, debug);
 #endif // HAVE_GUI_APPLICATION
 }