diff options
author | Miguel Costa <miguel.costa@qt.io> | 2018-10-16 00:59:39 +0200 |
---|---|---|
committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-10-16 05:19:43 +0000 |
commit | 8727bbd800ec7128442c959d5e53ce0272e5819b (patch) | |
tree | 6c3bddd69c63fb89655db1e2308aa80e16c98aa5 | |
parent | 03b1380613d581863727a76db62dca974b55682b (diff) |
Fix build failed with ANGLE
Added eglext_angle.h and gl2ext_angle.h to the list of header files
copied to include/QtANGLE during install. These two header files were
introduced by the recent ANGLE update but were not added to the install.
This was causing build failures when including the ANGLE headers (e.g.
in qtmultimedia).
Task-number: QTBUG-71158
Change-Id: If2f1a9ecfcdf509cccf2b3671adf575cc39892d4
Reviewed-by: Andre de la Rocha <andre.rocha@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
-rw-r--r-- | src/angle/src/common/gles_common.pri | 1 | ||||
-rw-r--r-- | src/angle/src/libEGL/libEGL.pro | 1 | ||||
-rw-r--r-- | sync.profile | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/src/angle/src/common/gles_common.pri b/src/angle/src/common/gles_common.pri index e32fd0ea01..fdd0e45971 100644 --- a/src/angle/src/common/gles_common.pri +++ b/src/angle/src/common/gles_common.pri @@ -766,6 +766,7 @@ khr_headers.path = $$[QT_INSTALL_HEADERS]/QtANGLE/KHR gles2_headers.files = \ $$ANGLE_DIR/include/GLES2/gl2.h \ $$ANGLE_DIR/include/GLES2/gl2ext.h \ + $$ANGLE_DIR/include/GLES2/gl2ext_angle.h \ $$ANGLE_DIR/include/GLES2/gl2platform.h gles2_headers.path = $$[QT_INSTALL_HEADERS]/QtANGLE/GLES2 gles3_headers.files = \ diff --git a/src/angle/src/libEGL/libEGL.pro b/src/angle/src/libEGL/libEGL.pro index 9e9c639002..889f39890e 100644 --- a/src/angle/src/libEGL/libEGL.pro +++ b/src/angle/src/libEGL/libEGL.pro @@ -21,6 +21,7 @@ SOURCES += \ egl_headers.files = \ $$ANGLE_DIR/include/EGL/egl.h \ $$ANGLE_DIR/include/EGL/eglext.h \ + $$ANGLE_DIR/include/EGL/eglext_angle.h \ $$ANGLE_DIR/include/EGL/eglplatform.h egl_headers.path = $$[QT_INSTALL_HEADERS]/QtANGLE/EGL INSTALLS += egl_headers diff --git a/sync.profile b/sync.profile index c674aab2f3..a6d0e2a4a7 100644 --- a/sync.profile +++ b/sync.profile @@ -80,7 +80,7 @@ ); @qpa_headers = ( qr/^(?!qplatformheaderhelper)qplatform/, qr/^qwindowsystem/ ); -my @angle_headers = ('egl.h', 'eglext.h', 'eglplatform.h', 'gl2.h', 'gl2ext.h', 'gl2platform.h', 'ShaderLang.h', 'khrplatform.h'); +my @angle_headers = ('egl.h', 'eglext.h', 'eglext_angle.h', 'eglplatform.h', 'gl2.h', 'gl2ext.h', 'gl2ext_angle.h', 'gl2platform.h', 'ShaderLang.h', 'khrplatform.h'); my @internal_zlib_headers = ( "crc32.h", "deflate.h", "gzguts.h", "inffast.h", "inffixed.h", "inflate.h", "inftrees.h", "trees.h", "zutil.h" ); my @zlib_headers = ( "zconf.h", "zlib.h" ); @ignore_headers = ( @internal_zlib_headers ); |