summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl.cpp
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2010-03-11 08:14:39 (GMT)
committerMartin Smith <msmith@trolltech.com>2010-03-11 08:14:39 (GMT)
commitb5d9d2eb1fbfbbf2732e90ef4d6a3e3ae5104c0c (patch)
treee224a95589b45d268c79ee55911f9eb85a9eb1b6 /src/opengl/qgl.cpp
parenta21ac7e75730bb094b49e5b58698a2ceebe8d73e (diff)
parentc75bd51df44359c386149c6962532344123b07d5 (diff)
downloadQt-b5d9d2eb1fbfbbf2732e90ef4d6a3e3ae5104c0c.zip
Qt-b5d9d2eb1fbfbbf2732e90ef4d6a3e3ae5104c0c.tar.gz
Qt-b5d9d2eb1fbfbbf2732e90ef4d6a3e3ae5104c0c.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/opengl/qgl.cpp')
-rw-r--r--src/opengl/qgl.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 73cd6a8..7839191 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -766,6 +766,7 @@ void QGLFormat::setSamples(int numSamples)
return;
}
d->numSamples = numSamples;
+ setSampleBuffers(numSamples > 0);
}
/*!
@@ -904,6 +905,7 @@ void QGLFormat::setDepthBufferSize(int size)
return;
}
d->depthSize = size;
+ setDepth(size > 0);
}
/*!
@@ -1017,7 +1019,7 @@ void QGLFormat::setAlphaBufferSize(int size)
return;
}
d->alphaSize = size;
- setOption(QGL::AlphaChannel);
+ setAlpha(size > 0);
}
/*!
@@ -1044,6 +1046,7 @@ void QGLFormat::setAccumBufferSize(int size)
return;
}
d->accumSize = size;
+ setAccum(size > 0);
}
/*!
@@ -1069,6 +1072,7 @@ void QGLFormat::setStencilBufferSize(int size)
return;
}
d->stencilSize = size;
+ setStencil(size > 0);
}
/*!