diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-19 08:57:59 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-19 08:57:59 +0200 |
| commit | 550e16b8141caf8d6c0614a423a295b0aea9cab1 (patch) | |
| tree | 1495e6a9808d1140142a2cf46c6e36cba95f8890 /src/plugins/platforms/qnx/qqnxglcontext.cpp | |
| parent | 087b4fc6cd3a68db6ac4c3a7f43c03aa6e73c088 (diff) | |
| parent | 9954187adba4d26a1b1aa93874993f15d6d8a0b9 (diff) | |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Change-Id: Ia8ac1960387c0f78c32f9d0385bb0aa9a8209af1
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxglcontext.cpp')
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxglcontext.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/plugins/platforms/qnx/qqnxglcontext.cpp b/src/plugins/platforms/qnx/qqnxglcontext.cpp index 0d3076a743..d35a4f0bba 100644 --- a/src/plugins/platforms/qnx/qqnxglcontext.cpp +++ b/src/plugins/platforms/qnx/qqnxglcontext.cpp @@ -47,6 +47,8 @@ #include <QtGui/QOpenGLContext> #include <QtGui/QScreen> +#include <dlfcn.h> + #if defined(QQNXGLCONTEXT_DEBUG) #define qGLContextDebug qDebug #else @@ -262,7 +264,10 @@ QFunctionPointer QQnxGLContext::getProcAddress(const char *procName) qFatal("QQNX: failed to set EGL API, err=%d", eglGetError()); // Lookup EGL extension function pointer - return static_cast<QFunctionPointer>(eglGetProcAddress(procName)); + QFunctionPointer result = static_cast<QFunctionPointer>(eglGetProcAddress(procName)); + if (!result) + result = reinterpret_cast<QFunctionPointer>(dlsym(RTLD_DEFAULT, procName)); + return result; } bool QQnxGLContext::isSharing() const |