1 files changed, 29 insertions, 3 deletions
diff --git a/src/widgets/kernel/qtestsupport_widgets.cpp b/src/widgets/kernel/qtestsupport_widgets.cpp
index 1141fcea0a..f7b25b6643 100644
--- a/src/widgets/kernel/qtestsupport_widgets.cpp
+++ b/src/widgets/kernel/qtestsupport_widgets.cpp
@@ -16,8 +16,8 @@
 
 QT_BEGIN_NAMESPACE
 
-template <typename FunctorWindowGetter, typename FunctorPredicate>
-static bool qWaitForWidgetWindow(FunctorWindowGetter windowGetter, FunctorPredicate predicate, int timeout)
+template <typename FunctorWindowGetter, typename FunctorPredicate, typename Timeout>
+static bool qWaitForWidgetWindow(FunctorWindowGetter windowGetter, FunctorPredicate predicate, Timeout timeout)
 {
     if (!windowGetter())
         return false;
@@ -60,6 +60,32 @@ Q_WIDGETS_EXPORT bool QTest::qWaitForWindowActive(QWidget *widget, int timeout)
                                 timeout);
 }
 
+
+/*!
+    \since 6.7
+
+    Returns \c true, if \a widget is the focus window within \a timeout. Otherwise returns \c false.
+
+    The method is useful in tests that call QWidget::show() and rely on the widget
+    having focus (for receiving keyboard events e.g.) before proceeding.
+
+    \note  The method will time out and return \c false if another window prevents \a widget from
+    becoming focused.
+
+    \note Since focus is an exclusive property, \a widget may loose its focus to another window at
+    any time - even after the method has returned \c true.
+
+    \sa qWaitForWindowExposed(), qWaitForWindowActive(), QGuiApplication::focusWindow()
+*/
+Q_WIDGETS_EXPORT bool QTest::qWaitForWindowFocused(QWidget *widget, QDeadlineTimer timeout)
+{
+    return qWaitForWidgetWindow([&]() {
+        return widget->window()->windowHandle();
+    }, [&](QWindow *window) {
+        return qGuiApp->focusWindow() == window;
+    }, timeout);
+}
+
 /*!
     \since 5.0
 
@@ -123,7 +149,7 @@ bool QTouchEventWidgetSequence::commit(bool processEvents)
     bool ret = false;
     if (points.isEmpty())
         return ret;
-    QThread::msleep(1);
+    QThread::sleep(std::chrono::milliseconds{1});
     if (targetWindow) {
         ret = qt_handleTouchEventv2(targetWindow, device, points.values());
     } else if (targetWidget) {