diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2016-02-29 18:22:28 +0100 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-03-01 21:31:27 -0300 |
commit | da8f520af580dd5a7340d512f410c2eef7b6a635 (patch) | |
tree | 2623e57993c820c49125a0322ddf7c8eca4ac6fc /qt5-layer | |
parent | e15f736b33c52e86c870c4b724276a62b1d2fe2e (diff) | |
download | meta-fsl-arm-da8f520af580dd5a7340d512f410c2eef7b6a635.tar.gz |
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 <Martin.Jansa@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'qt5-layer')
-rw-r--r-- | qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index f157c4d..b18bf17 100644 --- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | |||
@@ -32,7 +32,7 @@ EOF | |||
32 | fi | 32 | fi |
33 | else | 33 | else |
34 | cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF | 34 | cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF |
35 | IMX6_CFLAGS = -DLINUX=1 | 35 | IMX6_CFLAGS = -DLINUX=1 -DEGL_API_FB=1 |
36 | EOF | 36 | EOF |
37 | fi | 37 | fi |
38 | cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF | 38 | cat >> ${S}/mkspecs/linux-oe-g++/qmake.conf <<EOF |