diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-04-26 16:21:58 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-04-28 15:38:51 +0200 |
| commit | ef77e8b65149a29a541044239fccf5e14b95e94d (patch) | |
| tree | 8182a140efbb517407f1039b6795c67819a31405 /src/opengl/qgl.cpp | |
| parent | fbef41167aa4aede67bc1ec904142e2e5e12c7fc (diff) | |
Added QWindowContext and got wiggly up and running with xcb.
(cherry picked from commit c980e4ef4ebc7699a6c3a7529d3f08ebafc21ffe)
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 057fb55e2c..64e711fe00 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1707,7 +1707,7 @@ void QGLContextPrivate::init(QPaintDevice *dev, const QGLFormat &format) vi = 0; #endif #if defined(Q_WS_QPA) - platformContext = 0; + windowContext = 0; #endif #if !defined(QT_NO_EGL) ownsEglContext = false; @@ -3313,7 +3313,7 @@ bool QGLContext::create(const QGLContext* shareContext) { Q_D(QGLContext); #ifdef Q_WS_QPA - if (!d->paintDevice && !d->platformContext) + if (!d->paintDevice && !d->windowContext) #else if (!d->paintDevice) #endif @@ -3403,8 +3403,8 @@ void QGLContext::setInitialized(bool on) const QGLContext* QGLContext::currentContext() { #ifdef Q_WS_QPA - if (const QPlatformGLContext *threadContext = QPlatformGLContext::currentContext()) { - return QGLContext::fromPlatformGLContext(const_cast<QPlatformGLContext *>(threadContext)); + if (const QWindowContext *threadContext = QWindowContext::currentContext()) { + return QGLContext::fromWindowContext(const_cast<QWindowContext *>(threadContext)); } return 0; #else |