1 files changed, 10 insertions, 7 deletions
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
index d4df0dc66e..3723142f0b 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp
@@ -92,10 +92,8 @@ QEglFSKmsGbmScreen::FrameBuffer *QEglFSKmsGbmScreen::framebufferForBufferObject(
     return fb.take();
 }
 
-QEglFSKmsGbmScreen::QEglFSKmsGbmScreen(QEglFSKmsIntegration *integration,
-                                       QEglFSKmsDevice *device,
-                                       QEglFSKmsOutput output)
-    : QEglFSKmsScreen(integration, device, output)
+QEglFSKmsGbmScreen::QEglFSKmsGbmScreen(QKmsDevice *device, const QKmsOutput &output)
+    : QEglFSKmsScreen(device, output)
     , m_gbm_surface(Q_NULLPTR)
     , m_gbm_bo_current(Q_NULLPTR)
     , m_gbm_bo_next(Q_NULLPTR)
@@ -105,12 +103,17 @@ QEglFSKmsGbmScreen::QEglFSKmsGbmScreen(QEglFSKmsIntegration *integration,
 
 QEglFSKmsGbmScreen::~QEglFSKmsGbmScreen()
 {
+    const int remainingScreenCount = qGuiApp->screens().count();
+    qCDebug(qLcEglfsKmsDebug, "Screen dtor. Remaining screens: %d", remainingScreenCount);
+    if (!remainingScreenCount && !device()->screenConfig()->separateScreens())
+        static_cast<QEglFSKmsGbmDevice *>(device())->destroyGlobalCursor();
 }
 
 QPlatformCursor *QEglFSKmsGbmScreen::cursor() const
 {
-    if (integration()->hwCursor()) {
-        if (!integration()->separateScreens())
+    QKmsScreenConfig *config = device()->screenConfig();
+    if (config->hwCursor()) {
+        if (!config->separateScreens())
             return static_cast<QEglFSKmsGbmDevice *>(device())->globalCursor();
 
         if (m_cursor.isNull()) {
@@ -181,7 +184,7 @@ void QEglFSKmsGbmScreen::flip()
 
     FrameBuffer *fb = framebufferForBufferObject(m_gbm_bo_next);
 
-    QEglFSKmsOutput &op(output());
+    QKmsOutput &op(output());
     const int fd = device()->fd();
     const uint32_t w = op.modes[op.mode].hdisplay;
     const uint32_t h = op.modes[op.mode].vdisplay;