6 files changed, 3 insertions, 55 deletions
diff --git a/mkspecs/common/angle.conf b/mkspecs/common/angle.conf
deleted file mode 100644
index fad0e719d2..0000000000
--- a/mkspecs/common/angle.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Renaming these files requires that the LIBRARY entry of their corresponding
-# def files are also updated to reflect the name.
-# The .def files are found in the angle directories:
-#
-#       qtbase\src\3rdparty\angle\src\libEGL\libEGL[d?].def
-#       qtbase\src\3rdparty\angle\src\libEGL\libGLESv2[d?].def
-#
-# If a combined ANGLE library is used, the def files will automatically be
-# combined into QtANGLE[d?].def by QtAngle.pro.
-
-LIBEGL_NAME = libEGL
-LIBGLESV2_NAME = libGLESv2
-LIBQTANGLE_NAME = QtANGLE
diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
index c3a1f3a373..b198d69fd6 100644
--- a/mkspecs/common/g++-win32.conf
+++ b/mkspecs/common/g++-win32.conf
@@ -76,5 +76,4 @@ QMAKE_STRIPFLAGS_LIB   += --strip-unneeded
 QMAKE_OBJCOPY           = $${CROSS_COMPILE}objcopy
 QMAKE_NM                = $${CROSS_COMPILE}nm -P
 
-include(angle.conf)
 include(windows-vulkan.conf)
diff --git a/mkspecs/common/msvc-desktop.conf b/mkspecs/common/msvc-desktop.conf
index f5d12f445b..a5993287ed 100644
--- a/mkspecs/common/msvc-desktop.conf
+++ b/mkspecs/common/msvc-desktop.conf
@@ -115,6 +115,5 @@ VCPROJ_EXTENSION        = .vcproj
 VCSOLUTION_EXTENSION    = .sln
 VCPROJ_KEYWORD          = Qt4VSv1.0
 
-include(angle.conf)
 include(windows-desktop.conf)
 include(windows-vulkan.conf)
diff --git a/mkspecs/common/winrt_winphone/qmake.conf b/mkspecs/common/winrt_winphone/qmake.conf
index e683018a81..55fcbe5ab3 100644
--- a/mkspecs/common/winrt_winphone/qmake.conf
+++ b/mkspecs/common/winrt_winphone/qmake.conf
@@ -100,6 +100,4 @@ WINRT_MANIFEST.capabilities_device = defaults
 
 WINDOWS_TARGET_PLATFORM_VERSION = $$(UCRTVERSION)
 
-include(../angle.conf)
-
 load(qt_config)
diff --git a/mkspecs/features/ctest_testcase_common.prf b/mkspecs/features/ctest_testcase_common.prf
index ea90bf89cd..7215b2d465 100644
--- a/mkspecs/features/ctest_testcase_common.prf
+++ b/mkspecs/features/ctest_testcase_common.prf
@@ -48,7 +48,6 @@ for (dep, dependentmodules): \
 dependentmodules = $$join(mod_deps, ";")
 
 QT_FOR_CONFIG += gui-private
-qtHaveModule(gui):qtConfig(angle): CMAKE_GL_DEFINES = -DQT_WITH_ANGLE=True
 qtHaveModule(gui):!qtConfig(egl): CMAKE_GL_DEFINES += -DNO_EGL=True
 
 CMAKE_MODULE_VERSIONS =
diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf
index 8568a0c379..a4aca843ea 100644
--- a/mkspecs/features/win32/opengl.prf
+++ b/mkspecs/features/win32/opengl.prf
@@ -1,40 +1,6 @@
 QT_FOR_CONFIG += gui
 
-defineTest(prependOpenGlLib) {
-    path = $$QT.core.libs/$$QMAKE_PREFIX_STATICLIB$$1
-    ext = .$$QMAKE_EXTENSION_STATICLIB
-    !mingw|qtConfig(debug_and_release): debug_suffix = "d"
-    QMAKE_LIBS_OPENGL_ES2 = $${path}$${ext} $$QMAKE_LIBS_OPENGL_ES2
-    QMAKE_LIBS_OPENGL_ES2_DEBUG = $${path}$${debug_suffix}$${ext} $$QMAKE_LIBS_OPENGL_ES2_DEBUG
-    export(QMAKE_LIBS_OPENGL_ES2)
-    export(QMAKE_LIBS_OPENGL_ES2_DEBUG)
-}
-
-qtConfig(opengles2) {
-    # Depending on the configuration we use libQtANGLE or libEGL and libGLESv2
-    qtConfig(combined-angle-lib) {
-        prependOpenGlLib($$LIBQTANGLE_NAME)
-    } else {
-        prependOpenGlLib($$LIBGLESV2_NAME)
-        prependOpenGlLib($$LIBEGL_NAME)
-    }
-#   For Desktop, use the ANGLE library location passed on from configure.
-    INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
-    CONFIG(debug, debug|release) {
-        QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2_DEBUG
-        qtConfig(angle) {
-            LIBS += $$QMAKE_LIBS_OPENGL_ES2_DEBUG
-        } else {
-            LIBS += $$QMAKE_LIBS_OPENGL_ES2
-        }
-    } else {
-        LIBS += $$QMAKE_LIBS_OPENGL_ES2
-        QMAKE_LIBDIR += $$QMAKE_LIBDIR_OPENGL_ES2_RELEASE
-    }
-    qtConfig(static): DEFINES += GL_APICALL= EGLAPI=
-} else {
-    !qtConfig(dynamicgl) {
-        QMAKE_LIBS += $$QMAKE_LIBS_OPENGL
-        QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL
-    }
+!qtConfig(dynamicgl) {
+    QMAKE_LIBS += $$QMAKE_LIBS_OPENGL
+    QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL
 }