diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:06:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:54:41 +0200 |
| commit | 6a772fd201ac738dc86e71bd82e98f65158e6335 (patch) | |
| tree | 674007720f41d27b251bbcffd7a368a93f88eb96 /src/plugins/platforms/qnx | |
| parent | 40206a9f6d7635bb19305d1c8d74908808e3529e (diff) | |
| parent | 4c346b6e2bfab976bc9b16275b8382aee38aefa4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
mkspecs/common/msvc-desktop.conf
mkspecs/win32-g++/qmake.conf
mkspecs/win32-icc/qmake.conf
src/platformsupport/fontdatabases/mac/coretext.pri
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
Diffstat (limited to 'src/plugins/platforms/qnx')
| -rw-r--r-- | src/plugins/platforms/qnx/qnx.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxglcontext.cpp | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/plugins/platforms/qnx/qnx.pro b/src/plugins/platforms/qnx/qnx.pro index 0b052adf0f..34be6d582e 100644 --- a/src/plugins/platforms/qnx/qnx.pro +++ b/src/plugins/platforms/qnx/qnx.pro @@ -78,7 +78,7 @@ qtConfig(opengles2) { HEADERS += qqnxglcontext.h \ qqnxeglwindow.h - QMAKE_USE += egl + QMAKE_USE += opengl_es2 egl } CONFIG(qqnx_pps) { 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 |