diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-11-16 12:00:14 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-11-16 12:00:14 (GMT) |
| commit | 6df2f295c7efddac12de87f8bfa347ab28761a6b (patch) | |
| tree | 10c66cf4e407b3c05ba96b441b72bb00b7be1fc4 /src/opengl/qgl.cpp | |
| parent | 15e2b2d753250bbe01a78d9ece37f0f0b08cd21c (diff) | |
| parent | 2b60b542a5f51cb983e4ad99c5fdf4e962b59b89 (diff) | |
| download | Qt-6df2f295c7efddac12de87f8bfa347ab28761a6b.zip Qt-6df2f295c7efddac12de87f8bfa347ab28761a6b.tar.gz Qt-6df2f295c7efddac12de87f8bfa347ab28761a6b.tar.bz2 | |
Merge commit 's60/4.6' into mmfphonon
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index ad177dc..f8a2ea4 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -3030,7 +3030,7 @@ void QGLContext::setValid(bool valid) bool QGLContext::isSharing() const { Q_D(const QGLContext); - return d->sharing; + return d->group->isSharing(); } QGLFormat QGLContext::format() const @@ -4078,7 +4078,7 @@ QImage QGLWidget::grabFrameBuffer(bool withAlpha) glReadPixels(0, 0, w, h, GL_COLOR_INDEX, GL_UNSIGNED_BYTE, res.bits()); const QVector<QColor> pal = QColormap::instance().colormap(); if (pal.size()) { - res.setNumColors(pal.size()); + res.setColorCount(pal.size()); for (int i = 0; i < pal.size(); i++) res.setColor(i, pal.at(i).rgb()); } |