diff options
| -rw-r--r-- | src/plugins/platforms/windows/qwindowseglcontext.cpp | 2 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 1 |
2 files changed, 2 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; diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index ad045b932c..5cd1928f65 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1676,6 +1676,7 @@ void Configure::applySpecSpecifics() dictionary["ANDROID_STYLE_ASSETS"] = "yes"; dictionary[ "STYLE_ANDROID" ] = "yes"; dictionary[ "POLL" ] = "poll"; + dictionary[ "ZLIB" ] = "system"; } } |