summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-03-25 09:59:50 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2011-03-25 11:20:31 (GMT)
commit3b37a79cd94bb0c03d7d8af0f20036ed60a7056f (patch)
tree9360ab06d7d857dbc2ecd5347cf166e11db5804e
parent372539b350b8c48863d04e46438267210569768e (diff)
downloadQt-3b37a79cd94bb0c03d7d8af0f20036ed60a7056f.zip
Qt-3b37a79cd94bb0c03d7d8af0f20036ed60a7056f.tar.gz
Qt-3b37a79cd94bb0c03d7d8af0f20036ed60a7056f.tar.bz2
Fixed GLX on Nvidia for XCB backend.
We probably need to make sure the window is mapped before we start issuing GL commands.
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index e33a661..b6c133f 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -219,6 +219,9 @@ void QXcbWindow::setVisible(bool visible)
xcb_wm_hints_set_normal(&hints);
xcb_set_wm_hints(xcb_connection(), m_window, &hints);
xcb_map_window(xcb_connection(), m_window);
+#if defined(XCB_USE_GLX)
+ glXWaitX();
+#endif
} else {
xcb_unmap_window(xcb_connection(), m_window);