diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-27 07:46:29 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-27 07:46:29 (GMT) |
| commit | 4de2a2241e9e1c5f29223d6bd0616e6db77be70e (patch) | |
| tree | ec351be9276a50448f461ece521a44a94629d93c /src | |
| parent | 6ffb0c66861e879fae4a6d08901180e30a7f785c (diff) | |
| parent | 443f281bc4643253ea737fd5b7290b637eb4cac5 (diff) | |
| download | Qt-4de2a2241e9e1c5f29223d6bd0616e6db77be70e.zip Qt-4de2a2241e9e1c5f29223d6bd0616e6db77be70e.tar.gz Qt-4de2a2241e9e1c5f29223d6bd0616e6db77be70e.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/qgl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index e9c4190..02991d9 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -2101,7 +2101,7 @@ QGLTexture *QGLContextPrivate::bindTexture(const QPixmap &pixmap, GLenum target, if (pd->classId() == QPixmapData::X11Class) { texture = bindTextureFromNativePixmap(pd, key, options); if (texture) { - texture->options |= QGLContext::BindMemoryManaged; + texture->options |= QGLContext::MemoryManagedBindOption; texture->boundPixmap = pd; boundPixmaps.insert(pd, QPixmap(pixmap)); } |