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, 16 insertions, 16 deletions

diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.h b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.h
index 2c6feb498c..16d9fa4ada 100644
--- a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.h
+++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.h
@@ -44,36 +44,36 @@
 
 #include "qwaylanddisplay.h"
 
-#include <QtGui/QPlatformGLContext>
+#include <QtGui/QPlatformOpenGLContext>
 
 #include "qwaylandeglinclude.h"
 
 class QWaylandWindow;
 class QWaylandGLWindowSurface;
 
-class QWaylandGLContext : public QPlatformGLContext {
+class QWaylandGLContext : public QPlatformOpenGLContext {
 public:
-    QWaylandGLContext(EGLDisplay eglDisplay, const QPlatformWindowFormat &format);
+    QWaylandGLContext(EGLDisplay eglDisplay, const QSurfaceFormat &format, QPlatformOpenGLContext *share);
     ~QWaylandGLContext();
-    void makeCurrent();
+
+    void swapBuffers(QPlatformSurface *surface);
+
+    bool makeCurrent(QPlatformSurface *surface);
     void doneCurrent();
-    void swapBuffers();
-    void* getProcAddress(const QString&);
 
-    QPlatformWindowFormat platformWindowFormat() const { return mFormat; }
+    void (*getProcAddress(const QByteArray &procName)) ();
 
-    void setEglSurface(EGLSurface surface);
-    EGLConfig eglConfig() const;
-private:
-    EGLDisplay mEglDisplay;
+    QSurfaceFormat format() const { return m_format; }
 
-    EGLContext mContext;
-    EGLSurface mSurface;
-    EGLConfig mConfig;
-    QPlatformWindowFormat mFormat;
+    EGLConfig eglConfig() const;
+    EGLContext eglContext() const { return m_context; }
 
-    QWaylandGLContext();
+private:
+    EGLDisplay m_eglDisplay;
 
+    EGLContext m_context;
+    EGLConfig m_config;
+    QSurfaceFormat m_format;
 };