diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-04-11 09:34:23 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-11 09:34:23 +0200 |
| commit | 093290a662c17cdbedee7e820ec51c3e5ba82aef (patch) | |
| tree | 9523faf19abf5f3d411a16e7758367a05efe8a76 /src/plugins/platforms/xcb | |
| parent | c7cbf216999cd833cae667b8c6fbfa65d33e8efd (diff) | |
| parent | 95c8f24b71445956651a5d1eade9475dceb16675 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/ios/quiview.mm
Change-Id: I0fd0adeca1590fffddd577873172f6d987a60412
Diffstat (limited to 'src/plugins/platforms/xcb')
| -rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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 } |