1 files changed, 0 insertions, 79 deletions
diff --git a/use-external-angle-library.patch b/use-external-angle-library.patch
deleted file mode 100644
index bbdda14974bc..000000000000
--- a/use-external-angle-library.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-diff -U 3 -r a/src/gui/gui.pro b/src/gui/gui.pro
---- a/src/gui/gui.pro	2015-06-29 14:04:55.000000000 -0600
-+++ b/src/gui/gui.pro	2015-07-18 10:50:02.228227482 -0600
-@@ -17,10 +17,5 @@
-     imageformats \
-     egldeviceintegrations
- 
--# This is here only because the platform plugin is no module, obviously.
--win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
--    MODULE_AUX_INCLUDES = \
--        \$\$QT_MODULE_INCLUDE_BASE/QtANGLE
--}
- 
- # Code coverage with TestCocoon
-@@ -35,6 +29,10 @@
- 
- mac:!ios: LIBS_PRIVATE += -framework Cocoa
- 
-+win32:contains(QT_CONFIG, angle) {
-+    LIBS_PRIVATE += -lGLESv2
-+}
-+
- CONFIG += simd optimize_full
- 
- include(accessible/accessible.pri)
-diff -U 3 -r a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
---- a/src/gui/Qt5GuiConfigExtras.cmake.in	2015-06-29 14:04:51.000000000 -0600
-+++ b/src/gui/Qt5GuiConfigExtras.cmake.in	2015-07-18 10:51:09.666053970 -0600
-@@ -2,9 +2,9 @@
- !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
- 
- !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
--set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
-+set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\")
- !!ELSE
--set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
-+set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\")
- !!ENDIF
- 
- _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
-diff -U 3 -r a/src/opengl/opengl.pro b/src/opengl/opengl.pro
---- a/src/opengl/opengl.pro	2015-06-29 14:04:05.000000000 -0600
-+++ b/src/opengl/opengl.pro	2015-07-18 10:46:46.588388411 -0600
-@@ -12,6 +12,9 @@
- 
- contains(QT_CONFIG, opengl):CONFIG += opengl
- contains(QT_CONFIG, opengles2):CONFIG += opengles2
-+win32:contains(QT_CONFIG, angle) {
-+    LIBS_PRIVATE += -lGLESv2
-+}
- 
- HEADERS += qgl.h \
-            qgl_p.h \
-
-diff -U 3 -r a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
---- a/src/plugins/platforms/windows/windows.pri	2015-06-29 14:04:40.000000000 -0600
-+++ b/src/plugins/platforms/windows/windows.pri	2015-07-18 10:53:45.585348009 -0600
-@@ -3,6 +3,7 @@
- !wince*:LIBS *= -luser32 -lwinspool -limm32 -lwinmm  -loleaut32
- 
- contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):!contains(QT_CONFIG, dynamicgl): LIBS *= -lopengl32
-+contains(QT_CONFIG, angle):LIBS += -lGLESv2 -lEGL
- 
- mingw: LIBS *= -luuid
- # For the dialog helpers:
-diff -U 3 -r a/src/src.pro b/src/src.pro
---- a/src/src.pro	2015-06-29 14:05:06.000000000 -0600
-+++ b/src/src.pro	2015-07-18 10:43:01.698195194 -0600
-@@ -155,10 +155,6 @@
-         SUBDIRS += src_3rdparty_harfbuzzng
-         src_gui.depends += src_3rdparty_harfbuzzng
-     }
--    win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
--        SUBDIRS += src_angle
--        src_gui.depends += src_angle
--    }
-     contains(QT_CONFIG, freetype) {
-         SUBDIRS += src_3rdparty_freetype
-         src_platformsupport.depends += src_3rdparty_freetype