Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging

* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Dont do doneCurrent in swapBuffers
2011-05-06 04:21:17 +10:00 · 2011-05-06 04:21:17 +10:00 · bedc018370
parent 8663200eb0 1edc451057
commit bedc018370
1 changed files with 0 additions and 1 deletions
--- a/src/plugins/platforms/xcb/qglxintegration.cpp
+++ b/src/plugins/platforms/xcb/qglxintegration.cpp
@ -110,7 +110,6 @@ void QGLXContext::swapBuffers()
 {
    Q_XCB_NOOP(m_screen->connection());
    glXSwapBuffers(DISPLAY_FROM_XCB(m_screen), m_drawable);
-    doneCurrent();
    Q_XCB_NOOP(m_screen->connection());
 }