diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-04-01 15:36:26 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-04-01 15:47:51 (GMT) |
| commit | 991f59a295e7678165b1db7befc9beac8bdbe503 (patch) | |
| tree | aeb8d58444baae4e412a7eddd9fa12cd2aaae863 /src/plugins/platforms/xcb/qglxintegration.cpp | |
| parent | 33ca59cd1827195cb7ef91a18c0775568471d4ce (diff) | |
| download | Qt-991f59a295e7678165b1db7befc9beac8bdbe503.zip Qt-991f59a295e7678165b1db7befc9beac8bdbe503.tar.gz Qt-991f59a295e7678165b1db7befc9beac8bdbe503.tar.bz2 | |
Moved all XCB event handling back into the main thread.
There are to many synchronization problems if any GL call can lead the
event processing thread to stall.
Diffstat (limited to 'src/plugins/platforms/xcb/qglxintegration.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qglxintegration.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qglxintegration.cpp b/src/plugins/platforms/xcb/qglxintegration.cpp index d1171b8..19a9503 100644 --- a/src/plugins/platforms/xcb/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/qglxintegration.cpp @@ -137,7 +137,6 @@ void QGLXContext::createDefaultSharedContext(QXcbScreen *screen) void QGLXContext::makeCurrent() { Q_XCB_NOOP(m_screen->connection()); - m_screen->connection()->setEventProcessingEnabled(false); QPlatformGLContext::makeCurrent(); glXMakeCurrent(DISPLAY_FROM_XCB(m_screen), m_drawable, m_context); Q_XCB_NOOP(m_screen->connection()); @@ -148,7 +147,6 @@ void QGLXContext::doneCurrent() Q_XCB_NOOP(m_screen->connection()); QPlatformGLContext::doneCurrent(); glXMakeCurrent(DISPLAY_FROM_XCB(m_screen), 0, 0); - m_screen->connection()->setEventProcessingEnabled(true); Q_XCB_NOOP(m_screen->connection()); } |