diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2011-09-07 11:07:27 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-07 12:45:59 +0200 |
| commit | 37fe917272b72f375ed7e6a3396bacc763e8825e (patch) | |
| tree | 792c1b633ec8d1fce7186a38efd6afffe97fa82c /src/plugins/platforms | |
| parent | 46ec93d3ff9653c7240ccba995eeef7298b479ec (diff) | |
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>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/xlib/qxlibintegration.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/xlib/qxlibintegration.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/xlib/qxlibintegration.cpp b/src/plugins/platforms/xlib/qxlibintegration.cpp index c8a6db92b4..c1f0941619 100644 --- 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 9cdb1dad9c..f5150fca6f 100644 --- 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; |