1 files changed, 16 insertions, 15 deletions

diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
index cf1de71831..43bdb77a18 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp
@@ -50,8 +50,7 @@
 QT_BEGIN_NAMESPACE
 
 QEglFSKmsEglDeviceIntegration::QEglFSKmsEglDeviceIntegration()
-    : QEglFSKmsIntegration()
-    , m_egl_device(EGL_NO_DEVICE_EXT)
+    : m_egl_device(EGL_NO_DEVICE_EXT)
     , m_funcs(Q_NULLPTR)
 {
     qCDebug(qLcEglfsKmsDebug, "New DRM/KMS on EGLDevice integration created");
@@ -101,30 +100,30 @@ bool QEglFSKmsEglDeviceIntegration::supportsPBuffers() const
     return true;
 }
 
-class QEglJetsonTK1Window : public QEglFSWindow
+class QEglFSKmsEglDeviceWindow : public QEglFSWindow
 {
 public:
-    QEglJetsonTK1Window(QWindow *w, const QEglFSKmsEglDeviceIntegration *integration)
+    QEglFSKmsEglDeviceWindow(QWindow *w, const QEglFSKmsEglDeviceIntegration *integration)
         : QEglFSWindow(w)
         , m_integration(integration)
         , m_egl_stream(EGL_NO_STREAM_KHR)
     { }
 
-    void invalidateSurface() Q_DECL_OVERRIDE;
-    void resetSurface() Q_DECL_OVERRIDE;
+    void invalidateSurface() override;
+    void resetSurface() override;
 
     const QEglFSKmsEglDeviceIntegration *m_integration;
     EGLStreamKHR m_egl_stream;
     EGLint m_latency;
 };
 
-void QEglJetsonTK1Window::invalidateSurface()
+void QEglFSKmsEglDeviceWindow::invalidateSurface()
 {
     QEglFSWindow::invalidateSurface();
     m_integration->m_funcs->destroy_stream(screen()->display(), m_egl_stream);
 }
 
-void QEglJetsonTK1Window::resetSurface()
+void QEglFSKmsEglDeviceWindow::resetSurface()
 {
     qCDebug(qLcEglfsKmsDebug, "Creating stream");
 
@@ -173,7 +172,7 @@ void QEglJetsonTK1Window::resetSurface()
 
     QEglFSKmsEglDeviceScreen *cur_screen = static_cast<QEglFSKmsEglDeviceScreen *>(screen());
     Q_ASSERT(cur_screen);
-    QEglFSKmsOutput &output(cur_screen->output());
+    QKmsOutput &output(cur_screen->output());
     const uint32_t wantedId = !output.wants_plane ? output.crtc_id : output.plane_id;
     qCDebug(qLcEglfsKmsDebug, "Searching for id: %d", wantedId);
 
@@ -235,7 +234,7 @@ void QEglJetsonTK1Window::resetSurface()
 
 QEglFSWindow *QEglFSKmsEglDeviceIntegration::createWindow(QWindow *window) const
 {
-    QEglJetsonTK1Window *eglWindow = new QEglJetsonTK1Window(window, this);
+    QEglFSKmsEglDeviceWindow *eglWindow = new QEglFSKmsEglDeviceWindow(window, this);
 
     m_funcs->initialize(eglWindow->screen()->display());
     if (Q_UNLIKELY(!(m_funcs->has_egl_output_base && m_funcs->has_egl_output_drm && m_funcs->has_egl_stream &&
@@ -245,10 +244,8 @@ QEglFSWindow *QEglFSKmsEglDeviceIntegration::createWindow(QWindow *window) const
     return eglWindow;
 }
 
-QEglFSKmsDevice *QEglFSKmsEglDeviceIntegration::createDevice(const QString &devicePath)
+QKmsDevice *QEglFSKmsEglDeviceIntegration::createDevice()
 {
-    Q_UNUSED(devicePath)
-
     if (Q_UNLIKELY(!query_egl_device()))
         qFatal("Could not set up EGL device!");
 
@@ -256,7 +253,7 @@ QEglFSKmsDevice *QEglFSKmsEglDeviceIntegration::createDevice(const QString &devi
     if (Q_UNLIKELY(!deviceName))
         qFatal("Failed to query device name from EGLDevice");
 
-    return new QEglFSKmsEglDevice(this, deviceName);
+    return new QEglFSKmsEglDevice(this, screenConfig(), deviceName);
 }
 
 bool QEglFSKmsEglDeviceIntegration::query_egl_device()
@@ -283,7 +280,11 @@ bool QEglFSKmsEglDeviceIntegration::query_egl_device()
 
 QPlatformCursor *QEglFSKmsEglDeviceIntegration::createCursor(QPlatformScreen *screen) const
 {
-    return separateScreens() ? new QEglFSCursor(screen) : nullptr;
+#if QT_CONFIG(opengl)
+    if (screenConfig()->separateScreens())
+        return  new QEglFSCursor(screen);
+#endif
+    return nullptr;
 }
 
 QT_END_NAMESPACE