summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl_qws.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-11-09 14:04:16 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-11-09 14:04:16 (GMT)
commit371a407618fad14beca8985e4c8c4f85add4d3e1 (patch)
tree42742b2f7e20b033d4e04b746f5b721c8dbf46c4 /src/opengl/qgl_qws.cpp
parentcaaf77c971ea96b021bb6efe0bd1796ce8ebec6a (diff)
parente441fa33a1068e198bf2c7bc54f54f1ff13410c9 (diff)
downloadQt-371a407618fad14beca8985e4c8c4f85add4d3e1.zip
Qt-371a407618fad14beca8985e4c8c4f85add4d3e1.tar.gz
Qt-371a407618fad14beca8985e4c8c4f85add4d3e1.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6
Diffstat (limited to 'src/opengl/qgl_qws.cpp')
-rw-r--r--src/opengl/qgl_qws.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/opengl/qgl_qws.cpp b/src/opengl/qgl_qws.cpp
index 5e59975..a189c20 100644
--- a/src/opengl/qgl_qws.cpp
+++ b/src/opengl/qgl_qws.cpp
@@ -206,6 +206,9 @@ bool QGLContext::chooseContext(const QGLContext* shareContext)
d->eglContext = 0;
return false;
}
+ d->sharing = d->eglContext->isSharing();
+ if (d->sharing && shareContext)
+ const_cast<QGLContext *>(shareContext)->d_func()->sharing = true;
#if defined(EGL_VERSION_1_1)
if (d->glFormat.swapInterval() != -1 && devType == QInternal::Widget)