summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <liu.ming50@gmail.com>2018-01-08 13:22:07 +0100
committerOtavio Salvador <otavio@ossystems.com.br>2018-02-06 10:04:54 -0200
commit71a54c7b50221800fa4c90c30a425c2f119db3bc (patch)
tree91cc0672509c46fd4f93152f0cdc668ff66fc664
parent43250875bb3ec3a1d689d94c70fabcf3d7ef2816 (diff)
downloadmeta-freescale-71a54c7b50221800fa4c90c30a425c2f119db3bc.tar.gz
qtbase: set default EGLFS_DEVICE_INTEGRATION before oe-device-extra.pri
This allows the users to be able to override it in oe-device-extra.pri. Signed-off-by: Ming Liu <liu.ming50@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> (cherry picked from commit 192def2732d8b548f4b4cc03eb9b45639af8b1fd)
-rw-r--r--dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch
index 794fa6222..8e7129e3f 100644
--- a/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch
+++ b/dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase/0015-Add-eglfs-to-IMX-GPU.patch
@@ -2,12 +2,12 @@ Index: git/mkspecs/linux-oe-g++/qmake.conf
2=================================================================== 2===================================================================
3--- git.orig/mkspecs/linux-oe-g++/qmake.conf 2016-12-14 17:03:17.000000000 -0600 3--- git.orig/mkspecs/linux-oe-g++/qmake.conf 2016-12-14 17:03:17.000000000 -0600
4+++ git/mkspecs/linux-oe-g++/qmake.conf 2016-12-14 17:06:23.000000000 -0600 4+++ git/mkspecs/linux-oe-g++/qmake.conf 2016-12-14 17:06:23.000000000 -0600
5@@ -39,6 +39,8 @@ 5@@ -37,6 +37,8 @@ QMAKE_LINK_C_SHLIB = $$(OE_QMAKE_LINK)
6 6 # for the SDK
7 include(../oe-device-extra.pri) 7 isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $$(OE_QMAKE_QT_CONFIG)
8 8
9+EGLFS_DEVICE_INTEGRATION = eglfs_viv 9+EGLFS_DEVICE_INTEGRATION = eglfs_viv
10+ 10+
11 include(../oe-device-extra.pri)
12
11 QMAKE_LIBS_EGL += -lEGL 13 QMAKE_LIBS_EGL += -lEGL
12 QMAKE_LIBS_OPENGL_ES2 += -lEGL -lGLESv2
13 QMAKE_LIBS_OPENVG += -lEGL -lOpenVG