diff options
author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-07 07:21:30 (GMT) |
---|---|---|
committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-07 07:21:30 (GMT) |
commit | a3c1b0703575ed5fc364011c73dc104ecdb8ef0c (patch) | |
tree | 4e57559b1753c7b1eb3f375aa59eee6ea1108f70 /src/opengl/qglpixelbuffer.cpp | |
parent | f9ffe24a87d67f39bb877224f7e2b6f7b3ad6c02 (diff) | |
parent | 7a5bca82738e6b782047e50a813972eccd928307 (diff) | |
download | Qt-a3c1b0703575ed5fc364011c73dc104ecdb8ef0c.zip Qt-a3c1b0703575ed5fc364011c73dc104ecdb8ef0c.tar.gz Qt-a3c1b0703575ed5fc364011c73dc104ecdb8ef0c.tar.bz2 |
Merge branch '4.6' of ../../4.6 into 4.6
Conflicts:
examples/multimedia/audiodevices/audiodevices.cpp
Diffstat (limited to 'src/opengl/qglpixelbuffer.cpp')
-rw-r--r-- | src/opengl/qglpixelbuffer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp index 7c97ebb..fab6efc 100644 --- a/src/opengl/qglpixelbuffer.cpp +++ b/src/opengl/qglpixelbuffer.cpp @@ -127,7 +127,7 @@ void QGLPixelBufferPrivate::common_init(const QSize &size, const QGLFormat &form qctx = new QGLContext(format); qctx->d_func()->sharing = (shareWidget != 0); if (shareWidget != 0 && shareWidget->d_func()->glcx) { - qgl_share_reg()->addShare(qctx, shareWidget->d_func()->glcx); + QGLContextGroup::addShare(qctx, shareWidget->d_func()->glcx); shareWidget->d_func()->glcx->d_func()->sharing = true; } |