1 files changed, 21 insertions, 3 deletions
diff --git a/src/plugins/platforms/eglfs/api/qeglfsscreen.cpp b/src/plugins/platforms/eglfs/api/qeglfsscreen.cpp
index b081406258..c5108be04a 100644
--- a/src/plugins/platforms/eglfs/api/qeglfsscreen.cpp
+++ b/src/plugins/platforms/eglfs/api/qeglfsscreen.cpp
@@ -121,7 +121,7 @@ void QEglFSScreen::handleCursorMove(const QPoint &pos)
         return;
 
     // First window is always fullscreen.
-    if (windows.count() == 1) {
+    if (windows.size() == 1) {
         QWindow *window = windows[0]->sourceWindow();
         if (platformIntegration->pointerWindow() != window) {
             platformIntegration->setPointerWindow(window);
@@ -131,7 +131,7 @@ void QEglFSScreen::handleCursorMove(const QPoint &pos)
     }
 
     QWindow *enter = nullptr, *leave = nullptr;
-    for (int i = windows.count() - 1; i >= 0; --i) {
+    for (int i = windows.size() - 1; i >= 0; --i) {
         QWindow *window = windows[i]->sourceWindow();
         const QRect geom = window->geometry();
         if (geom.contains(pos)) {
@@ -189,7 +189,7 @@ QPixmap QEglFSScreen::grabWindow(WId wid, int x, int y, int width, int height) c
         return QPixmap::fromImage(img).copy(x, y, width, height);
     }
 
-    foreach (QOpenGLCompositorWindow *w, windows) {
+    for (QOpenGLCompositorWindow *w : windows) {
         const QWindow *window = w->sourceWindow();
         if (window->winId() == wid) {
             const QRect geom = window->geometry();
@@ -212,4 +212,22 @@ QPixmap QEglFSScreen::grabWindow(WId wid, int x, int y, int width, int height) c
     return QPixmap();
 }
 
+QWindow *QEglFSScreen::topLevelAt(const QPoint &point) const
+{
+#ifndef QT_NO_OPENGL
+    QOpenGLCompositor *compositor = QOpenGLCompositor::instance();
+    const QList<QOpenGLCompositorWindow *> windows = compositor->windows();
+    const int windowCount = windows.size();
+
+    // Higher z-order is at the end of the list
+    for (int i = windowCount - 1; i >= 0; i--) {
+        QWindow *window = windows[i]->sourceWindow();
+        if (window->isVisible() && window->geometry().contains(point))
+            return window;
+    }
+#endif
+
+    return QPlatformScreen::topLevelAt(point);
+}
+
 QT_END_NAMESPACE