1 files changed, 18 insertions, 6 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp
index 267a037..3f3ee5e 100644
--- a/src/plugins/platforms/wayland/qwaylandintegration.cpp
+++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp
@@ -43,9 +43,7 @@
 
 #include "qwaylanddisplay.h"
 #include "qwaylandshmsurface.h"
-#include "qwaylanddrmsurface.h"
 #include "qwaylandshmwindow.h"
-#include "qwaylandeglwindow.h"
 
 #include "qgenericunixfontdatabase.h"
 
@@ -55,6 +53,8 @@
 
 #include <QtGui/private/qpixmap_raster_p.h>
 #ifdef QT_WAYLAND_GL_SUPPORT
+#include "gl_integration/qwaylandglintegration.h"
+#include "gl_integration/qwaylandglwindowsurface.h"
 #include <QtOpenGL/private/qpixmapdata_gl_p.h>
 #endif
 
@@ -75,6 +75,7 @@ bool QWaylandIntegration::hasCapability(QPlatformIntegration::Capability cap) co
 {
     switch (cap) {
     case ThreadedPixmaps: return true;
+    case OpenGL: return hasOpenGL();
     default: return QPlatformIntegration::hasCapability(cap);
     }
 }
@@ -91,10 +92,11 @@ QPixmapData *QWaylandIntegration::createPixmapData(QPixmapData::PixelType type)
 QPlatformWindow *QWaylandIntegration::createPlatformWindow(QWidget *widget, WId winId) const
 {
     Q_UNUSED(winId);
+#ifdef QT_WAYLAND_GL_SUPPORT
     bool useOpenGL = mUseOpenGL || (widget->platformWindowFormat().windowApi() == QPlatformWindowFormat::OpenGL);
     if (useOpenGL)
-        return new QWaylandEglWindow(widget);
-
+        return mDisplay->eglIntegration()->createEglWindow(widget);
+#endif
     return new QWaylandShmWindow(widget);
 }
 
@@ -102,10 +104,11 @@ QWindowSurface *QWaylandIntegration::createWindowSurface(QWidget *widget, WId wi
 {
     Q_UNUSED(winId);
     Q_UNUSED(winId);
+#ifdef QT_WAYLAND_GL_SUPPORT
     bool useOpenGL = mUseOpenGL || (widget->platformWindowFormat().windowApi() == QPlatformWindowFormat::OpenGL);
     if (useOpenGL)
-        return new QWaylandDrmWindowSurface(widget);
-
+        return new QWaylandGLWindowSurface(widget);
+#endif
     return new QWaylandShmWindowSurface(widget);
 }
 
@@ -113,3 +116,12 @@ QPlatformFontDatabase *QWaylandIntegration::fontDatabase() const
 {
     return mFontDb;
 }
+
+bool QWaylandIntegration::hasOpenGL() const
+{
+#ifdef QT_WAYLAND_GL_SUPPORT
+    return true;
+#else
+    return false;
+#endif
+}