diff -ru qtbase\src\3rdparty\angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp qtbase\src\3rdparty\angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
--- qtbase/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp	2016-06-10 02:48:56.000000000 -0400
+++ qtbase/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp	2016-08-17 11:15:42.577000100 -0400
@@ -2704,17 +2704,6 @@
     }
 }
 
-const WorkaroundsD3D &RendererD3D::getWorkarounds() const
-{
-    if (!mWorkaroundsInitialized)
-    {
-        mWorkarounds            = generateWorkarounds();
-        mWorkaroundsInitialized = true;
-    }
-
-    return mWorkarounds;
-}
-
 gl::Error Renderer11::copyImage2D(const gl::Framebuffer *framebuffer, const gl::Rectangle &sourceRect, GLenum destFormat,
                                   const gl::Offset &destOffset, TextureStorage *storage, GLint level)
 {
diff -ru angle/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp qt-everywhere-opensource-src-5.7.0\qtbase\src\3rdparty\angle/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp
--- qtbase/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp	2016-06-10 02:48:56.000000000 -0400
+++ qtbase/src/3rdparty/angle/src/libANGLE/renderer/d3d/d3d11/win32/NativeWindow.cpp	2016-08-17 11:01:40.847218200 -0400
@@ -7,12 +7,14 @@
 // NativeWindow.cpp: Handler for managing HWND native window types.
 
 #include "libANGLE/renderer/d3d/d3d11/NativeWindow.h"
+#if defined(ANGLE_ENABLE_D3D11)
 #include "libANGLE/renderer/d3d/d3d11/renderer11_utils.h"
+#endif
 
 #include "common/debug.h"
 
 #include <initguid.h>
-#if !defined(__MINGW32__)
+#if !defined(__MINGW32__) && defined(ANGLE_ENABLE_D3D11)
 #include <dcomp.h>
 #endif
 
@@ -33,7 +35,7 @@
 
 NativeWindow::~NativeWindow()
 {
-#if !defined(__MINGW32__)
+#if !defined(__MINGW32__) && defined(ANGLE_ENABLE_D3D11)
     SafeRelease(mCompositionTarget);
     SafeRelease(mDevice);
     SafeRelease(mVisual);
@@ -210,7 +212,7 @@
 
 void NativeWindow::commitChange()
 {
-#if !defined(__MINGW32__)
+#if !defined(__MINGW32__) && defined(ANGLE_ENABLE_D3D11)
     if (mDevice)
     {
         mDevice->Commit();
diff -ru angle/src/libANGLE/renderer/d3d/RendererD3D.cpp qt-everywhere-opensource-src-5.7.0\qtbase\src\3rdparty\angle/src/libANGLE/renderer/d3d/RendererD3D.cpp
--- qtbase/src/3rdparty/angle/src/libANGLE/renderer/d3d/RendererD3D.cpp	2016-06-10 02:48:56.000000000 -0400
+++ qtbase/src/3rdparty/angle/src/libANGLE/renderer/d3d/RendererD3D.cpp	2016-08-17 11:12:21.795838000 -0400
@@ -700,4 +700,15 @@
     ASSERT(mAnnotator);
     return mAnnotator;
 }
+
+const WorkaroundsD3D &RendererD3D::getWorkarounds() const
+{
+    if (!mWorkaroundsInitialized)
+    {
+        mWorkarounds            = generateWorkarounds();
+        mWorkaroundsInitialized = true;
+    }
+
+    return mWorkarounds;
+}
 }