diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-29 01:00:22 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-29 01:00:22 +0200 |
| commit | 4a54e8fd821651079a53f4adc831efd6b1ba9bc7 (patch) | |
| tree | 32dfcf43aa554a9e235a37a831e366b68bcaafa3 /src/gui/opengl | |
| parent | e092b32922ef650d49167aaf48f9d33190191f9f (diff) | |
| parent | 9f1a1e320c118ec84d389aaf83008bf01521ce6f (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ic712e8a84b01b212bb1121d7a2c9b85e0d2da9da
Diffstat (limited to 'src/gui/opengl')
| -rw-r--r-- | src/gui/opengl/qopengldebug.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/opengl/qopengldebug.cpp b/src/gui/opengl/qopengldebug.cpp index 2e628a2bd5..9f1bb76869 100644 --- a/src/gui/opengl/qopengldebug.cpp +++ b/src/gui/opengl/qopengldebug.cpp @@ -1366,7 +1366,7 @@ bool QOpenGLDebugLogger::initialize() #define GET_DEBUG_PROC_ADDRESS(procName) \ d->procName = reinterpret_cast< qt_ ## procName ## _t >( \ - d->context->getProcAddress(#procName) \ + d->context->getProcAddress(d->context->isOpenGLES() ? (#procName "KHR") : (#procName)) \ ); GET_DEBUG_PROC_ADDRESS(glDebugMessageControl); |