summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Blechmann <tim@klingt.org>2016-05-04 18:37:18 +0200
committerSean Harmer <sean.harmer@kdab.com>2016-05-06 19:39:40 +0000
commit5aeafcea467ced35adca1d762d38bfbba2b59e1f (patch)
treef42b2529009b0d6160f1121122f61a0a1668047c
parente6cb3b8c766ea393bb63165e539268986de85687 (diff)
compile fix for static qt with dynamic opengl
Change-Id: If78f6afeeeda5ea46a2ed17c6938fa25be9802fe Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
-rw-r--r--src/plugins/platforms/windows/qwindowseglcontext.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowseglcontext.cpp b/src/plugins/platforms/windows/qwindowseglcontext.cpp
index 42caeb1c89..a3f9f0b44b 100644
--- a/src/plugins/platforms/windows/qwindowseglcontext.cpp
+++ b/src/plugins/platforms/windows/qwindowseglcontext.cpp
@@ -560,7 +560,7 @@ QFunctionPointer QWindowsEGLContext::getProcAddress(const char *procName)
// return a function pointer for standard GLES2 functions too. These are not
// guaranteed to be queryable via eglGetProcAddress().
if (!procAddress) {
-#if defined(QT_STATIC)
+#if defined(QT_STATIC) && !defined(QT_OPENGL_DYNAMIC)
static struct StdFunc {
const char *name;
void *func;