Update to 5.13.0

1 files changed, 0 insertions, 97 deletions

diff --git a/0003-Use-external-ANGLE-library.patch b/0003-Use-external-ANGLE-library.patch
deleted file mode 100644
index d491f963f30e..000000000000
--- a/0003-Use-external-ANGLE-library.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From c05b912a91f424375d6b44cb0cebdec7c44c967c Mon Sep 17 00:00:00 2001
-From: Martchus <martchus@gmx.net>
-Date: Sun, 18 Sep 2016 13:41:38 +0200
-Subject: [PATCH 03/34] Use external ANGLE library
-
----
- src/gui/Qt5GuiConfigExtras.cmake.in       | 4 ++--
- src/gui/gui.pro                           | 8 ++------
- src/opengl/opengl.pro                     | 1 +
- src/plugins/platforms/windows/windows.pri | 1 +
- src/src.pro                               | 4 ----
- 5 files changed, 6 insertions(+), 12 deletions(-)
-
-diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 84dbbfebd4..46a8696ff3 100644
---- a/src/gui/Qt5GuiConfigExtras.cmake.in
-+++ b/src/gui/Qt5GuiConfigExtras.cmake.in
-@@ -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 --git a/src/gui/gui.pro b/src/gui/gui.pro
-index 06c9cd3939..cb1314c1ef 100644
---- a/src/gui/gui.pro
-+++ b/src/gui/gui.pro
-@@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \
-     imageformats \
-     egldeviceintegrations
- 
--# This is here only because the platform plugin is no module, obviously.
--qtConfig(angle) {
--    MODULE_AUX_INCLUDES = \
--        \$\$QT_MODULE_INCLUDE_BASE/QtANGLE
--}
--
- # Code coverage with TestCocoon
- # The following is required as extra compilers use $$QMAKE_CXX instead of $(CXX).
- # Without this, testcocoon.prf is read only after $$QMAKE_CXX is used by the
-@@ -35,6 +29,8 @@ testcocoon {
- osx: LIBS_PRIVATE += -framework AppKit
- darwin: LIBS_PRIVATE += -framework CoreGraphics
- 
-+win32:qtConfig(angle): LIBS_PRIVATE += -lGLESv2
-+
- CONFIG += simd optimize_full
- 
- include(accessible/accessible.pri)
-diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
-index 8b2349ff2f..f5e43c6adc 100644
---- a/src/opengl/opengl.pro
-+++ b/src/opengl/opengl.pro
-@@ -10,6 +10,7 @@ QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
- 
- qtConfig(opengl): CONFIG += opengl
- qtConfig(opengles2): CONFIG += opengles2
-+win32:qtConfig(angle): LIBS_PRIVATE += -lGLESv2
- 
- HEADERS += qgl.h \
-            qgl_p.h \
-diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
-index 7004d7e854..a0b0bd81db 100644
---- a/src/plugins/platforms/windows/windows.pri
-+++ b/src/plugins/platforms/windows/windows.pri
-@@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
- QT_FOR_CONFIG += gui
- 
- qtConfig(opengl):!qtConfig(opengles2):!qtConfig(dynamicgl): LIBS *= -lopengl32
-+qtConfig(angle):LIBS += -lGLESv2 -lEGL
- 
- mingw: LIBS *= -luuid
- # For the dialog helpers:
-diff --git a/src/src.pro b/src/src.pro
-index 1c76a2e46f..6a5f046b34 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -199,10 +199,6 @@ qtConfig(gui) {
-         SUBDIRS += src_3rdparty_harfbuzzng
-         src_gui.depends += src_3rdparty_harfbuzzng
-     }
--    qtConfig(angle) {
--        SUBDIRS += src_angle
--        src_gui.depends += src_angle
--    }
-     qtConfig(png):!qtConfig(system-png) {
-         SUBDIRS += src_3rdparty_libpng
-         src_3rdparty_freetype.depends += src_3rdparty_libpng
--- 
-2.21.0
-