summaryrefslogtreecommitdiffstats
path: root/src/angle/src
diff options
context:
space:
mode:
authorMiguel Costa <miguel.costa@qt.io>2018-10-16 00:59:39 +0200
committerOliver Wolff <oliver.wolff@qt.io>2018-10-16 05:19:43 +0000
commit8727bbd800ec7128442c959d5e53ce0272e5819b (patch)
tree6c3bddd69c63fb89655db1e2308aa80e16c98aa5 /src/angle/src
parent03b1380613d581863727a76db62dca974b55682b (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>
Diffstat (limited to 'src/angle/src')
-rw-r--r--src/angle/src/common/gles_common.pri1
-rw-r--r--src/angle/src/libEGL/libEGL.pro1
2 files changed, 2 insertions, 0 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