Make qtbase include qeglfshooks_imx6.cpp when build with X11, without
this the xcb platform would compliant that no GLX nor
EGL are enabled.

This bug was introduced in commit 55399e0.

Signed-off-by: Yen-Chin Lee <[email protected]>
---
 qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend 
b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
index 64966c2..a71a198 100644
--- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
+++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend
@@ -45,17 +45,12 @@ do_configure_prepend_mx6() {
        # adapt qmake.conf to our needs
        sed -i 's!load(qt_config)!!' ${S}/mkspecs/linux-oe-g++/qmake.conf
     if test ${HAS_X11} -eq 0; then
-   if test ${IS_MX6SL} -eq 0; then
     
                cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
 EGLFS_PLATFORM_HOOKS_SOURCES = \$\$PWD/qeglfshooks_imx6.cpp
 IMX6_CFLAGS             = -DLINUX=1 -DEGL_API_FB=1
 EOF
-   else
-cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF
-IMX6_CFLAGS             = -DLINUX=1
-EOF
-fi
+               
                # copy the hook in the mkspecs directory OE is using
                cp ${S}/mkspecs/devices/linux-imx6-g++/qeglfshooks_imx6.cpp 
${S}/mkspecs/linux-oe-g++/
        else
-- 
1.9.2

-- 
_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale

Reply via email to