Merge branch 'refactor'

Conflicts:
	mkspecs/qws/linux-lsb-g++/qmake.conf
	src/gui/image/qpixmap_mac.cpp
	src/gui/painting/qpaintengine_x11.cpp
	src/gui/painting/qtessellator.cpp
	src/gui/text/qfontengine_qws.cpp
	src/gui/text/qfontengine_x11.cpp
	src/gui/widgets/qlinecontrol.cpp
	src/opengl/qgl.h
	src/opengl/qgl_x11egl.cpp
	src/plugins/plugins.pro

Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310

1 files changed, 14 insertions, 17 deletions

diff --git a/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.h b/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.h
index 07e0f620de..7b5eeece93 100644
--- a/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.h
+++ b/src/plugins/platforms/wayland/gl_integration/readback_glx/qwaylandreadbackglxcontext.h
@@ -42,38 +42,35 @@
 #ifndef QWAYLANDREADBACKGLXCONTEXT_H
 #define QWAYLANDREADBACKGLXCONTEXT_H
 
-#include <QPlatformGLContext>
+#include <QPlatformOpenGLContext>
+#include <QSurfaceFormat>
 
 #include "qwaylandreadbackglxintegration.h"
 
-#include "qglxconvenience.h"
+#include <QtPlatformSupport/private/qglxconvenience_p.h>
 
 class QWaylandReadbackGlxWindow;
 class QWaylandShmBuffer;
 
-class QWaylandReadbackGlxContext : public QPlatformGLContext
+class QWaylandReadbackGlxContext : public QPlatformOpenGLContext
 {
 public:
-    QWaylandReadbackGlxContext(QWaylandReadbackGlxIntegration *glxIntegration, QWaylandReadbackGlxWindow *window);
+    QWaylandReadbackGlxContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, Display *display, int screen);
 
-    void makeCurrent();
-    void doneCurrent();
-    void swapBuffers();
-    void* getProcAddress(const QString& procName);
+    QSurfaceFormat format() const;
+
+    void swapBuffers(QPlatformSurface *surface);
 
-    QPlatformWindowFormat platformWindowFormat() const;
+    bool makeCurrent(QPlatformSurface *surface);
+    void doneCurrent();
 
-    void geometryChanged();
+    void (*getProcAddress(const QByteArray &procName)) ();
 
 private:
-    QWaylandReadbackGlxIntegration *mGlxIntegration;
-    QWaylandReadbackGlxWindow *mWindow;
-    QWaylandShmBuffer *mBuffer;
+    GLXContext m_context;
 
-    Pixmap mPixmap;
-    GLXFBConfig mConfig;
-    GLXContext mContext;
-    GLXPixmap mGlxPixmap;
+    Display *m_display;
+    QSurfaceFormat m_format;
 };
 
 #endif // QWAYLANDREADBACKGLXCONTEXT_H