qt5base: fix build when egl headers need a definition

The build with gpu-viv-bin-mx6q libraries was broken since it wasn't
using "-DEGL_API_FB=1" flag which is found in egl.pc.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fatih Aşıcı 2013-09-19 10:01:43 +03:00 committed by Peter Korsgaard
parent 3d19b7ef59
commit 6f21eefbe9

View File

@ -0,0 +1,28 @@
egl.prf: Append egl CFLAGS to QMAKE_C[XX]FLAGS
Projects including egl in their config (e.g. with CONFIG += egl) cannot get
egl CFLAGS without this.
Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
--- a/configure
+++ b/configure
@@ -4934,6 +4934,7 @@
QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null`
QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL"
QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL"
+ QMakeVar set QMAKE_CFLAGS_EGL "$QMAKE_CFLAGS_EGL"
fi # detect EGL support
if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then
CFG_EGL=yes
--- a/mkspecs/features/egl.prf
+++ b/mkspecs/features/egl.prf
@@ -14,6 +14,8 @@
} else {
INCLUDEPATH += $$QMAKE_INCDIR_EGL
LIBS_PRIVATE += $$QMAKE_LIBS_EGL
+ QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL
+ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EGL
LIBS += $$QMAKE_LFLAGS_EGL
for(p, QMAKE_LIBDIR_EGL) {
exists($$p):LIBS_PRIVATE += -L$$p