diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-16 07:37:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-16 12:35:36 +0100 |
| commit | 90c425642dfeae4564b43dacf15f80479962e910 (patch) | |
| tree | 7e51683195210b3c70c04a8a0753ee272af1cd4c /config.tests/unix/opengles2 | |
| parent | 1a43199fcea1bcec1ebf1a1a12cd3dcb942d67b4 (diff) | |
| parent | 9808b53fde1dfc65ad3757cc6720e430c3cc89a2 (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
mkspecs/common/linux-android.conf
src/gui/opengl/qopengl.h
src/network/socket/qnativesocketengine_winrt.cpp
src/network/socket/qnativesocketengine_winrt_p.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
sync.profile
Change-Id: If70aaf2c49df91157b864cf0d7d9513546c9bec4
Diffstat (limited to 'config.tests/unix/opengles2')
| -rw-r--r-- | config.tests/unix/opengles2/opengles2.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config.tests/unix/opengles2/opengles2.cpp b/config.tests/unix/opengles2/opengles2.cpp index af67129fdd..a9ad0d6766 100644 --- a/config.tests/unix/opengles2/opengles2.cpp +++ b/config.tests/unix/opengles2/opengles2.cpp @@ -40,6 +40,7 @@ #ifdef BUILD_ON_MAC #include <OpenGLES/ES2/gl.h> #else + #define GL_GLEXT_PROTOTYPES #include <GLES2/gl2.h> #endif |