1 files changed, 15 insertions, 9 deletions

diff --git a/src/plugins/platforms/eglfs/qeglfswindow.cpp b/src/plugins/platforms/eglfs/qeglfswindow.cpp
index 2d36c0b58e..1f67170efc 100644
--- a/src/plugins/platforms/eglfs/qeglfswindow.cpp
+++ b/src/plugins/platforms/eglfs/qeglfswindow.cpp
@@ -82,8 +82,10 @@ void QEglFSWindow::create()
     // they will be composited onto the root window's surface.
     QEglFSScreen *screen = this->screen();
     if (screen->primarySurface() != EGL_NO_SURFACE) {
-        if (isRaster() && screen->compositingWindow())
+        if (isRaster() && screen->compositingWindow()) {
+            m_format = screen->compositingWindow()->format();
             return;
+        }
 
 #if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_NO_SDK)
         // We can have either a single OpenGL window or multiple raster windows.
@@ -96,7 +98,7 @@ void QEglFSWindow::create()
 
     m_flags |= HasNativeWindow;
     setGeometry(QRect()); // will become fullscreen
-    QWindowSystemInterface::handleExposeEvent(window(), geometry());
+    QWindowSystemInterface::handleExposeEvent(window(), QRect(QPoint(0, 0), geometry().size()));
 
     EGLDisplay display = static_cast<QEglFSScreen *>(screen)->display();
     QSurfaceFormat platformFormat = QEglFSHooks::hooks()->surfaceFormatFor(window()->requestedFormat());
@@ -166,8 +168,9 @@ void QEglFSWindow::resetSurface()
 void QEglFSWindow::setVisible(bool visible)
 {
     QList<QEGLPlatformWindow *> windows = screen()->windows();
+    QWindow *wnd = window();
 
-    if (window()->type() != Qt::Desktop) {
+    if (wnd->type() != Qt::Desktop) {
         if (visible) {
             screen()->addWindow(this);
         } else {
@@ -178,7 +181,7 @@ void QEglFSWindow::setVisible(bool visible)
         }
     }
 
-    QWindowSystemInterface::handleExposeEvent(window(), window()->geometry());
+    QWindowSystemInterface::handleExposeEvent(wnd, QRect(QPoint(0, 0), wnd->geometry().size()));
 
     if (visible)
         QWindowSystemInterface::flushWindowSystemEvents();
@@ -216,15 +219,17 @@ void QEglFSWindow::requestActivateWindow()
     if (window()->type() != Qt::Desktop)
         screen()->moveToTop(this);
 
-    QWindowSystemInterface::handleWindowActivated(window());
-    QWindowSystemInterface::handleExposeEvent(window(), window()->geometry());
+    QWindow *wnd = window();
+    QWindowSystemInterface::handleWindowActivated(wnd);
+    QWindowSystemInterface::handleExposeEvent(wnd, QRect(QPoint(0, 0), wnd->geometry().size()));
 }
 
 void QEglFSWindow::raise()
 {
-    if (window()->type() != Qt::Desktop) {
+    QWindow *wnd = window();
+    if (wnd->type() != Qt::Desktop) {
         screen()->moveToTop(this);
-        QWindowSystemInterface::handleExposeEvent(window(), window()->geometry());
+        QWindowSystemInterface::handleExposeEvent(wnd, QRect(QPoint(0, 0), wnd->geometry().size()));
     }
 }
 
@@ -235,7 +240,8 @@ void QEglFSWindow::lower()
         int idx = windows.indexOf(this);
         if (idx > 0) {
             screen()->changeWindowIndex(this, idx - 1);
-            QWindowSystemInterface::handleExposeEvent(windows.last()->window(), windows.last()->geometry());
+            QWindowSystemInterface::handleExposeEvent(windows.last()->window(),
+                                                      QRect(QPoint(0, 0), windows.last()->geometry().size()));
         }
     }
 }