diff options
| author | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2016-03-24 12:38:18 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2016-04-25 05:57:38 +0000 |
| commit | e12ba07322cd61c5cf50c25ed8d1f08f6b1ff879 (patch) | |
| tree | d31a44c9f123ed764a00eff7b4fff656a07d54ab /src/plugins | |
| parent | d3dcc6f610b97be7cbfbb0a65988e5940568c825 (diff) | |
Update ANGLE to chromium/2651
Change-Id: I1cd32b780b1a0b913fab870e155ae1f4f9ac40d7
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtwindow.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/winrt/winrt.pro | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtwindow.cpp b/src/plugins/platforms/winrt/qwinrtwindow.cpp index 9df087c055..e768496902 100644 --- a/src/plugins/platforms/winrt/qwinrtwindow.cpp +++ b/src/plugins/platforms/winrt/qwinrtwindow.cpp @@ -42,7 +42,6 @@ #include <private/qeventdispatcher_winrt_p.h> #include <EGL/egl.h> -#define EGL_EGLEXT_PROTOTYPES #include <EGL/eglext.h> #include <qfunctions_winrt.h> diff --git a/src/plugins/platforms/winrt/winrt.pro b/src/plugins/platforms/winrt/winrt.pro index 261295ef0b..144c581015 100644 --- a/src/plugins/platforms/winrt/winrt.pro +++ b/src/plugins/platforms/winrt/winrt.pro @@ -4,7 +4,7 @@ CONFIG -= precompile_header QT += core-private gui-private platformsupport-private -DEFINES *= QT_NO_CAST_FROM_ASCII __WRL_NO_DEFAULT_LIB__ GL_GLEXT_PROTOTYPES +DEFINES *= QT_NO_CAST_FROM_ASCII __WRL_NO_DEFAULT_LIB__ LIBS += $$QMAKE_LIBS_CORE -ldwrite -ld3d11 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/freetype/include |