Details
-
Bug
-
Resolution: Done
-
P4: Low
-
5.5.0 Beta
-
wince
Description
a static build for wince fails, because qt wants to link statically against eglGetPlatformDisplayEXT which is only used on Angle builds.
This is fixed by this simple patch.
diff -r -U 5 -N -x '*.orig' -x '*.rej' -x '*.bak' -x Patches -x .git -x doc -x tests -x examples a\qtbase\src\plugins\platforms\windows/qwindowseglcontext.cpp b\qtbase\src\plugins\platforms\windows/qwindowseglcontext.cpp --- a\qtbase\src\plugins\platforms\windows/qwindowseglcontext.cpp +++ b\qtbase\src\plugins\platforms\windows/qwindowseglcontext.cpp @@ -135,11 +135,13 @@ } #endif eglGetError = RESOLVE((EGLint (EGLAPIENTRY *)(void)), eglGetError); eglGetDisplay = RESOLVE((EGLDisplay (EGLAPIENTRY *)(EGLNativeDisplayType)), eglGetDisplay); +#ifdef EGL_ANGLE_platform_angle_opengl eglGetPlatformDisplayEXT = RESOLVE((EGLDisplay (EGLAPIENTRY *)(EGLenum platform, void *native_display, const EGLint *attrib_list)), eglGetPlatformDisplayEXT); +#endif eglInitialize = RESOLVE((EGLBoolean (EGLAPIENTRY *)(EGLDisplay, EGLint *, EGLint *)), eglInitialize); eglTerminate = RESOLVE((EGLBoolean (EGLAPIENTRY *)(EGLDisplay)), eglTerminate); eglChooseConfig = RESOLVE((EGLBoolean (EGLAPIENTRY *)(EGLDisplay, const EGLint *, EGLConfig *, EGLint, EGLint *)), eglChooseConfig); eglGetConfigAttrib = RESOLVE((EGLBoolean (EGLAPIENTRY *)(EGLDisplay, EGLConfig, EGLint, EGLint *)), eglGetConfigAttrib); eglCreateWindowSurface = RESOLVE((EGLSurface (EGLAPIENTRY *)(EGLDisplay, EGLConfig, EGLNativeWindowType, const EGLint *)), eglCreateWindowSurface);
Attachments
For Gerrit Dashboard: QTBUG-46284 | ||||||
---|---|---|---|---|---|---|
# | Subject | Branch | Project | Status | CR | V |
113051,4 | Windows: Fix EGL resolve macro to use static linking for ANGLE/static only. | 5.5 | qt/qtbase | Status: ABANDONED | -2 | 0 |
113166,3 | windows: Use EGL extensions as they ought to be used | 5.5 | qt/qtbase | Status: MERGED | +2 | 0 |