diff options
Diffstat (limited to 'qt5-add-angle-support.patch')
| -rw-r--r-- | qt5-add-angle-support.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/qt5-add-angle-support.patch b/qt5-add-angle-support.patch deleted file mode 100644 index 8b9af40ac2a8..000000000000 --- a/qt5-add-angle-support.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -U 3 -r a/configure b/configure ---- a/configure 2015-06-29 14:03:05.000000000 -0600 -+++ b/configure 2015-07-18 11:14:30.312317765 -0600 -@@ -5081,7 +5081,7 @@ - fi - if [ "$CFG_OPENGL" = "auto" ] || [ "$CFG_OPENGL" = "yes" ]; then - if compileTest x11/opengl "OpenGL"; then -- CFG_OPENGL=desktop -+ CFG_OPENGL=angle - elif compileTest unix/opengles2 "OpenGL ES 2.0"; then - CFG_OPENGL=es2 - else -@@ -6072,6 +6072,11 @@ - QT_CONFIG="$QT_CONFIG opengles2" - fi - -+if [ "$CFG_OPENGL" = "angle" ]; then -+ QCONFIG_FLAGS="$QCONFIG_FLAGS QT_OPENGL_ES QT_OPENGL_ES_2" -+ QT_CONFIG="$QT_CONFIG opengles2 egl angle" -+fi -+ - if [ "$CFG_SHARED" = "yes" ]; then - QT_CONFIG="$QT_CONFIG shared" - QTCONFIG_CONFIG="$QTCONFIG_CONFIG shared" -@@ -7077,7 +7082,7 @@ - report_support " NIS ...................." "$CFG_NIS" - report_support " OpenGL / OpenVG:" - report_support " EGL .................." "$CFG_EGL" --report_support " OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.0+" -+report_support " OpenGL ..............." "$CFG_OPENGL" yes "Desktop OpenGL" es2 "OpenGL ES 2.0+" angle "ANGLE" - report_support " OpenVG ..............." "$CFG_OPENVG-$CFG_OPENVG_SHIVA" yes-yes "ShivaVG" yes-no "native" - report_support " PCRE ..................." "$CFG_PCRE" yes "system library" qt "bundled copy" - if [ -n "$PKG_CONFIG" ]; then -diff -U 3 -r a/src/plugins/platforms/windows/qwindowsglcontext.cpp b/src/plugins/platforms/windows/qwindowsglcontext.cpp ---- a/src/plugins/platforms/windows/qwindowsglcontext.cpp 2015-06-29 14:04:40.000000000 -0600 -+++ b/src/plugins/platforms/windows/qwindowsglcontext.cpp 2015-07-18 11:16:05.767172673 -0600 -@@ -45,7 +45,9 @@ - #include <algorithm> - - #include <wingdi.h> -+#ifndef QT_OPENGL_ES_2 - #include <GL/gl.h> -+#endif - - // #define DEBUG_GL - |