From a35c6a49c938fefbf25332cc5a2dc760f6d0c4ed Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Tue, 10 Apr 2018 14:01:47 +0300 Subject: glx: Fix loading OpenGL library when libGL.so symlink is missing Task-number: QTBUG-67537 Change-Id: Ib59bc27582f44b0c6b04efa57c44d877e1685bbb Reviewed-by: Gatis Paeglis Reviewed-by: Laszlo Agocs Reviewed-by: Oswald Buddenhagen --- src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp index d37eb572a6..baf3dbd42a 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp @@ -639,6 +639,8 @@ QFunctionPointer QGLXContext::getProcAddress(const char *procName) extern const QString qt_gl_library_name(); // QLibrary lib(qt_gl_library_name()); QLibrary lib(QLatin1String("GL")); + if (!lib.load()) + lib.setFileNameAndVersion(QLatin1String("GL"), 1); glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); #endif } -- cgit v1.2.3