Make it compile with xcomposite_glx.

diff --git a/examples/qwidget-compositor/main.cpp b/examples/qwidget-compositor/main.cpp
index 87292af..c0410d2 100644 (file)
--- a/examples/qwidget-compositor/main.cpp
+++ b/examples/qwidget-compositor/main.cpp
@@ -72,7 +72,7 @@ public:
         winId();
 #ifdef QT_COMPOSITOR_WAYLAND_GL
         if (windowHandle()) {
-            windowHandle()->glSurface();
+//            windowHandle()->surfaceHandle();
         }
 #endif
     }

diff --git a/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp b/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp
index c518f1c..6421984 100644 (file)
--- a/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp
+++ b/src/qt-compositor/hardware_integration/xcomposite_glx/xcompositeglxintegration.cpp
@@ -58,7 +58,7 @@ void XCompositeGLXIntegration::initializeHardware(Wayland::Display *waylandDispl
     XCompositeHandler *handler = new XCompositeHandler(m_compositor->handle(),mDisplay,m_compositor->topLevelWidget());
     waylandDisplay->addGlobalObject(handler->base(), &wl_xcomposite_interface, &XCompositeHandler::xcomposite_interface,XCompositeHandler::send_root_information);
 
-    QGuiGLContext *glContext = new QGuiGLContext(QGuiGLFormat());
+    QGuiGLContext *glContext = new QGuiGLContext(QSurfaceFormat());
 
     m_glxBindTexImageEXT = reinterpret_cast<PFNGLXBINDTEXIMAGEEXTPROC>(glContext->getProcAddress("glXBindTexImageEXT"));
     if (!m_glxBindTexImageEXT) {