diff options
| author | aavit <qt-info@nokia.com> | 2011-03-21 20:07:57 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-03-21 20:07:57 (GMT) |
| commit | 23098630c94e6655a33042bee0caa6c933c0c7d9 (patch) | |
| tree | 51cad56b4d7a98285e8a932951b6fad32605ec58 /src/opengl/qgl.cpp | |
| parent | 31e21db28f97a0c6b7bbe80edf531dbbce2b02ed (diff) | |
| parent | 410ddbf93f16a948ed28bbfe177433b3d138bd8c (diff) | |
| download | Qt-23098630c94e6655a33042bee0caa6c933c0c7d9.zip Qt-23098630c94e6655a33042bee0caa6c933c0c7d9.tar.gz Qt-23098630c94e6655a33042bee0caa6c933c0c7d9.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 9e39389..19858e7 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -1738,6 +1738,9 @@ void QGLContextPrivate::init(QPaintDevice *dev, const QGLFormat &format) workaround_brokenTextureFromPixmap = false; workaround_brokenTextureFromPixmap_init = false; + workaround_brokenAlphaTexSubImage = false; + workaround_brokenAlphaTexSubImage_init = false; + for (int i = 0; i < QT_GL_VERTEX_ARRAY_TRACKED_COUNT; ++i) vertexAttributeArraysEnabledState[i] = false; } |