summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl.cpp
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2010-07-17 23:31:36 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2010-07-17 23:31:36 (GMT)
commit8d545a21b6aa89675b404a9d7bf08b7499d26e5e (patch)
tree761c900e05538a337517435d5337392f7fc8931d /src/opengl/qgl.cpp
parent571b85896ee3663479b4a10d2418e2e19b3639f3 (diff)
parentd61c74faef2ed787aacc53c03b8361fa57bccc8e (diff)
downloadQt-8d545a21b6aa89675b404a9d7bf08b7499d26e5e.zip
Qt-8d545a21b6aa89675b404a9d7bf08b7499d26e5e.tar.gz
Qt-8d545a21b6aa89675b404a9d7bf08b7499d26e5e.tar.bz2
Merge remote branch 'origin/4.7' into 4.7-from-4.6
Conflicts: tests/auto/qtexttable/tst_qtexttable.cpp
Diffstat (limited to 'src/opengl/qgl.cpp')
-rw-r--r--src/opengl/qgl.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index af016cf..6120a85 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -1334,6 +1334,10 @@ QGLFormat::OpenGLVersionFlags Q_AUTOTEST_EXPORT qOpenGLVersionFlagsFromString(co
\value OpenGL_Version_3_2 OpenGL version 3.2 or higher is present.
+ \value OpenGL_Version_3_3 OpenGL version 3.3 or higher is present.
+
+ \value OpenGL_Version_4_0 OpenGL version 4.0 or higher is present.
+
\value OpenGL_ES_CommonLite_Version_1_0 OpenGL ES version 1.0 Common Lite or higher is present.
\value OpenGL_ES_Common_Version_1_0 OpenGL ES version 1.0 Common or higher is present.
@@ -5037,8 +5041,9 @@ void QGLWidget::deleteTexture(QMacCompatGLuint id)
/*!
\since 4.4
- Calls the corresponding QGLContext::drawTexture() on
- this widget's context.
+ Calls the corresponding QGLContext::drawTexture() with
+ \a target, \a textureId, and \a textureTarget for this
+ widget's context.
*/
void QGLWidget::drawTexture(const QRectF &target, GLuint textureId, GLenum textureTarget)
{
@@ -5058,8 +5063,9 @@ void QGLWidget::drawTexture(const QRectF &target, QMacCompatGLuint textureId, QM
/*!
\since 4.4
- Calls the corresponding QGLContext::drawTexture() on
- this widget's context.
+ Calls the corresponding QGLContext::drawTexture() with
+ \a point, \a textureId, and \a textureTarget for this
+ widget's context.
*/
void QGLWidget::drawTexture(const QPointF &point, GLuint textureId, GLenum textureTarget)
{