@@ -, +, @@ 
---
 .../platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp        | 5 ++++-
 .../platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp	
+++ a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp	
@@ -652,7 +652,10 @@ void QGLXContext::queryDummyContext()
         oldSurface = oldContext->surface();
 
     QScopedPointer<QSurface> surface;
-    const char *glxvendor = glXGetClientString(glXGetCurrentDisplay(), GLX_VENDOR);
+    Display *display = glXGetCurrentDisplay();
+    const char *glxvendor = 0;
+    if (display)
+        glxvendor = glXGetClientString(display, GLX_VENDOR);
     if (glxvendor && !strcmp(glxvendor, "ATI")) {
         QWindow *window = new QWindow;
         window->resize(64, 64);
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp	
+++ a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp	
@@ -195,7 +195,10 @@ QPlatformOffscreenSurface *QXcbGlxIntegration::createPlatformOffscreenSurface(QO
     static bool glxPbufferUsable = true;
     if (!vendorChecked) {
         vendorChecked = true;
-        const char *glxvendor = glXGetClientString(glXGetCurrentDisplay(), GLX_VENDOR);
+        Display *display = glXGetCurrentDisplay();
+        const char *glxvendor = 0;
+        if (display)
+            glxvendor = glXGetClientString(display, GLX_VENDOR);
         if (glxvendor && !strcmp(glxvendor, "ATI"))
             glxPbufferUsable = false;
     }
--