1 files changed, 13 insertions, 24 deletions
diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.h b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.h
index b6ee2bbc23..3364d88ec4 100644
--- a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.h
+++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.h
@@ -42,44 +42,33 @@
 #ifndef QWAYLANDXCOMPOSITEGLXCONTEXT_H
 #define QWAYLANDXCOMPOSITEGLXCONTEXT_H
 
-#include <QtGui/QPlatformGLContext>
+#include <QtGui/QPlatformOpenGLContext>
 
-#include <QtCore/QWaitCondition>
-
-#include "qwaylandbuffer.h"
 #include "qwaylandxcompositeglxintegration.h"
-
-#include "qglxconvenience.h"
+#include <QtPlatformSupport/private/qglxconvenience_p.h>
 
 class QWaylandXCompositeGLXWindow;
 class QWaylandShmBuffer;
 
-class QWaylandXCompositeGLXContext : public QPlatformGLContext
+class QWaylandXCompositeGLXContext : public QPlatformOpenGLContext
 {
 public:
-    QWaylandXCompositeGLXContext(QWaylandXCompositeGLXIntegration *glxIntegration, QWaylandXCompositeGLXWindow *window);
+    QWaylandXCompositeGLXContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, Display *display, int screen);
 
-    void makeCurrent();
-    void doneCurrent();
-    void swapBuffers();
-    void* getProcAddress(const QString& procName);
+    QSurfaceFormat format() const;
 
-    QPlatformWindowFormat platformWindowFormat() const;
+    void swapBuffers(QPlatformSurface *surface);
 
-    void geometryChanged();
+    bool makeCurrent(QPlatformSurface *surface);
+    void doneCurrent();
 
-private:
-    QWaylandXCompositeGLXIntegration *mGlxIntegration;
-    QWaylandXCompositeGLXWindow *mWindow;
-    QWaylandBuffer *mBuffer;
+    void (*getProcAddress(const QByteArray &procName)) ();
 
-    Window mXWindow;
-    GLXFBConfig mConfig;
-    GLXContext mContext;
+private:
+    GLXContext m_context;
 
-    static void sync_function(void *data);
-    void waitForSync();
-    bool mWaitingForSyncCallback;
+    Display *m_display;
+    QSurfaceFormat m_format;
 };
 
 #endif // QWAYLANDXCOMPOSITEGLXCONTEXT_H