From ef77e8b65149a29a541044239fccf5e14b95e94d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Tue, 26 Apr 2011 16:21:58 +0200 Subject: Added QWindowContext and got wiggly up and running with xcb. (cherry picked from commit c980e4ef4ebc7699a6c3a7529d3f08ebafc21ffe) --- src/opengl/qgl.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/opengl/qgl.h') diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index c57995d8d0..55a06b5483 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -49,7 +49,7 @@ #include #ifdef Q_WS_QPA -#include +#include #endif QT_BEGIN_HEADER @@ -283,8 +283,8 @@ public: static OpenGLVersionFlags openGLVersionFlags(); #if defined(Q_WS_QPA) - static QGLFormat fromPlatformWindowFormat(const QPlatformWindowFormat &format); - static QPlatformWindowFormat toPlatformWindowFormat(const QGLFormat &format); + static QGLFormat fromWindowFormat(const QWindowFormat &format); + static QWindowFormat toWindowFormat(const QGLFormat &format); #endif private: QGLFormatPrivate *d; @@ -393,7 +393,7 @@ public: static const QGLContext* currentContext(); #ifdef Q_WS_QPA - static QGLContext *fromPlatformGLContext(QPlatformGLContext *platformContext); + static QGLContext *fromWindowContext(QWindowContext *platformContext); #endif protected: virtual bool chooseContext(const QGLContext* shareContext = 0); @@ -425,7 +425,7 @@ protected: private: #ifdef Q_WS_QPA - QGLContext(QPlatformGLContext *platformContext); + QGLContext(QWindowContext *windowContext); #endif QScopedPointer d_ptr; -- cgit v1.2.3