1 files changed, 12 insertions, 5 deletions
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp
index 3935c99b9e..a27c89faab 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp
@@ -40,11 +40,15 @@
 #include "qeglfskmsegldevicescreen.h"
 #include "qeglfskmsegldevice.h"
 #include <QGuiApplication>
+#include <QLoggingCategory>
+#include <errno.h>
 
 QT_BEGIN_NAMESPACE
 
-QEglFSKmsEglDeviceScreen::QEglFSKmsEglDeviceScreen(QEglFSKmsIntegration *integration, QEglFSKmsDevice *device, QEglFSKmsOutput output)
-    : QEglFSKmsScreen(integration, device, output)
+Q_DECLARE_LOGGING_CATEGORY(qLcEglfsKmsDebug)
+
+QEglFSKmsEglDeviceScreen::QEglFSKmsEglDeviceScreen(QKmsDevice *device, const QKmsOutput &output)
+    : QEglFSKmsScreen(device, output)
 {
 }
 
@@ -52,7 +56,7 @@ QEglFSKmsEglDeviceScreen::~QEglFSKmsEglDeviceScreen()
 {
     const int remainingScreenCount = qGuiApp->screens().count();
     qCDebug(qLcEglfsKmsDebug, "Screen dtor. Remaining screens: %d", remainingScreenCount);
-    if (!remainingScreenCount && !m_integration->separateScreens())
+    if (!remainingScreenCount && !device()->screenConfig()->separateScreens())
         static_cast<QEglFSKmsEglDevice *>(device())->destroyGlobalCursor();
 }
 
@@ -62,12 +66,15 @@ QPlatformCursor *QEglFSKmsEglDeviceScreen::cursor() const
     // in its ctor. With separateScreens just use that. Otherwise
     // there's a virtual desktop and the device has a global cursor
     // and the base class has no dedicated cursor at all.
-    return m_integration->separateScreens() ? QEglFSScreen::cursor() : static_cast<QEglFSKmsEglDevice *>(device())->globalCursor();
+    // config->hwCursor() is ignored for now, just use the standard OpenGL cursor.
+    return device()->screenConfig()->separateScreens()
+        ? QEglFSScreen::cursor()
+        : static_cast<QEglFSKmsEglDevice *>(device())->globalCursor();
 }
 
 void QEglFSKmsEglDeviceScreen::waitForFlip()
 {
-    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;