diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-03 12:13:06 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-03 12:13:06 (GMT) |
| commit | 0b9aa3653cc6c6ea75a79c3c8ff512b53dba13f1 (patch) | |
| tree | 017f3b738d9281b55ceed6366e8f85204fc38b09 /src/opengl/qglpixelbuffer.cpp | |
| parent | 714e0f17aa3d26ddfd9ce6ff8b9f5efbae7a11e5 (diff) | |
| parent | d4a4b01f2f08a9031d692344d0d264de472da25e (diff) | |
| download | Qt-0b9aa3653cc6c6ea75a79c3c8ff512b53dba13f1.zip Qt-0b9aa3653cc6c6ea75a79c3c8ff512b53dba13f1.tar.gz Qt-0b9aa3653cc6c6ea75a79c3c8ff512b53dba13f1.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/plugins/qpluginbase.pri
tests/benchmarks/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
tools/assistant/compat/mainwindow.cpp
tools/assistant/compat/mainwindow.ui
tools/assistant/tools/assistant/doc/assistant.qdocconf
Diffstat (limited to 'src/opengl/qglpixelbuffer.cpp')
| -rw-r--r-- | src/opengl/qglpixelbuffer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp index 54d54e9..f082ff0 100644 --- a/src/opengl/qglpixelbuffer.cpp +++ b/src/opengl/qglpixelbuffer.cpp @@ -110,8 +110,10 @@ void QGLPixelBufferPrivate::common_init(const QSize &size, const QGLFormat &form invalid = false; qctx = new QGLContext(format); qctx->d_func()->sharing = (shareWidget != 0); - if (shareWidget != 0 && shareWidget->d_func()->glcx) + if (shareWidget != 0 && shareWidget->d_func()->glcx) { qgl_share_reg()->addShare(qctx, shareWidget->d_func()->glcx); + shareWidget->d_func()->glcx->d_func()->sharing = true; + } qctx->d_func()->paintDevice = q; qctx->d_func()->valid = true; |