qt5base: fix build when egl headers need a definition
PATCH 1/1 qt5base: fix build when egl headers need a definition
[This time, sent to the list]
Quoted 14 lines · On Wednesday 18 September 2013 19:55:39 you wrote:
Quoted 14 lines
(quoted diff) +9
-0@@ -0,0 +1,21 @@ +--- a/configure ++++ b/configure +@@ -5391,6 +5391,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 @@
Quoted 8 lines
Review
Quoted 5 lines
+ } else {
(quoted diff) +4
-0+ INCLUDEPATH += $$QMAKE_INCDIR_EGL + LIBS_PRIVATE += $$QMAKE_LIBS_EGL ++ QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL ++ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EGLShouldn't we have separate
QMAKE_CFLAGS_EGLandQMAKE_CXXFLAGS_EGL? Or are you following a pattern used in other places?
Setting only QMAKE_CFLAGS_EGL did not fix the build. Platform plugins are written in C++ and the build system honors CXXFLAGS only. I saw the same assignments in other .prf files, too.