From 62c8d8cc6500711464049662489729f208240be8 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 29 Feb 2016 18:22:28 +0100 Subject: [PATCH] qtbase: Allow to build eglfs with x11 in DISTRO_FEATURES * even when x11 is in DISTRO_FEATURES someone might configure qtbase to build with eglfs, that works OK with Qt 5.5.1, because -DEGL_API_FB=1 is also passed through mkspecs/devices/linux-imx6-g++/qmake.conf but with 5.6 and 5.7 it fails when X11 headers are include with their own Status enum (the same errors like before https://codereview.qt-project.org/#/c/105116/2) Adding -DEGL_API_FB=1 like linux-imx6-g++/qmake.conf does is simplest workaround to prevent imx-gpu-viv from including Xlib from EGL/eglvivante.h Signed-off-by: Martin Jansa Signed-off-by: Otavio Salvador --- dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index f157c4dc..b18bf171 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -32,7 +32,7 @@ EOF fi else cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <> ${S}/mkspecs/linux-oe-g++/qmake.conf <