qt4: Add include/uapi into headers search path for i.MX6

The FSL specific headers, when using the 3.10.9 kernel, are installed
in include/uapi so we need to check for them in this directory as well.

Change-Id: I207e40caa739dc8fe4cd1b25caf2c0a65cf8ae1c
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

2 files changed, 6 insertions, 2 deletions

diff --git a/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend b/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend
index a9330bfc9..05cc2e685 100644
--- a/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend
+++ b/meta-fsl-arm/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend
@@ -7,4 +7,6 @@ QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/"
 
 DEPENDS_append_mx6 = " virtual/kernel virtual/libgles2"
 QT_GLFLAGS_mx6 = "-opengl es2 -openvg"
-QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/ -DLINUX=1 -DEGL_API_FB=1"
+QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/uapi \
+                               -I${STAGING_KERNEL_DIR}/include/ \
+                               -DLINUX=1 -DEGL_API_FB=1"
diff --git a/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend b/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend
index a9330bfc9..05cc2e685 100644
--- a/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend
+++ b/meta-fsl-arm/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend
@@ -7,4 +7,6 @@ QT_CONFIG_FLAGS_append_mx5 = " -I${STAGING_KERNEL_DIR}/include/"
 
 DEPENDS_append_mx6 = " virtual/kernel virtual/libgles2"
 QT_GLFLAGS_mx6 = "-opengl es2 -openvg"
-QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/ -DLINUX=1 -DEGL_API_FB=1"
+QT_CONFIG_FLAGS_append_mx6 = " -I${STAGING_KERNEL_DIR}/include/uapi \
+                               -I${STAGING_KERNEL_DIR}/include/ \
+                               -DLINUX=1 -DEGL_API_FB=1"