diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-20 10:35:18 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-20 10:35:18 (GMT) |
| commit | dbdc9cb65c758d87738fbaadfa7b1c39e33e96a0 (patch) | |
| tree | 58b7bbd7aba7fc9f3feafdf84084ced8d90cadfb /src/opengl/qgl_egl.cpp | |
| parent | 0a6faf00f06c8a0e2e0f4714bb14645172ee8922 (diff) | |
| parent | 7bec0ef0cd9ffb633586c820004607d2e3d66b07 (diff) | |
| download | Qt-dbdc9cb65c758d87738fbaadfa7b1c39e33e96a0.zip Qt-dbdc9cb65c758d87738fbaadfa7b1c39e33e96a0.tar.gz Qt-dbdc9cb65c758d87738fbaadfa7b1c39e33e96a0.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_egl.cpp')
| -rw-r--r-- | src/opengl/qgl_egl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl_egl.cpp b/src/opengl/qgl_egl.cpp index 822c9f6..0fbbbf9 100644 --- a/src/opengl/qgl_egl.cpp +++ b/src/opengl/qgl_egl.cpp @@ -147,7 +147,7 @@ void qt_glformat_from_eglconfig(QGLFormat& format, const EGLConfig config) // Clear the EGL error state because some of the above may // have errored out because the attribute is not applicable // to the surface type. Such errors don't matter. - QEgl::clearError(); + eglGetError(); } bool QGLFormat::hasOpenGL() |