Make the xlib platform plugin work again

Change-Id: I2921d707a7bed7cfba19e49283e3ec5eab3c449b
Reviewed-on: http://codereview.qt.nokia.com/4343
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/src/plugins/platforms/xlib/qxlibintegration.cpp b/src/plugins/platforms/xlib/qxlibintegration.cpp
index c8a6db9..c1f0941 100644 (file)
--- a/src/plugins/platforms/xlib/qxlibintegration.cpp
+++ b/src/plugins/platforms/xlib/qxlibintegration.cpp
@@ -44,7 +44,7 @@
 #include "qxlibbackingstore.h"
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <QtCore/qdebug.h>
-#include <QtGui/qguiglcontext_qpa.h>
+#include <QtGui/qopenglcontext.h>
 #include <QtGui/qscreen.h>
 
 #include "qxlibwindow.h"
@@ -83,7 +83,7 @@ QPlatformBackingStore *QXlibIntegration::createPlatformBackingStore(QWindow *win
     return new QXlibBackingStore(window);
 }
 
-QPlatformOpenGLContext *QXlibIntegration::createPlatformGLContext(QOpenGLContext *context) const
+QPlatformOpenGLContext *QXlibIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const
 {
     QXlibScreen *screen = static_cast<QXlibScreen *>(context->screen()->handle());
 

diff --git a/src/plugins/platforms/xlib/qxlibintegration.h b/src/plugins/platforms/xlib/qxlibintegration.h
index 9cdb1da..f5150fc 100644 (file)
--- a/src/plugins/platforms/xlib/qxlibintegration.h
+++ b/src/plugins/platforms/xlib/qxlibintegration.h
@@ -64,7 +64,7 @@ public:
 
     QPlatformWindow *createPlatformWindow(QWindow *window) const;
     QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const;
-    QPlatformOpenGLContext *createPlatformGLContext(QOpenGLContext *context) const;
+    QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const;
 
     QAbstractEventDispatcher *guiThreadEventDispatcher() const;